diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..1492202b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false + +[*.yml] +indent_style = space +indent_size = 2 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..20457786 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,7 @@ +* text=auto +/.github export-ignore +.styleci.yml export-ignore +.scrutinizer.yml export-ignore +BACKERS.md export-ignore +CONTRIBUTING.md export-ignore +CHANGELOG.md export-ignore diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000..b57e0374 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @abenevaut diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..43d7765e --- /dev/null +++ b/.github/CODE_OF_CONDUCT.md @@ -0,0 +1,9 @@ +Be free to fork this project. + +No contribution is accepted on this READ ONLY repository. +Please visit the [abenevaut/opensource](https://github.com/abenevaut/opensource) to contribute. + +Roadmap: https://github.com/users/abenevaut/projects/9 + +All inspired code or re-used code have to be licensed to GNU GPLv3. +Please, take care about licensed projects you can't re-use. diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 00000000..6ca783d4 --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,4 @@ +No contribution is accepted on this READ ONLY repository. +Please visit the [abenevaut/opensource](https://github.com/abenevaut/opensource) to contribute. + +Roadmap: https://github.com/users/abenevaut/projects/9 diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 00000000..6ca783d4 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,4 @@ +No contribution is accepted on this READ ONLY repository. +Please visit the [abenevaut/opensource](https://github.com/abenevaut/opensource) to contribute. + +Roadmap: https://github.com/users/abenevaut/projects/9 diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..6ca783d4 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,4 @@ +No contribution is accepted on this READ ONLY repository. +Please visit the [abenevaut/opensource](https://github.com/abenevaut/opensource) to contribute. + +Roadmap: https://github.com/users/abenevaut/projects/9 diff --git a/.github/workflows/close-pr.yml b/.github/workflows/close-pr.yml new file mode 100644 index 00000000..e5fe9dfe --- /dev/null +++ b/.github/workflows/close-pr.yml @@ -0,0 +1,13 @@ +name: Close PR + +on: + pull_request_target: + types: [opened] + +jobs: + run: + runs-on: ubuntu-latest + steps: + - uses: superbrothers/close-pull-request@v3 + with: + comment: "No contribution is accepted on this READ ONLY repository." diff --git a/.github/workflows/phpunit-slicer-release.yml b/.github/workflows/phpunit-slicer-release.yml new file mode 100644 index 00000000..d5f7a54f --- /dev/null +++ b/.github/workflows/phpunit-slicer-release.yml @@ -0,0 +1,59 @@ +name: phpunit-slicer-release + +on: + release: + types: [ created ] + +env: + php_version: 8.3 + node_version: lts/iron + +jobs: + + publish-binaries: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./builds + permissions: + contents: write + concurrency: + group: phpunit-slicer-publish-binaries-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: false + steps: + + - name: Checkout project + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Get current release tag + id: branch-name + run: echo "SOURCE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT + + - name: add assets to release + run: | + sha512sum phpunit-slicer > phpunit-slicer.sha512sum + gh release upload ${{ steps.branch-name.outputs.SOURCE_TAG }} phpunit-slicer.sha512sum + gh release upload ${{ steps.branch-name.outputs.SOURCE_TAG }} phpunit-slicer + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + publish-docs: + runs-on: ubuntu-latest + concurrency: + group: phpunit-slicer-publish-docs-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: false + steps: + + - name: Checkout project + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Publish to wiki + uses: SwiftDocOrg/github-wiki-publish-action@v1 + with: + path: "docs" + env: + GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.ABENEVAUT_GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b9ed4622 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +/vendor +/.idea +/.vscode +/.vagrant +.phpunit.result.cache +phpunit.xml.test +phpunit.xml +coverage diff --git a/README.md b/README.md index b32d8748..268c9b43 100644 --- a/README.md +++ b/README.md @@ -1,51 +1,6 @@ -# PHPUnit-slicer +# phpunit-slicer -Tool to slice PHPUnit tests files to tests suites. - -- [Available on Packagist.org - abenevaut/phpunit-slicer](https://packagist.org/packages/abenevaut/phpunit-slicer) - -![how-to](https://raw.githubusercontent.com/abenevaut/phpunit-slicer/master/demo.gif) - -## Install - -### In PHP project -```shell -composer require --dev abenevaut/phpunit-slicer -``` - -#### Usage - -```shell -vendor/bin/phpunit-slicer slice 4 ./phpunit.xml.dist ./phpunit.xml ./tests -``` - -### Globally -```shell -composer global require abenevaut/phpunit-slicer -``` - -#### Usage -```shell -phpunit-slicer slice 4 ./phpunit.xml.dist ./phpunit.xml ./tests -``` - -### Use cases -```shell -vendor/bin/phpunit --testsuite sliced-testsuite-0 --configuration phpunit.xml -vendor/bin/pest --testsuite sliced-testsuite-1 --configuration phpunit.xml -php artisan test --testsuite sliced-testsuite-2 --configuration phpunit.xml -php laravel-zero-project test --testsuite sliced-testsuite-3 --configuration phpunit.xml -``` - -- [Real use case with Github Actions](https://github.com/abenevaut/phpunit-slicer/wiki) - -## Build -```shell -php phpunit-slicer app:build phpunit-slicer -php phpunit-slicer app:build phpunit-slicer --build-version=0.0.X -``` +[Wiki](https://github.com/abenevaut/phpunit-slicer/wiki) ## Licensing - -- Credits to [tailwindtoolbox](https://github.com/tailwindtoolbox/Minimal-Blog) for the HTML template - The Laravel Zero is open-sourced software licensed under the [MIT license](https://opensource.org/license/mit/). diff --git a/app/Commands/.gitkeep b/app/Commands/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/builds/phpunit-slicer b/builds/phpunit-slicer index 16948771..2d31a5d5 100644 Binary files a/builds/phpunit-slicer and b/builds/phpunit-slicer differ diff --git a/composer.json b/composer.json index 29208770..cf841b4f 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Tool to slice PHPUnit tests files to tests suites.", "keywords": ["phpunit", "slice", "tests"], "type": "project", - "license": "GPL-3.0-only", + "license": "MIT", "homepage": "https://github.com/abenevaut/opensource", "support": { "issues": "https://github.com/abenevaut/opensource/issues", diff --git a/composer.lock b/composer.lock index 59e66c07..8d6b0ac3 100644 --- a/composer.lock +++ b/composer.lock @@ -60,25 +60,25 @@ }, { "name": "brick/math", - "version": "0.11.0", + "version": "0.12.1", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478" + "reference": "f510c0a40911935b77b86859eb5223d58d660df1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/0ad82ce168c82ba30d1c01ec86116ab52f589478", - "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478", + "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1", + "reference": "f510c0a40911935b77b86859eb5223d58d660df1", "shasum": "" }, "require": { - "php": "^8.0" + "php": "^8.1" }, "require-dev": { "php-coveralls/php-coveralls": "^2.2", - "phpunit/phpunit": "^9.0", - "vimeo/psalm": "5.0.0" + "phpunit/phpunit": "^10.1", + "vimeo/psalm": "5.16.0" }, "type": "library", "autoload": { @@ -98,12 +98,17 @@ "arithmetic", "bigdecimal", "bignum", + "bignumber", "brick", - "math" + "decimal", + "integer", + "math", + "mathematics", + "rational" ], "support": { "issues": "https://github.com/brick/math/issues", - "source": "https://github.com/brick/math/tree/0.11.0" + "source": "https://github.com/brick/math/tree/0.12.1" }, "funding": [ { @@ -111,7 +116,7 @@ "type": "github" } ], - "time": "2023-01-15T23:15:59+00:00" + "time": "2023-11-29T23:19:16+00:00" }, { "name": "carbonphp/carbon-doctrine-types", @@ -419,7 +424,7 @@ }, { "name": "illuminate/collections", - "version": "v10.48.14", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", @@ -474,7 +479,7 @@ }, { "name": "illuminate/conditionable", - "version": "v10.48.14", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", @@ -520,7 +525,7 @@ }, { "name": "illuminate/container", - "version": "v10.48.14", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/container.git", @@ -571,7 +576,7 @@ }, { "name": "illuminate/contracts", - "version": "v10.48.14", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", @@ -619,7 +624,7 @@ }, { "name": "illuminate/filesystem", - "version": "v10.48.14", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", @@ -686,7 +691,7 @@ }, { "name": "illuminate/macroable", - "version": "v10.48.14", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -732,16 +737,16 @@ }, { "name": "illuminate/support", - "version": "v10.48.14", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "263f389d81488c237846b69469f91387ca2729f3" + "reference": "56c6d9895605b019e3debb9440454596ef99312a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/263f389d81488c237846b69469f91387ca2729f3", - "reference": "263f389d81488c237846b69469f91387ca2729f3", + "url": "https://api.github.com/repos/illuminate/support/zipball/56c6d9895605b019e3debb9440454596ef99312a", + "reference": "56c6d9895605b019e3debb9440454596ef99312a", "shasum": "" }, "require": { @@ -799,11 +804,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-05-16T21:33:51+00:00" + "time": "2024-05-20T13:31:33+00:00" }, { "name": "illuminate/translation", - "version": "v10.48.14", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/translation.git", @@ -854,7 +859,7 @@ }, { "name": "illuminate/validation", - "version": "v10.48.14", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/validation.git", @@ -1022,33 +1027,32 @@ }, { "name": "nunomaduro/termwind", - "version": "v1.15.1", + "version": "v1.17.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/termwind.git", - "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc" + "reference": "5369ef84d8142c1d87e4ec278711d4ece3cbf301" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/8ab0b32c8caa4a2e09700ea32925441385e4a5dc", - "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc", + "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/5369ef84d8142c1d87e4ec278711d4ece3cbf301", + "reference": "5369ef84d8142c1d87e4ec278711d4ece3cbf301", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": "^8.0", - "symfony/console": "^5.3.0|^6.0.0" + "php": "^8.1", + "symfony/console": "^6.4.15" }, "require-dev": { - "ergebnis/phpstan-rules": "^1.0.", - "illuminate/console": "^8.0|^9.0", - "illuminate/support": "^8.0|^9.0", - "laravel/pint": "^1.0.0", - "pestphp/pest": "^1.21.0", - "pestphp/pest-plugin-mock": "^1.0", - "phpstan/phpstan": "^1.4.6", - "phpstan/phpstan-strict-rules": "^1.1.0", - "symfony/var-dumper": "^5.2.7|^6.0.0", + "illuminate/console": "^10.48.24", + "illuminate/support": "^10.48.24", + "laravel/pint": "^1.18.2", + "pestphp/pest": "^2.36.0", + "pestphp/pest-plugin-mock": "2.0.0", + "phpstan/phpstan": "^1.12.11", + "phpstan/phpstan-strict-rules": "^1.6.1", + "symfony/var-dumper": "^6.4.15", "thecodingmachine/phpstan-strict-rules": "^1.0.0" }, "type": "library", @@ -1088,7 +1092,7 @@ ], "support": { "issues": "https://github.com/nunomaduro/termwind/issues", - "source": "https://github.com/nunomaduro/termwind/tree/v1.15.1" + "source": "https://github.com/nunomaduro/termwind/tree/v1.17.0" }, "funding": [ { @@ -1104,7 +1108,7 @@ "type": "github" } ], - "time": "2023-02-08T01:06:31+00:00" + "time": "2024-11-21T10:36:35+00:00" }, { "name": "psr/clock", @@ -1260,16 +1264,16 @@ }, { "name": "symfony/console", - "version": "v6.4.11", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "42686880adaacdad1835ee8fc2a9ec5b7bd63998" + "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/42686880adaacdad1835ee8fc2a9ec5b7bd63998", - "reference": "42686880adaacdad1835ee8fc2a9ec5b7bd63998", + "url": "https://api.github.com/repos/symfony/console/zipball/f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", + "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", "shasum": "" }, "require": { @@ -1334,7 +1338,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.11" + "source": "https://github.com/symfony/console/tree/v6.4.15" }, "funding": [ { @@ -1350,7 +1354,7 @@ "type": "tidelift" } ], - "time": "2024-08-15T22:48:29+00:00" + "time": "2024-11-06T14:19:14+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1421,16 +1425,16 @@ }, { "name": "symfony/finder", - "version": "v6.4.11", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453" + "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/d7eb6daf8cd7e9ac4976e9576b32042ef7253453", - "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453", + "url": "https://api.github.com/repos/symfony/finder/zipball/daea9eca0b08d0ed1dc9ab702a46128fd1be4958", + "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958", "shasum": "" }, "require": { @@ -1465,7 +1469,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.11" + "source": "https://github.com/symfony/finder/tree/v6.4.13" }, "funding": [ { @@ -1481,20 +1485,20 @@ "type": "tidelift" } ], - "time": "2024-08-13T14:27:37+00:00" + "time": "2024-10-01T08:30:56+00:00" }, { "name": "symfony/http-foundation", - "version": "v6.4.8", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "27de8cc95e11db7a50b027e71caaab9024545947" + "reference": "9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/27de8cc95e11db7a50b027e71caaab9024545947", - "reference": "27de8cc95e11db7a50b027e71caaab9024545947", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6", + "reference": "9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6", "shasum": "" }, "require": { @@ -1504,12 +1508,12 @@ "symfony/polyfill-php83": "^1.27" }, "conflict": { - "symfony/cache": "<6.3" + "symfony/cache": "<6.4.12|>=7.0,<7.1.5" }, "require-dev": { "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1|^2.0", - "symfony/cache": "^6.3|^7.0", + "symfony/cache": "^6.4.12|^7.1.5", "symfony/dependency-injection": "^5.4|^6.0|^7.0", "symfony/expression-language": "^5.4|^6.0|^7.0", "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0", @@ -1542,7 +1546,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.8" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.15" }, "funding": [ { @@ -1558,20 +1562,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-11-08T16:09:24+00:00" }, { "name": "symfony/mime", - "version": "v6.4.9", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "7d048964877324debdcb4e0549becfa064a20d43" + "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/7d048964877324debdcb4e0549becfa064a20d43", - "reference": "7d048964877324debdcb4e0549becfa064a20d43", + "url": "https://api.github.com/repos/symfony/mime/zipball/1de1cf14d99b12c7ebbb850491ec6ae3ed468855", + "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855", "shasum": "" }, "require": { @@ -1627,7 +1631,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.9" + "source": "https://github.com/symfony/mime/tree/v6.4.13" }, "funding": [ { @@ -1643,24 +1647,24 @@ "type": "tidelift" } ], - "time": "2024-06-28T09:49:33+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "0424dff1c58f028c451efff2045f5d92410bd540" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", - "reference": "0424dff1c58f028c451efff2045f5d92410bd540", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -1706,7 +1710,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -1722,24 +1726,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a" + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a", - "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -1784,7 +1788,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" }, "funding": [ { @@ -1800,26 +1804,25 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c" + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", - "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773", + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" + "php": ">=7.2", + "symfony/polyfill-intl-normalizer": "^1.10" }, "suggest": { "ext-intl": "For best performance" @@ -1868,7 +1871,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0" }, "funding": [ { @@ -1884,24 +1887,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb", - "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -1949,7 +1952,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -1965,24 +1968,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -2029,7 +2032,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -2045,97 +2048,24 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:30:46+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.30.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "10112722600777e02d2745716b70c5db4ca70442" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442", - "reference": "10112722600777e02d2745716b70c5db4ca70442", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.30.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-06-19T12:30:46+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -2182,7 +2112,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -2198,24 +2128,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php83", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php83.git", - "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9" + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9", - "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491", + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -2258,7 +2188,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php83/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0" }, "funding": [ { @@ -2274,7 +2204,7 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:35:24+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/service-contracts", @@ -2361,16 +2291,16 @@ }, { "name": "symfony/string", - "version": "v6.4.11", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "5bc3eb632cf9c8dbfd6529d89be9950d1518883b" + "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/5bc3eb632cf9c8dbfd6529d89be9950d1518883b", - "reference": "5bc3eb632cf9c8dbfd6529d89be9950d1518883b", + "url": "https://api.github.com/repos/symfony/string/zipball/73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", + "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", "shasum": "" }, "require": { @@ -2427,7 +2357,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.11" + "source": "https://github.com/symfony/string/tree/v6.4.15" }, "funding": [ { @@ -2443,20 +2373,20 @@ "type": "tidelift" } ], - "time": "2024-08-12T09:55:28+00:00" + "time": "2024-11-13T13:31:12+00:00" }, { "name": "symfony/translation", - "version": "v6.4.8", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "a002933b13989fc4bd0b58e04bf7eec5210e438a" + "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/a002933b13989fc4bd0b58e04bf7eec5210e438a", - "reference": "a002933b13989fc4bd0b58e04bf7eec5210e438a", + "url": "https://api.github.com/repos/symfony/translation/zipball/bee9bfabfa8b4045a66bf82520e492cddbaffa66", + "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66", "shasum": "" }, "require": { @@ -2522,7 +2452,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.4.8" + "source": "https://github.com/symfony/translation/tree/v6.4.13" }, "funding": [ { @@ -2538,7 +2468,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-27T18:14:25+00:00" }, { "name": "symfony/translation-contracts", @@ -2620,16 +2550,16 @@ }, { "name": "voku/portable-ascii", - "version": "2.0.1", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/voku/portable-ascii.git", - "reference": "b56450eed252f6801410d810c8e1727224ae0743" + "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743", - "reference": "b56450eed252f6801410d810c8e1727224ae0743", + "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b1d923f88091c6bf09699efcd7c8a1b1bfd7351d", + "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d", "shasum": "" }, "require": { @@ -2654,7 +2584,7 @@ "authors": [ { "name": "Lars Moelleken", - "homepage": "http://www.moelleken.org/" + "homepage": "https://www.moelleken.org/" } ], "description": "Portable ASCII library - performance optimized (ascii) string functions for php.", @@ -2666,7 +2596,7 @@ ], "support": { "issues": "https://github.com/voku/portable-ascii/issues", - "source": "https://github.com/voku/portable-ascii/tree/2.0.1" + "source": "https://github.com/voku/portable-ascii/tree/2.0.3" }, "funding": [ { @@ -2690,7 +2620,7 @@ "type": "tidelift" } ], - "time": "2022-03-08T17:03:00+00:00" + "time": "2024-11-21T01:49:47+00:00" } ], "packages-dev": [ @@ -2838,16 +2768,16 @@ }, { "name": "dragonmantank/cron-expression", - "version": "v3.3.3", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a" + "reference": "8c784d071debd117328803d86b2097615b457500" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", - "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500", + "reference": "8c784d071debd117328803d86b2097615b457500", "shasum": "" }, "require": { @@ -2860,10 +2790,14 @@ "require-dev": { "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.0", - "phpstan/phpstan-webmozart-assert": "^1.0", "phpunit/phpunit": "^7.0|^8.0|^9.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, "autoload": { "psr-4": { "Cron\\": "src/Cron/" @@ -2887,7 +2821,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0" }, "funding": [ { @@ -2895,20 +2829,20 @@ "type": "github" } ], - "time": "2023-08-10T19:36:49+00:00" + "time": "2024-10-09T13:47:03+00:00" }, { "name": "fakerphp/faker", - "version": "v1.23.1", + "version": "v1.24.1", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b" + "reference": "e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b", - "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5", + "reference": "e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5", "shasum": "" }, "require": { @@ -2956,9 +2890,9 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.23.1" + "source": "https://github.com/FakerPHP/Faker/tree/v1.24.1" }, - "time": "2024-01-02T13:46:09+00:00" + "time": "2024-11-21T13:46:39+00:00" }, { "name": "fidry/cpu-core-counter", @@ -3023,26 +2957,26 @@ }, { "name": "filp/whoops", - "version": "2.15.4", + "version": "2.16.0", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546" + "reference": "befcdc0e5dce67252aa6322d82424be928214fa2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546", - "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546", + "url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2", + "reference": "befcdc0e5dce67252aa6322d82424be928214fa2", "shasum": "" }, "require": { - "php": "^5.5.9 || ^7.0 || ^8.0", + "php": "^7.1 || ^8.0", "psr/log": "^1.0.1 || ^2.0 || ^3.0" }, "require-dev": { - "mockery/mockery": "^0.9 || ^1.0", - "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3", - "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0" + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.3", + "symfony/var-dumper": "^4.0 || ^5.0" }, "suggest": { "symfony/var-dumper": "Pretty print complex values better with var-dumper available", @@ -3082,7 +3016,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.15.4" + "source": "https://github.com/filp/whoops/tree/2.16.0" }, "funding": [ { @@ -3090,28 +3024,28 @@ "type": "github" } ], - "time": "2023-11-03T12:00:00+00:00" + "time": "2024-09-25T12:00:00+00:00" }, { "name": "graham-campbell/result-type", - "version": "v1.1.2", + "version": "v1.1.3", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862" + "reference": "3ba905c11371512af9d9bdd27d99b782216b6945" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862", - "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945", + "reference": "3ba905c11371512af9d9bdd27d99b782216b6945", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", - "phpoption/phpoption": "^1.9.2" + "phpoption/phpoption": "^1.9.3" }, "require-dev": { - "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28" }, "type": "library", "autoload": { @@ -3140,7 +3074,7 @@ ], "support": { "issues": "https://github.com/GrahamCampbell/Result-Type/issues", - "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2" + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3" }, "funding": [ { @@ -3152,7 +3086,7 @@ "type": "tidelift" } ], - "time": "2023-11-12T22:16:48+00:00" + "time": "2024-07-20T21:45:45+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -3207,16 +3141,16 @@ }, { "name": "illuminate/bus", - "version": "v10.48.4", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/bus.git", - "reference": "33993b8f54e91b03fb5000e55693e146e7370763" + "reference": "42cf510d0dcf20a1a27580290e283b7df2621bc7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/bus/zipball/33993b8f54e91b03fb5000e55693e146e7370763", - "reference": "33993b8f54e91b03fb5000e55693e146e7370763", + "url": "https://api.github.com/repos/illuminate/bus/zipball/42cf510d0dcf20a1a27580290e283b7df2621bc7", + "reference": "42cf510d0dcf20a1a27580290e283b7df2621bc7", "shasum": "" }, "require": { @@ -3256,20 +3190,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-02-23T15:38:25+00:00" + "time": "2024-11-11T20:53:37+00:00" }, { "name": "illuminate/cache", - "version": "v10.48.4", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/cache.git", - "reference": "017403b7ff5926fbf80c21645106f72ce1023e6f" + "reference": "6020bc5f40b62cc680be3eb57e980e5cb26884ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/cache/zipball/017403b7ff5926fbf80c21645106f72ce1023e6f", - "reference": "017403b7ff5926fbf80c21645106f72ce1023e6f", + "url": "https://api.github.com/repos/illuminate/cache/zipball/6020bc5f40b62cc680be3eb57e980e5cb26884ff", + "reference": "6020bc5f40b62cc680be3eb57e980e5cb26884ff", "shasum": "" }, "require": { @@ -3318,11 +3252,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-03-08T02:31:57+00:00" + "time": "2024-05-23T18:38:25+00:00" }, { "name": "illuminate/config", - "version": "v10.48.4", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/config.git", @@ -3370,16 +3304,16 @@ }, { "name": "illuminate/console", - "version": "v10.48.4", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/console.git", - "reference": "f6f9b944ef0f59dd331350bdd1e720c850946bb1" + "reference": "d10e2fb5331b82b2e58a9be05ea798e5a0899890" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/console/zipball/f6f9b944ef0f59dd331350bdd1e720c850946bb1", - "reference": "f6f9b944ef0f59dd331350bdd1e720c850946bb1", + "url": "https://api.github.com/repos/illuminate/console/zipball/d10e2fb5331b82b2e58a9be05ea798e5a0899890", + "reference": "d10e2fb5331b82b2e58a9be05ea798e5a0899890", "shasum": "" }, "require": { @@ -3431,11 +3365,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-03-11T21:46:09+00:00" + "time": "2024-06-18T17:24:16+00:00" }, { "name": "illuminate/events", - "version": "v10.48.4", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/events.git", @@ -3490,7 +3424,7 @@ }, { "name": "illuminate/pipeline", - "version": "v10.48.4", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/pipeline.git", @@ -3538,7 +3472,7 @@ }, { "name": "illuminate/process", - "version": "v10.48.4", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/process.git", @@ -3589,16 +3523,16 @@ }, { "name": "illuminate/testing", - "version": "v10.48.4", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/testing.git", - "reference": "5e5f0d8a30cae66f8383098bee623cc75b60af8c" + "reference": "ff641ff4813040c2a5abfcbe8e38590106608cd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/testing/zipball/5e5f0d8a30cae66f8383098bee623cc75b60af8c", - "reference": "5e5f0d8a30cae66f8383098bee623cc75b60af8c", + "url": "https://api.github.com/repos/illuminate/testing/zipball/ff641ff4813040c2a5abfcbe8e38590106608cd7", + "reference": "ff641ff4813040c2a5abfcbe8e38590106608cd7", "shasum": "" }, "require": { @@ -3644,20 +3578,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-02-08T15:10:07+00:00" + "time": "2024-04-22T13:20:30+00:00" }, { "name": "illuminate/view", - "version": "v10.48.4", + "version": "v10.48.24", "source": { "type": "git", "url": "https://github.com/illuminate/view.git", - "reference": "504d55e0f2d90c75588627e6a77a4d1228cf1a02" + "reference": "76a1405bc3e1d0a19e8d2db3bd5b991ed10b31f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/view/zipball/504d55e0f2d90c75588627e6a77a4d1228cf1a02", - "reference": "504d55e0f2d90c75588627e6a77a4d1228cf1a02", + "url": "https://api.github.com/repos/illuminate/view/zipball/76a1405bc3e1d0a19e8d2db3bd5b991ed10b31f7", + "reference": "76a1405bc3e1d0a19e8d2db3bd5b991ed10b31f7", "shasum": "" }, "require": { @@ -3698,32 +3632,32 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-03-12T16:33:42+00:00" + "time": "2024-05-21T17:37:01+00:00" }, { "name": "jean85/pretty-package-versions", - "version": "2.0.6", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/Jean85/pretty-package-versions.git", - "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4" + "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/f9fdd29ad8e6d024f52678b570e5593759b550b4", - "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4", + "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/3c4e5f62ba8d7de1734312e4fff32f67a8daaf10", + "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10", "shasum": "" }, "require": { - "composer-runtime-api": "^2.0.0", - "php": "^7.1|^8.0" + "composer-runtime-api": "^2.1.0", + "php": "^7.4|^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.2", "jean85/composer-provided-replaced-stub-package": "^1.0", "phpstan/phpstan": "^1.4", - "phpunit/phpunit": "^7.5|^8.5|^9.4", - "vimeo/psalm": "^4.3" + "phpunit/phpunit": "^7.5|^8.5|^9.6", + "vimeo/psalm": "^4.3 || ^5.0" }, "type": "library", "extra": { @@ -3755,34 +3689,38 @@ ], "support": { "issues": "https://github.com/Jean85/pretty-package-versions/issues", - "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.6" + "source": "https://github.com/Jean85/pretty-package-versions/tree/2.1.0" }, - "time": "2024-03-08T09:58:59+00:00" + "time": "2024-11-18T16:19:46+00:00" }, { "name": "jolicode/jolinotif", - "version": "v2.6.0", + "version": "v2.7.3", "source": { "type": "git", "url": "https://github.com/jolicode/JoliNotif.git", - "reference": "6a886aa19aec7cc283125631f31f93f71729bf40" + "reference": "3c3e1c410b107dd2603b732508fd95830f0e0196" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jolicode/JoliNotif/zipball/6a886aa19aec7cc283125631f31f93f71729bf40", - "reference": "6a886aa19aec7cc283125631f31f93f71729bf40", + "url": "https://api.github.com/repos/jolicode/JoliNotif/zipball/3c3e1c410b107dd2603b732508fd95830f0e0196", + "reference": "3c3e1c410b107dd2603b732508fd95830f0e0196", "shasum": "" }, "require": { "jolicode/php-os-helper": "^0.1.0", "php": ">=8.1", + "psr/log": "^1.0 || ^2.0 || ^3.0", + "symfony/deprecation-contracts": "^3", "symfony/process": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.13", "symfony/finder": "^5.4 || ^6.0 || ^7.0", "symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0" }, + "suggest": { + "ext-ffi": "Needed to send notifications via libnotify on Linux" + }, "bin": [ "jolinotif" ], @@ -3812,7 +3750,7 @@ ], "support": { "issues": "https://github.com/jolicode/JoliNotif/issues", - "source": "https://github.com/jolicode/JoliNotif/tree/v2.6.0" + "source": "https://github.com/jolicode/JoliNotif/tree/v2.7.3" }, "funding": [ { @@ -3820,7 +3758,7 @@ "type": "tidelift" } ], - "time": "2023-12-03T13:14:21+00:00" + "time": "2024-09-30T13:34:54+00:00" }, { "name": "jolicode/php-os-helper", @@ -3874,16 +3812,16 @@ }, { "name": "laravel-zero/foundation", - "version": "v10.48.4", + "version": "v10.48.8", "source": { "type": "git", "url": "https://github.com/laravel-zero/foundation.git", - "reference": "0b5f09875ae22ede06b77d66432f470c5aa32b73" + "reference": "5203cc84ace9c74e26735888f4c46396450b4b4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel-zero/foundation/zipball/0b5f09875ae22ede06b77d66432f470c5aa32b73", - "reference": "0b5f09875ae22ede06b77d66432f470c5aa32b73", + "url": "https://api.github.com/repos/laravel-zero/foundation/zipball/5203cc84ace9c74e26735888f4c46396450b4b4f", + "reference": "5203cc84ace9c74e26735888f4c46396450b4b4f", "shasum": "" }, "require": { @@ -3913,22 +3851,22 @@ "laravel" ], "support": { - "source": "https://github.com/laravel-zero/foundation/tree/v10.48.4" + "source": "https://github.com/laravel-zero/foundation/tree/v10.48.8" }, - "time": "2024-04-02T09:29:16+00:00" + "time": "2024-04-18T13:09:49+00:00" }, { "name": "laravel-zero/framework", - "version": "v10.3.0", + "version": "v10.4.0", "source": { "type": "git", "url": "https://github.com/laravel-zero/framework.git", - "reference": "517dddb90948f7c894440f54a726249e384f70e1" + "reference": "1c44f0cdb936b447d5556e0a23733bfc17cdd997" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel-zero/framework/zipball/517dddb90948f7c894440f54a726249e384f70e1", - "reference": "517dddb90948f7c894440f54a726249e384f70e1", + "url": "https://api.github.com/repos/laravel-zero/framework/zipball/1c44f0cdb936b447d5556e0a23733bfc17cdd997", + "reference": "1c44f0cdb936b447d5556e0a23733bfc17cdd997", "shasum": "" }, "require": { @@ -3945,25 +3883,25 @@ "illuminate/process": "^10.28", "illuminate/support": "^10.28", "illuminate/testing": "^10.28", - "laravel-zero/foundation": "^10.28", - "league/flysystem": "^3.15.1", - "nunomaduro/collision": "^6.4.0|^7.8.1", - "nunomaduro/laravel-console-summary": "^1.10.0", - "nunomaduro/laravel-console-task": "^1.8", - "nunomaduro/laravel-desktop-notifier": "^2.7", + "laravel-zero/foundation": "^10.48.8", + "league/flysystem": "^3.27.0", + "nunomaduro/collision": "^6.4.0|^7.10.0", + "nunomaduro/laravel-console-summary": "^1.11.1", + "nunomaduro/laravel-console-task": "^1.9", + "nunomaduro/laravel-desktop-notifier": "^2.8.1", "php": "^8.1", "psr/log": "^1.1|^2.0|^3.0", - "ramsey/uuid": "^4.7.4", - "symfony/console": "^6.3.2", - "symfony/error-handler": "^6.3.2", - "symfony/event-dispatcher": "^6.3.2", - "symfony/finder": "^6.3.3", - "symfony/process": "^6.3.2", - "symfony/var-dumper": "^6.3.3", - "vlucas/phpdotenv": "^5.5" + "ramsey/uuid": "^4.7.5", + "symfony/console": "^6.4.6", + "symfony/error-handler": "^6.4.6", + "symfony/event-dispatcher": "^6.4.3", + "symfony/finder": "^6.4.0", + "symfony/process": "^6.4.4", + "symfony/var-dumper": "^6.4.6", + "vlucas/phpdotenv": "^5.6" }, "require-dev": { - "guzzlehttp/guzzle": "^7.7", + "guzzlehttp/guzzle": "^7.8.1", "illuminate/bus": "^10.28", "illuminate/database": "^10.28", "illuminate/http": "^10.28", @@ -3971,15 +3909,15 @@ "illuminate/queue": "^10.28", "illuminate/redis": "^10.28", "illuminate/view": "^10.28", - "laminas/laminas-text": "^2.10", + "laminas/laminas-text": "^2.11", "laravel-zero/phar-updater": "^1.4", - "laravel/pint": "^1.13.3", - "nunomaduro/laravel-console-dusk": "^1.11", - "nunomaduro/laravel-console-menu": "^3.4", + "laravel/pint": "^1.15.1", + "nunomaduro/laravel-console-dusk": "^1.12", + "nunomaduro/laravel-console-menu": "^3.5", "nunomaduro/termwind": "^1.15.1", - "pestphp/pest": "^2.22.1", - "pestphp/pest-plugin-laravel": "^2.2", - "phpstan/phpstan": "^1.10.38" + "pestphp/pest": "^2.34.7", + "pestphp/pest-plugin-laravel": "^2.3", + "phpstan/phpstan": "^1.10.67" }, "suggest": { "ext-pcntl": "Required to ensure that data is cleared when cancelling the build process." @@ -4022,20 +3960,20 @@ "issues": "https://github.com/laravel-zero/laravel-zero/issues", "source": "https://github.com/laravel-zero/laravel-zero" }, - "time": "2023-10-30T09:40:05+00:00" + "time": "2024-04-18T13:12:28+00:00" }, { "name": "laravel/prompts", - "version": "v0.1.17", + "version": "v0.1.25", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5" + "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5", - "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5", + "url": "https://api.github.com/repos/laravel/prompts/zipball/7b4029a84c37cb2725fc7f011586e2997040bc95", + "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95", "shasum": "" }, "require": { @@ -4075,24 +4013,25 @@ "license": [ "MIT" ], + "description": "Add beautiful and user-friendly forms to your command-line applications.", "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.17" + "source": "https://github.com/laravel/prompts/tree/v0.1.25" }, - "time": "2024-03-13T16:05:43+00:00" + "time": "2024-08-12T22:06:33+00:00" }, { "name": "league/flysystem", - "version": "3.26.0", + "version": "3.29.1", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "072735c56cc0da00e10716dd90d5a7f7b40b36be" + "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/072735c56cc0da00e10716dd90d5a7f7b40b36be", - "reference": "072735c56cc0da00e10716dd90d5a7f7b40b36be", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319", + "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319", "shasum": "" }, "require": { @@ -4116,10 +4055,13 @@ "composer/semver": "^3.0", "ext-fileinfo": "*", "ext-ftp": "*", + "ext-mongodb": "^1.3", "ext-zip": "*", "friendsofphp/php-cs-fixer": "^3.5", "google/cloud-storage": "^1.23", + "guzzlehttp/psr7": "^2.6", "microsoft/azure-storage-blob": "^1.1", + "mongodb/mongodb": "^1.2", "phpseclib/phpseclib": "^3.0.36", "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.5.11|^10.0", @@ -4157,32 +4099,22 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.26.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.29.1" }, - "funding": [ - { - "url": "https://ecologi.com/frankdejonge", - "type": "custom" - }, - { - "url": "https://github.com/frankdejonge", - "type": "github" - } - ], - "time": "2024-03-25T11:49:53+00:00" + "time": "2024-10-08T08:58:34+00:00" }, { "name": "league/flysystem-local", - "version": "3.25.1", + "version": "3.29.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-local.git", - "reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92" + "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/61a6a90d6e999e4ddd9ce5adb356de0939060b92", - "reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92", + "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27", + "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27", "shasum": "" }, "require": { @@ -4216,32 +4148,22 @@ "local" ], "support": { - "source": "https://github.com/thephpleague/flysystem-local/tree/3.25.1" + "source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0" }, - "funding": [ - { - "url": "https://ecologi.com/frankdejonge", - "type": "custom" - }, - { - "url": "https://github.com/frankdejonge", - "type": "github" - } - ], - "time": "2024-03-15T19:58:44+00:00" + "time": "2024-08-09T21:24:39+00:00" }, { "name": "league/mime-type-detection", - "version": "1.15.0", + "version": "1.16.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301" + "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", - "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/2d6702ff215bf922936ccc1ad31007edc76451b9", + "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9", "shasum": "" }, "require": { @@ -4272,7 +4194,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.15.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.16.0" }, "funding": [ { @@ -4284,7 +4206,7 @@ "type": "tidelift" } ], - "time": "2024-01-28T23:22:08+00:00" + "time": "2024-09-21T08:32:55+00:00" }, { "name": "mockery/mockery", @@ -4371,16 +4293,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.12.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845", + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845", "shasum": "" }, "require": { @@ -4419,7 +4341,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1" }, "funding": [ { @@ -4427,20 +4349,20 @@ "type": "tidelift" } ], - "time": "2024-06-12T14:39:25+00:00" + "time": "2024-11-08T17:47:46+00:00" }, { "name": "nikic/php-parser", - "version": "v5.1.0", + "version": "v5.3.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1" + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1", - "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", "shasum": "" }, "require": { @@ -4483,46 +4405,46 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" }, - "time": "2024-07-01T20:03:41+00:00" + "time": "2024-10-08T18:51:32+00:00" }, { "name": "nunomaduro/collision", - "version": "v7.10.0", + "version": "v7.11.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "49ec67fa7b002712da8526678abd651c09f375b2" + "reference": "994ea93df5d4132f69d3f1bd74730509df6e8a05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/49ec67fa7b002712da8526678abd651c09f375b2", - "reference": "49ec67fa7b002712da8526678abd651c09f375b2", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/994ea93df5d4132f69d3f1bd74730509df6e8a05", + "reference": "994ea93df5d4132f69d3f1bd74730509df6e8a05", "shasum": "" }, "require": { - "filp/whoops": "^2.15.3", + "filp/whoops": "^2.16.0", "nunomaduro/termwind": "^1.15.1", "php": "^8.1.0", - "symfony/console": "^6.3.4" + "symfony/console": "^6.4.12" }, "conflict": { "laravel/framework": ">=11.0.0" }, "require-dev": { - "brianium/paratest": "^7.3.0", - "laravel/framework": "^10.28.0", - "laravel/pint": "^1.13.3", - "laravel/sail": "^1.25.0", - "laravel/sanctum": "^3.3.1", - "laravel/tinker": "^2.8.2", - "nunomaduro/larastan": "^2.6.4", - "orchestra/testbench-core": "^8.13.0", - "pestphp/pest": "^2.23.2", - "phpunit/phpunit": "^10.4.1", - "sebastian/environment": "^6.0.1", - "spatie/laravel-ignition": "^2.3.1" + "brianium/paratest": "^7.3.1", + "laravel/framework": "^10.48.22", + "laravel/pint": "^1.18.1", + "laravel/sail": "^1.36.0", + "laravel/sanctum": "^3.3.3", + "laravel/tinker": "^2.10.0", + "nunomaduro/larastan": "^2.9.8", + "orchestra/testbench-core": "^8.28.3", + "pestphp/pest": "^2.35.1", + "phpunit/phpunit": "^10.5.36", + "sebastian/environment": "^6.1.0", + "spatie/laravel-ignition": "^2.8.0" }, "type": "library", "extra": { @@ -4581,20 +4503,20 @@ "type": "patreon" } ], - "time": "2023-10-11T15:45:01+00:00" + "time": "2024-10-15T15:12:40+00:00" }, { "name": "nunomaduro/laravel-console-summary", - "version": "v1.11.0", + "version": "v1.11.1", "source": { "type": "git", "url": "https://github.com/nunomaduro/laravel-console-summary.git", - "reference": "14834db07c9900f8228098d7c345dece45c4c3d9" + "reference": "2e3cf7b261697eed3fdf87a66be4470d32b405bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/laravel-console-summary/zipball/14834db07c9900f8228098d7c345dece45c4c3d9", - "reference": "14834db07c9900f8228098d7c345dece45c4c3d9", + "url": "https://api.github.com/repos/nunomaduro/laravel-console-summary/zipball/2e3cf7b261697eed3fdf87a66be4470d32b405bd", + "reference": "2e3cf7b261697eed3fdf87a66be4470d32b405bd", "shasum": "" }, "require": { @@ -4643,29 +4565,29 @@ "issues": "https://github.com/nunomaduro/laravel-console-summary/issues", "source": "https://github.com/nunomaduro/laravel-console-summary" }, - "time": "2024-03-05T09:24:48+00:00" + "time": "2024-04-09T08:41:54+00:00" }, { "name": "nunomaduro/laravel-console-task", - "version": "v1.8.0", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/laravel-console-task.git", - "reference": "e49e7be261a7b7329c4538777489b355fb234bde" + "reference": "02b2a550318fda3355e45763885e30b4e650bc1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/laravel-console-task/zipball/e49e7be261a7b7329c4538777489b355fb234bde", - "reference": "e49e7be261a7b7329c4538777489b355fb234bde", + "url": "https://api.github.com/repos/nunomaduro/laravel-console-task/zipball/02b2a550318fda3355e45763885e30b4e650bc1b", + "reference": "02b2a550318fda3355e45763885e30b4e650bc1b", "shasum": "" }, "require": { - "illuminate/console": "^9.0|^10.0", - "illuminate/support": "^9.0|^10.0", + "illuminate/console": "^10.0|^11.0", + "illuminate/support": "^10.0|^11.0", "php": "^8.1" }, "require-dev": { - "pestphp/pest": "^1.22.3" + "pestphp/pest": "^2.34" }, "type": "library", "extra": { @@ -4705,20 +4627,20 @@ "issues": "https://github.com/nunomaduro/laravel-console-task/issues", "source": "https://github.com/nunomaduro/laravel-console-task" }, - "time": "2023-01-11T15:16:19+00:00" + "time": "2024-04-11T07:51:10+00:00" }, { "name": "nunomaduro/laravel-desktop-notifier", - "version": "v2.8.0", + "version": "v2.8.1", "source": { "type": "git", "url": "https://github.com/nunomaduro/laravel-desktop-notifier.git", - "reference": "d9935c73670f368032d84092a554417d71ee2233" + "reference": "9937f1f8898077ad6d058c03ecee39d6eae7eb39" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/laravel-desktop-notifier/zipball/d9935c73670f368032d84092a554417d71ee2233", - "reference": "d9935c73670f368032d84092a554417d71ee2233", + "url": "https://api.github.com/repos/nunomaduro/laravel-desktop-notifier/zipball/9937f1f8898077ad6d058c03ecee39d6eae7eb39", + "reference": "9937f1f8898077ad6d058c03ecee39d6eae7eb39", "shasum": "" }, "require": { @@ -4773,42 +4695,43 @@ ], "support": { "issues": "https://github.com/nunomaduro/laravel-desktop-notifier/issues", - "source": "https://github.com/nunomaduro/laravel-desktop-notifier/tree/v2.8.0" + "source": "https://github.com/nunomaduro/laravel-desktop-notifier/tree/v2.8.1" }, - "time": "2024-03-05T13:34:36+00:00" + "time": "2024-04-06T06:39:11+00:00" }, { "name": "pestphp/pest", - "version": "v2.35.1", + "version": "v2.36.0", "source": { "type": "git", "url": "https://github.com/pestphp/pest.git", - "reference": "b13acb630df52c06123588d321823c31fc685545" + "reference": "f8c88bd14dc1772bfaf02169afb601ecdf2724cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pestphp/pest/zipball/b13acb630df52c06123588d321823c31fc685545", - "reference": "b13acb630df52c06123588d321823c31fc685545", + "url": "https://api.github.com/repos/pestphp/pest/zipball/f8c88bd14dc1772bfaf02169afb601ecdf2724cd", + "reference": "f8c88bd14dc1772bfaf02169afb601ecdf2724cd", "shasum": "" }, "require": { "brianium/paratest": "^7.3.1", - "nunomaduro/collision": "^7.10.0|^8.4.0", - "nunomaduro/termwind": "^1.15.1|^2.0.1", + "nunomaduro/collision": "^7.11.0|^8.4.0", + "nunomaduro/termwind": "^1.16.0|^2.1.0", "pestphp/pest-plugin": "^2.1.1", "pestphp/pest-plugin-arch": "^2.7.0", "php": "^8.1.0", - "phpunit/phpunit": "^10.5.17" + "phpunit/phpunit": "^10.5.36" }, "conflict": { - "phpunit/phpunit": ">10.5.17", + "filp/whoops": "<2.16.0", + "phpunit/phpunit": ">10.5.36", "sebastian/exporter": "<5.1.0", "webmozart/assert": "<1.11.0" }, "require-dev": { - "pestphp/pest-dev-tools": "^2.16.0", - "pestphp/pest-plugin-type-coverage": "^2.8.5", - "symfony/process": "^6.4.0|^7.1.3" + "pestphp/pest-dev-tools": "^2.17.0", + "pestphp/pest-plugin-type-coverage": "^2.8.7", + "symfony/process": "^6.4.0|^7.1.5" }, "bin": [ "bin/pest" @@ -4871,7 +4794,7 @@ ], "support": { "issues": "https://github.com/pestphp/pest/issues", - "source": "https://github.com/pestphp/pest/tree/v2.35.1" + "source": "https://github.com/pestphp/pest/tree/v2.36.0" }, "funding": [ { @@ -4883,7 +4806,7 @@ "type": "github" } ], - "time": "2024-08-20T21:41:50+00:00" + "time": "2024-10-15T15:30:56+00:00" }, { "name": "pestphp/pest-plugin", @@ -5264,16 +5187,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.4.1", + "version": "5.6.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c" + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", - "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/f3558a4c23426d12bffeaab463f8a8d8b681193c", + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c", "shasum": "" }, "require": { @@ -5282,17 +5205,17 @@ "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", "phpdocumentor/type-resolver": "^1.7", - "phpstan/phpdoc-parser": "^1.7", + "phpstan/phpdoc-parser": "^1.7|^2.0", "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.5", + "mockery/mockery": "~1.3.5 || ~1.6.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.8", "phpstan/phpstan-mockery": "^1.1", "phpstan/phpstan-webmozart-assert": "^1.2", "phpunit/phpunit": "^9.5", - "vimeo/psalm": "^5.13" + "psalm/phar": "^5.26" }, "type": "library", "extra": { @@ -5322,29 +5245,29 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.0" }, - "time": "2024-05-21T05:55:05+00:00" + "time": "2024-11-12T11:25:25+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.8.2", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "153ae662783729388a584b4361f2545e4d841e3c" + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", - "reference": "153ae662783729388a584b4361f2545e4d841e3c", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a", + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.13" + "phpstan/phpdoc-parser": "^1.18|^2.0" }, "require-dev": { "ext-tokenizer": "*", @@ -5380,22 +5303,22 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0" }, - "time": "2024-02-23T11:10:43+00:00" + "time": "2024-11-09T15:12:26+00:00" }, { "name": "phpoption/phpoption", - "version": "1.9.2", + "version": "1.9.3", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820" + "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820", - "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54", + "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54", "shasum": "" }, "require": { @@ -5403,13 +5326,13 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28" }, "type": "library", "extra": { "bamarni-bin": { "bin-links": true, - "forward-command": true + "forward-command": false }, "branch-alias": { "dev-master": "1.9-dev" @@ -5445,7 +5368,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.9.2" + "source": "https://github.com/schmittjoh/php-option/tree/1.9.3" }, "funding": [ { @@ -5457,34 +5380,34 @@ "type": "tidelift" } ], - "time": "2023-11-12T21:59:55+00:00" + "time": "2024-07-20T21:41:07+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.30.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "5ceb0e384997db59f38774bf79c2a6134252c08f" + "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/5ceb0e384997db59f38774bf79c2a6134252c08f", - "reference": "5ceb0e384997db59f38774bf79c2a6134252c08f", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/c00d78fb6b29658347f9d37ebe104bffadf36299", + "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "doctrine/annotations": "^2.0", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^5.3.0", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.5", - "phpstan/phpstan-phpunit": "^1.1", - "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^9.5", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan-strict-rules": "^2.0", + "phpunit/phpunit": "^9.6", "symfony/process": "^5.2" }, "type": "library", @@ -5502,9 +5425,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.30.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.0" }, - "time": "2024-08-29T09:54:52+00:00" + "time": "2024-10-13T11:29:49+00:00" }, { "name": "phpunit/php-code-coverage", @@ -5829,16 +5752,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.17", + "version": "10.5.36", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c1f736a473d21957ead7e94fcc029f571895abf5" + "reference": "aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c1f736a473d21957ead7e94fcc029f571895abf5", - "reference": "c1f736a473d21957ead7e94fcc029f571895abf5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870", + "reference": "aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870", "shasum": "" }, "require": { @@ -5848,26 +5771,26 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", "php": ">=8.1", - "phpunit/php-code-coverage": "^10.1.5", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-invoker": "^4.0", - "phpunit/php-text-template": "^3.0", - "phpunit/php-timer": "^6.0", - "sebastian/cli-parser": "^2.0", - "sebastian/code-unit": "^2.0", - "sebastian/comparator": "^5.0", - "sebastian/diff": "^5.0", - "sebastian/environment": "^6.0", - "sebastian/exporter": "^5.1", - "sebastian/global-state": "^6.0.1", - "sebastian/object-enumerator": "^5.0", - "sebastian/recursion-context": "^5.0", - "sebastian/type": "^4.0", - "sebastian/version": "^4.0" + "phpunit/php-code-coverage": "^10.1.16", + "phpunit/php-file-iterator": "^4.1.0", + "phpunit/php-invoker": "^4.0.0", + "phpunit/php-text-template": "^3.0.1", + "phpunit/php-timer": "^6.0.0", + "sebastian/cli-parser": "^2.0.1", + "sebastian/code-unit": "^2.0.0", + "sebastian/comparator": "^5.0.2", + "sebastian/diff": "^5.1.1", + "sebastian/environment": "^6.1.0", + "sebastian/exporter": "^5.1.2", + "sebastian/global-state": "^6.0.2", + "sebastian/object-enumerator": "^5.0.0", + "sebastian/recursion-context": "^5.0.0", + "sebastian/type": "^4.0.0", + "sebastian/version": "^4.0.1" }, "suggest": { "ext-soap": "To be able to generate mocks based on WSDL files" @@ -5910,7 +5833,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.17" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.36" }, "funding": [ { @@ -5926,7 +5849,7 @@ "type": "tidelift" } ], - "time": "2024-04-05T04:39:01+00:00" + "time": "2024-10-08T15:36:51+00:00" }, { "name": "psr/event-dispatcher", @@ -5980,16 +5903,16 @@ }, { "name": "psr/log", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "79dff0b268932c640297f5208d6298f71855c03e" + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e", - "reference": "79dff0b268932c640297f5208d6298f71855c03e", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", "shasum": "" }, "require": { @@ -6024,9 +5947,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.1" + "source": "https://github.com/php-fig/log/tree/3.0.2" }, - "time": "2024-08-21T13:31:24+00:00" + "time": "2024-09-11T13:17:53+00:00" }, { "name": "ramsey/collection", @@ -6119,20 +6042,20 @@ }, { "name": "ramsey/uuid", - "version": "4.7.5", + "version": "4.7.6", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e" + "reference": "91039bc1faa45ba123c4328958e620d382ec7088" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e", - "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088", + "reference": "91039bc1faa45ba123c4328958e620d382ec7088", "shasum": "" }, "require": { - "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11", + "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12", "ext-json": "*", "php": "^8.0", "ramsey/collection": "^1.2 || ^2.0" @@ -6195,7 +6118,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.7.5" + "source": "https://github.com/ramsey/uuid/tree/4.7.6" }, "funding": [ { @@ -6207,7 +6130,7 @@ "type": "tidelift" } ], - "time": "2023-11-08T05:53:05+00:00" + "time": "2024-04-27T21:32:50+00:00" }, { "name": "sebastian/cli-parser", @@ -6379,16 +6302,16 @@ }, { "name": "sebastian/comparator", - "version": "5.0.2", + "version": "5.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53" + "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53", - "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", + "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", "shasum": "" }, "require": { @@ -6399,7 +6322,7 @@ "sebastian/exporter": "^5.0" }, "require-dev": { - "phpunit/phpunit": "^10.4" + "phpunit/phpunit": "^10.5" }, "type": "library", "extra": { @@ -6444,7 +6367,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.2" + "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3" }, "funding": [ { @@ -6452,7 +6375,7 @@ "type": "github" } ], - "time": "2024-08-12T06:03:08+00:00" + "time": "2024-10-18T14:56:07+00:00" }, { "name": "sebastian/complexity", @@ -7127,16 +7050,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.4.6", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "64db1c1802e3a4557e37ba33031ac39f452ac5d4" + "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/64db1c1802e3a4557e37ba33031ac39f452ac5d4", - "reference": "64db1c1802e3a4557e37ba33031ac39f452ac5d4", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/9e024324511eeb00983ee76b9aedc3e6ecd993d9", + "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9", "shasum": "" }, "require": { @@ -7182,7 +7105,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.6" + "source": "https://github.com/symfony/error-handler/tree/v6.4.14" }, "funding": [ { @@ -7198,20 +7121,20 @@ "type": "tidelift" } ], - "time": "2024-03-19T11:56:30+00:00" + "time": "2024-11-05T15:34:40+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v6.4.3", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef" + "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae9d3a6f3003a6caf56acd7466d8d52378d44fef", - "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", + "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", "shasum": "" }, "require": { @@ -7262,7 +7185,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.3" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.13" }, "funding": [ { @@ -7278,7 +7201,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -7358,16 +7281,16 @@ }, { "name": "symfony/process", - "version": "v6.4.8", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5" + "reference": "3cb242f059c14ae08591c5c4087d1fe443564392" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5", - "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5", + "url": "https://api.github.com/repos/symfony/process/zipball/3cb242f059c14ae08591c5c4087d1fe443564392", + "reference": "3cb242f059c14ae08591c5c4087d1fe443564392", "shasum": "" }, "require": { @@ -7399,7 +7322,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.8" + "source": "https://github.com/symfony/process/tree/v6.4.15" }, "funding": [ { @@ -7415,20 +7338,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-11-06T14:19:14+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.6", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4" + "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/95bd2706a97fb875185b51ecaa6112ec184233d4", - "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80", + "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80", "shasum": "" }, "require": { @@ -7484,7 +7407,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.6" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.15" }, "funding": [ { @@ -7500,7 +7423,7 @@ "type": "tidelift" } ], - "time": "2024-03-19T11:56:30+00:00" + "time": "2024-11-08T15:28:48+00:00" }, { "name": "ta-tikoma/phpunit-architecture-test", @@ -7613,23 +7536,23 @@ }, { "name": "vlucas/phpdotenv", - "version": "v5.6.0", + "version": "v5.6.1", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4" + "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", - "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2", + "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2", "shasum": "" }, "require": { "ext-pcre": "*", - "graham-campbell/result-type": "^1.1.2", + "graham-campbell/result-type": "^1.1.3", "php": "^7.2.5 || ^8.0", - "phpoption/phpoption": "^1.9.2", + "phpoption/phpoption": "^1.9.3", "symfony/polyfill-ctype": "^1.24", "symfony/polyfill-mbstring": "^1.24", "symfony/polyfill-php80": "^1.24" @@ -7646,7 +7569,7 @@ "extra": { "bamarni-bin": { "bin-links": true, - "forward-command": true + "forward-command": false }, "branch-alias": { "dev-master": "5.6-dev" @@ -7681,7 +7604,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.1" }, "funding": [ { @@ -7693,7 +7616,7 @@ "type": "tidelift" } ], - "time": "2023-11-12T22:43:29+00:00" + "time": "2024-07-20T21:52:34+00:00" }, { "name": "webmozart/assert", @@ -7756,12 +7679,12 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": true, "prefer-lowest": false, "platform": { "php": "^8.1" }, - "platform-dev": [], + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/demo.gif b/demo.gif index a732c88c..762c5a54 100644 Binary files a/demo.gif and b/demo.gif differ diff --git a/docs/Contribute.md b/docs/Contribute.md new file mode 100644 index 00000000..70923901 --- /dev/null +++ b/docs/Contribute.md @@ -0,0 +1,14 @@ +# How to contribute + +## Build + +```shell +php phpunit-slicer app:build phpunit-slicer +php phpunit-slicer app:build phpunit-slicer --build-version=0.0.X +``` + +Maintain composer packages with php 8.1 + +```bash +/opt/homebrew/opt/php@8.1/bin/php /opt/homebrew/bin//composer update +``` diff --git a/docs/Home.md b/docs/Home.md index 2de60a3a..a1ea2e16 100644 --- a/docs/Home.md +++ b/docs/Home.md @@ -1,4 +1,46 @@ -// under construction +# phpunit-slicer documentation -note -- https://www.testmo.com/guides/github-actions-parallel-testing +PHPUnit-slicer is a tool to split a PHPUnit test suite into multiple test suites. + +## Install + +### From latest release +PHPUnit-slicer binary is available on [release page](https://github.com/abenevaut/phpunit-slicer/releases/latest) + +```bash +curl -L -o phpunit-slicer https://github.com/abenevaut/phpunit-slicer/releases/latest/download/phpunit-slicer +chmod +x phpunit-slicer +``` + +A hash file is available to check the integrity of the binary. + +```bash +curl -L -o phpunit-slicer https://github.com/abenevaut/phpunit-slicer/releases/latest/download/phpunit-slicer.sha512sum +sha512sum -c phpunit-slicer.sha512sum +``` + +### From composer +Or, you can install the tool locally or globally with composer, depending on your usage. + +```bash +composer require abenevaut/phpunit-slicer +``` + +```bash +composer global require abenevaut/phpunit-slicer +``` + +- [Packagist](https://packagist.org/packages/abenevaut/phpunit-slicer) + +## Usage +```shell +phpunit-slicer slice 4 ./phpunit.xml.dist ./phpunit.xml ./tests +``` + +### Use cases +```shell +vendor/bin/phpunit --testsuite sliced-testsuite-0 --configuration phpunit.xml +vendor/bin/pest --testsuite sliced-testsuite-1 --configuration phpunit.xml +php artisan test --testsuite sliced-testsuite-2 --configuration phpunit.xml +php laravel-zero-project test --testsuite sliced-testsuite-3 --configuration phpunit.xml +``` diff --git a/vendor/bin/paratest.bat b/vendor/bin/paratest.bat index f29b112c..076e89e9 100644 --- a/vendor/bin/paratest.bat +++ b/vendor/bin/paratest.bat @@ -34,4 +34,4 @@ if [ -n "$bashSource" ]; then fi fi -"${dir}/paratest.bat" "$@" +exec "${dir}/paratest.bat" "$@" diff --git a/vendor/brick/math/CHANGELOG.md b/vendor/brick/math/CHANGELOG.md index 17cea8d9..680fa9ba 100644 --- a/vendor/brick/math/CHANGELOG.md +++ b/vendor/brick/math/CHANGELOG.md @@ -2,6 +2,24 @@ All notable changes to this project will be documented in this file. +## [0.12.1](https://github.com/brick/math/releases/tag/0.12.1) - 2023-11-29 + +⚡️ **Performance improvements** + +- `BigNumber::of()` is now faster, thanks to [@SebastienDug](https://github.com/SebastienDug) in [#77](https://github.com/brick/math/pull/77). + +## [0.12.0](https://github.com/brick/math/releases/tag/0.12.0) - 2023-11-26 + +💥 **Breaking changes** + +- Minimum PHP version is now 8.1 +- `RoundingMode` is now an `enum`; if you're type-hinting rounding modes, you need to type-hint against `RoundingMode` instead of `int` now +- `BigNumber` classes do not implement the `Serializable` interface anymore (they use the [new custom object serialization mechanism](https://wiki.php.net/rfc/custom_object_serialization)) +- The following breaking changes only affect you if you're creating your own `BigNumber` subclasses: + - the return type of `BigNumber::of()` is now `static` + - `BigNumber` has a new abstract method `from()` + - all `public` and `protected` functions of `BigNumber` are now `final` + ## [0.11.0](https://github.com/brick/math/releases/tag/0.11.0) - 2023-01-16 💥 **Breaking changes** diff --git a/vendor/brick/math/composer.json b/vendor/brick/math/composer.json index ed817bdd..bd67343a 100644 --- a/vendor/brick/math/composer.json +++ b/vendor/brick/math/composer.json @@ -5,21 +5,26 @@ "keywords": [ "Brick", "Math", + "Mathematics", "Arbitrary-precision", "Arithmetic", "BigInteger", "BigDecimal", "BigRational", - "Bignum" + "BigNumber", + "Bignum", + "Decimal", + "Rational", + "Integer" ], "license": "MIT", "require": { - "php": "^8.0" + "php": "^8.1" }, "require-dev": { - "phpunit/phpunit": "^9.0", + "phpunit/phpunit": "^10.1", "php-coveralls/php-coveralls": "^2.2", - "vimeo/psalm": "5.0.0" + "vimeo/psalm": "5.16.0" }, "autoload": { "psr-4": { diff --git a/vendor/brick/math/src/BigDecimal.php b/vendor/brick/math/src/BigDecimal.php index 02fc6561..31d22ab3 100644 --- a/vendor/brick/math/src/BigDecimal.php +++ b/vendor/brick/math/src/BigDecimal.php @@ -23,14 +23,14 @@ final class BigDecimal extends BigNumber * No leading zero must be present. * No leading minus sign must be present if the value is 0. */ - private string $value; + private readonly string $value; /** * The scale (number of digits after the decimal point) of this decimal number. * * This must be zero or more. */ - private int $scale; + private readonly int $scale; /** * Protected constructor. Use a factory method to obtain an instance. @@ -45,15 +45,11 @@ protected function __construct(string $value, int $scale = 0) } /** - * Creates a BigDecimal of the given value. - * - * @throws MathException If the value cannot be converted to a BigDecimal. - * * @psalm-pure */ - public static function of(BigNumber|int|float|string $value) : BigDecimal + protected static function from(BigNumber $number): static { - return parent::of($value)->toBigDecimal(); + return $number->toBigDecimal(); } /** @@ -223,12 +219,12 @@ public function multipliedBy(BigNumber|int|float|string $that) : BigDecimal * * @param BigNumber|int|float|string $that The divisor. * @param int|null $scale The desired scale, or null to use the scale of this number. - * @param int $roundingMode An optional rounding mode. + * @param RoundingMode $roundingMode An optional rounding mode, defaults to UNNECESSARY. * * @throws \InvalidArgumentException If the scale or rounding mode is invalid. * @throws MathException If the number is invalid, is zero, or rounding was necessary. */ - public function dividedBy(BigNumber|int|float|string $that, ?int $scale = null, int $roundingMode = RoundingMode::UNNECESSARY) : BigDecimal + public function dividedBy(BigNumber|int|float|string $that, ?int $scale = null, RoundingMode $roundingMode = RoundingMode::UNNECESSARY) : BigDecimal { $that = BigDecimal::of($that); @@ -324,7 +320,7 @@ public function power(int $exponent) : BigDecimal } /** - * Returns the quotient of the division of this number by this given one. + * Returns the quotient of the division of this number by the given one. * * The quotient has a scale of `0`. * @@ -349,7 +345,7 @@ public function quotient(BigNumber|int|float|string $that) : BigDecimal } /** - * Returns the remainder of the division of this number by this given one. + * Returns the remainder of the division of this number by the given one. * * The remainder has a scale of `max($this->scale, $that->scale)`. * @@ -384,6 +380,8 @@ public function remainder(BigNumber|int|float|string $that) : BigDecimal * * @return BigDecimal[] An array containing the quotient and the remainder. * + * @psalm-return array{BigDecimal, BigDecimal} + * * @throws MathException If the divisor is not a valid decimal number, or is zero. */ public function quotientAndRemainder(BigNumber|int|float|string $that) : array @@ -631,7 +629,7 @@ public function toBigRational() : BigRational return self::newBigRational($numerator, $denominator, false); } - public function toScale(int $scale, int $roundingMode = RoundingMode::UNNECESSARY) : BigDecimal + public function toScale(int $scale, RoundingMode $roundingMode = RoundingMode::UNNECESSARY) : BigDecimal { if ($scale === $this->scale) { return $this; @@ -693,36 +691,6 @@ public function __unserialize(array $data): void $this->scale = $data['scale']; } - /** - * This method is required by interface Serializable and SHOULD NOT be accessed directly. - * - * @internal - */ - public function serialize() : string - { - return $this->value . ':' . $this->scale; - } - - /** - * This method is only here to implement interface Serializable and cannot be accessed directly. - * - * @internal - * @psalm-suppress RedundantPropertyInitializationCheck - * - * @throws \LogicException - */ - public function unserialize($value) : void - { - if (isset($this->value)) { - throw new \LogicException('unserialize() is an internal function, it must not be called directly.'); - } - - [$value, $scale] = \explode(':', $value); - - $this->value = $value; - $this->scale = (int) $scale; - } - /** * Puts the internal values of the given decimal numbers on the same scale. * diff --git a/vendor/brick/math/src/BigInteger.php b/vendor/brick/math/src/BigInteger.php index 43567933..73dcc89a 100644 --- a/vendor/brick/math/src/BigInteger.php +++ b/vendor/brick/math/src/BigInteger.php @@ -27,7 +27,7 @@ final class BigInteger extends BigNumber * No leading zeros must be present. * No leading minus sign must be present if the number is zero. */ - private string $value; + private readonly string $value; /** * Protected constructor. Use a factory method to obtain an instance. @@ -40,15 +40,11 @@ protected function __construct(string $value) } /** - * Creates a BigInteger of the given value. - * - * @throws MathException If the value cannot be converted to a BigInteger. - * * @psalm-pure */ - public static function of(BigNumber|int|float|string $value) : BigInteger + protected static function from(BigNumber $number): static { - return parent::of($value)->toBigInteger(); + return $number->toBigInteger(); } /** @@ -225,9 +221,10 @@ public static function randomBits(int $numBits, ?callable $randomBytesGenerator } if ($randomBytesGenerator === null) { - $randomBytesGenerator = 'random_bytes'; + $randomBytesGenerator = random_bytes(...); } + /** @var int<1, max> $byteLength */ $byteLength = \intdiv($numBits - 1, 8) + 1; $extraBits = ($byteLength * 8 - $numBits); @@ -429,12 +426,12 @@ public function multipliedBy(BigNumber|int|float|string $that) : BigInteger * Returns the result of the division of this number by the given one. * * @param BigNumber|int|float|string $that The divisor. Must be convertible to a BigInteger. - * @param int $roundingMode An optional rounding mode. + * @param RoundingMode $roundingMode An optional rounding mode, defaults to UNNECESSARY. * * @throws MathException If the divisor is not a valid number, is not convertible to a BigInteger, is zero, * or RoundingMode::UNNECESSARY is used and the remainder is not zero. */ - public function dividedBy(BigNumber|int|float|string $that, int $roundingMode = RoundingMode::UNNECESSARY) : BigInteger + public function dividedBy(BigNumber|int|float|string $that, RoundingMode $roundingMode = RoundingMode::UNNECESSARY) : BigInteger { $that = BigInteger::of($that); @@ -534,6 +531,8 @@ public function remainder(BigNumber|int|float|string $that) : BigInteger * * @return BigInteger[] An array containing the quotient and the remainder. * + * @psalm-return array{BigInteger, BigInteger} + * * @throws DivisionByZeroException If the divisor is zero. */ public function quotientAndRemainder(BigNumber|int|float|string $that) : array @@ -888,7 +887,7 @@ public function toBigRational() : BigRational return self::newBigRational($this, BigInteger::one(), false); } - public function toScale(int $scale, int $roundingMode = RoundingMode::UNNECESSARY) : BigDecimal + public function toScale(int $scale, RoundingMode $roundingMode = RoundingMode::UNNECESSARY) : BigDecimal { return $this->toBigDecimal()->toScale($scale, $roundingMode); } @@ -1049,31 +1048,4 @@ public function __unserialize(array $data): void $this->value = $data['value']; } - - /** - * This method is required by interface Serializable and SHOULD NOT be accessed directly. - * - * @internal - */ - public function serialize() : string - { - return $this->value; - } - - /** - * This method is only here to implement interface Serializable and cannot be accessed directly. - * - * @internal - * @psalm-suppress RedundantPropertyInitializationCheck - * - * @throws \LogicException - */ - public function unserialize($value) : void - { - if (isset($this->value)) { - throw new \LogicException('unserialize() is an internal function, it must not be called directly.'); - } - - $this->value = $value; - } } diff --git a/vendor/brick/math/src/BigNumber.php b/vendor/brick/math/src/BigNumber.php index 80146d20..5a0df783 100644 --- a/vendor/brick/math/src/BigNumber.php +++ b/vendor/brick/math/src/BigNumber.php @@ -14,26 +14,29 @@ * * @psalm-immutable */ -abstract class BigNumber implements \Serializable, \JsonSerializable +abstract class BigNumber implements \JsonSerializable { /** - * The regular expression used to parse integer, decimal and rational numbers. + * The regular expression used to parse integer or decimal numbers. */ - private const PARSE_REGEXP = + private const PARSE_REGEXP_NUMERICAL = '/^' . '(?[\-\+])?' . - '(?:' . - '(?:' . - '(?[0-9]+)?' . - '(?\.)?' . - '(?[0-9]+)?' . - '(?:[eE](?[\-\+]?[0-9]+))?' . - ')|(?:' . - '(?[0-9]+)' . - '\/?' . - '(?[0-9]+)' . - ')' . - ')' . + '(?[0-9]+)?' . + '(?\.)?' . + '(?[0-9]+)?' . + '(?:[eE](?[\-\+]?[0-9]+))?' . + '$/'; + + /** + * The regular expression used to parse rational numbers. + */ + private const PARSE_REGEXP_RATIONAL = + '/^' . + '(?[\-\+])?' . + '(?[0-9]+)' . + '\/?' . + '(?[0-9]+)' . '$/'; /** @@ -53,7 +56,24 @@ abstract class BigNumber implements \Serializable, \JsonSerializable * * @psalm-pure */ - public static function of(BigNumber|int|float|string $value) : BigNumber + final public static function of(BigNumber|int|float|string $value) : static + { + $value = self::_of($value); + + if (static::class === BigNumber::class) { + // https://github.com/vimeo/psalm/issues/10309 + assert($value instanceof static); + + return $value; + } + + return static::from($value); + } + + /** + * @psalm-pure + */ + private static function _of(BigNumber|int|float|string $value) : BigNumber { if ($value instanceof BigNumber) { return $value; @@ -63,34 +83,25 @@ public static function of(BigNumber|int|float|string $value) : BigNumber return new BigInteger((string) $value); } - $value = \is_float($value) ? self::floatToString($value) : $value; - - $throw = static function() use ($value) : void { - throw new NumberFormatException(\sprintf( - 'The given value "%s" does not represent a valid number.', - $value - )); - }; - - if (\preg_match(self::PARSE_REGEXP, $value, $matches) !== 1) { - $throw(); + if (is_float($value)) { + $value = (string) $value; } - $getMatch = static fn(string $value): ?string => (($matches[$value] ?? '') !== '') ? $matches[$value] : null; + if (str_contains($value, '/')) { + // Rational number + if (\preg_match(self::PARSE_REGEXP_RATIONAL, $value, $matches, PREG_UNMATCHED_AS_NULL) !== 1) { + throw NumberFormatException::invalidFormat($value); + } - $sign = $getMatch('sign'); - $numerator = $getMatch('numerator'); - $denominator = $getMatch('denominator'); + $sign = $matches['sign']; + $numerator = $matches['numerator']; + $denominator = $matches['denominator']; - if ($numerator !== null) { + assert($numerator !== null); assert($denominator !== null); - if ($sign !== null) { - $numerator = $sign . $numerator; - } - - $numerator = self::cleanUp($numerator); - $denominator = self::cleanUp($denominator); + $numerator = self::cleanUp($sign, $numerator); + $denominator = self::cleanUp(null, $denominator); if ($denominator === '0') { throw DivisionByZeroException::denominatorMustNotBeZero(); @@ -101,67 +112,62 @@ public static function of(BigNumber|int|float|string $value) : BigNumber new BigInteger($denominator), false ); - } + } else { + // Integer or decimal number + if (\preg_match(self::PARSE_REGEXP_NUMERICAL, $value, $matches, PREG_UNMATCHED_AS_NULL) !== 1) { + throw NumberFormatException::invalidFormat($value); + } - $point = $getMatch('point'); - $integral = $getMatch('integral'); - $fractional = $getMatch('fractional'); - $exponent = $getMatch('exponent'); + $sign = $matches['sign']; + $point = $matches['point']; + $integral = $matches['integral']; + $fractional = $matches['fractional']; + $exponent = $matches['exponent']; - if ($integral === null && $fractional === null) { - $throw(); - } + if ($integral === null && $fractional === null) { + throw NumberFormatException::invalidFormat($value); + } - if ($integral === null) { - $integral = '0'; - } + if ($integral === null) { + $integral = '0'; + } - if ($point !== null || $exponent !== null) { - $fractional = ($fractional ?? ''); - $exponent = ($exponent !== null) ? (int) $exponent : 0; + if ($point !== null || $exponent !== null) { + $fractional = ($fractional ?? ''); + $exponent = ($exponent !== null) ? (int)$exponent : 0; - if ($exponent === PHP_INT_MIN || $exponent === PHP_INT_MAX) { - throw new NumberFormatException('Exponent too large.'); - } + if ($exponent === PHP_INT_MIN || $exponent === PHP_INT_MAX) { + throw new NumberFormatException('Exponent too large.'); + } - $unscaledValue = self::cleanUp(($sign ?? ''). $integral . $fractional); + $unscaledValue = self::cleanUp($sign, $integral . $fractional); - $scale = \strlen($fractional) - $exponent; + $scale = \strlen($fractional) - $exponent; - if ($scale < 0) { - if ($unscaledValue !== '0') { - $unscaledValue .= \str_repeat('0', - $scale); + if ($scale < 0) { + if ($unscaledValue !== '0') { + $unscaledValue .= \str_repeat('0', -$scale); + } + $scale = 0; } - $scale = 0; - } - return new BigDecimal($unscaledValue, $scale); - } + return new BigDecimal($unscaledValue, $scale); + } - $integral = self::cleanUp(($sign ?? '') . $integral); + $integral = self::cleanUp($sign, $integral); - return new BigInteger($integral); + return new BigInteger($integral); + } } /** - * Safely converts float to string, avoiding locale-dependent issues. + * Overridden by subclasses to convert a BigNumber to an instance of the subclass. * - * @see https://github.com/brick/math/pull/20 + * @throws MathException If the value cannot be converted. * * @psalm-pure - * @psalm-suppress ImpureFunctionCall */ - private static function floatToString(float $float) : string - { - $currentLocale = \setlocale(LC_NUMERIC, '0'); - \setlocale(LC_NUMERIC, 'C'); - - $result = (string) $float; - - \setlocale(LC_NUMERIC, $currentLocale); - - return $result; - } + abstract protected static function from(BigNumber $number): static; /** * Proxy method to access BigInteger's protected constructor from sibling classes. @@ -169,7 +175,7 @@ private static function floatToString(float $float) : string * @internal * @psalm-pure */ - protected function newBigInteger(string $value) : BigInteger + final protected function newBigInteger(string $value) : BigInteger { return new BigInteger($value); } @@ -180,7 +186,7 @@ protected function newBigInteger(string $value) : BigInteger * @internal * @psalm-pure */ - protected function newBigDecimal(string $value, int $scale = 0) : BigDecimal + final protected function newBigDecimal(string $value, int $scale = 0) : BigDecimal { return new BigDecimal($value, $scale); } @@ -191,7 +197,7 @@ protected function newBigDecimal(string $value, int $scale = 0) : BigDecimal * @internal * @psalm-pure */ - protected function newBigRational(BigInteger $numerator, BigInteger $denominator, bool $checkDenominator) : BigRational + final protected function newBigRational(BigInteger $numerator, BigInteger $denominator, bool $checkDenominator) : BigRational { return new BigRational($numerator, $denominator, $checkDenominator); } @@ -205,11 +211,9 @@ protected function newBigRational(BigInteger $numerator, BigInteger $denominator * @throws \InvalidArgumentException If no values are given. * @throws MathException If an argument is not valid. * - * @psalm-suppress LessSpecificReturnStatement - * @psalm-suppress MoreSpecificReturnType * @psalm-pure */ - public static function min(BigNumber|int|float|string ...$values) : static + final public static function min(BigNumber|int|float|string ...$values) : static { $min = null; @@ -237,11 +241,9 @@ public static function min(BigNumber|int|float|string ...$values) : static * @throws \InvalidArgumentException If no values are given. * @throws MathException If an argument is not valid. * - * @psalm-suppress LessSpecificReturnStatement - * @psalm-suppress MoreSpecificReturnType * @psalm-pure */ - public static function max(BigNumber|int|float|string ...$values) : static + final public static function max(BigNumber|int|float|string ...$values) : static { $max = null; @@ -271,7 +273,7 @@ public static function max(BigNumber|int|float|string ...$values) : static * * @psalm-pure */ - public static function sum(BigNumber|int|float|string ...$values) : static + final public static function sum(BigNumber|int|float|string ...$values) : static { /** @var static|null $sum */ $sum = null; @@ -323,37 +325,28 @@ private static function add(BigNumber $a, BigNumber $b) : BigNumber } /** - * Removes optional leading zeros and + sign from the given number. + * Removes optional leading zeros and applies sign. * - * @param string $number The number, validated as a non-empty string of digits with optional leading sign. + * @param string|null $sign The sign, '+' or '-', optional. Null is allowed for convenience and treated as '+'. + * @param string $number The number, validated as a non-empty string of digits. * * @psalm-pure */ - private static function cleanUp(string $number) : string + private static function cleanUp(string|null $sign, string $number) : string { - $firstChar = $number[0]; - - if ($firstChar === '+' || $firstChar === '-') { - $number = \substr($number, 1); - } - $number = \ltrim($number, '0'); if ($number === '') { return '0'; } - if ($firstChar === '-') { - return '-' . $number; - } - - return $number; + return $sign === '-' ? '-' . $number : $number; } /** * Checks if this number is equal to the given one. */ - public function isEqualTo(BigNumber|int|float|string $that) : bool + final public function isEqualTo(BigNumber|int|float|string $that) : bool { return $this->compareTo($that) === 0; } @@ -361,7 +354,7 @@ public function isEqualTo(BigNumber|int|float|string $that) : bool /** * Checks if this number is strictly lower than the given one. */ - public function isLessThan(BigNumber|int|float|string $that) : bool + final public function isLessThan(BigNumber|int|float|string $that) : bool { return $this->compareTo($that) < 0; } @@ -369,7 +362,7 @@ public function isLessThan(BigNumber|int|float|string $that) : bool /** * Checks if this number is lower than or equal to the given one. */ - public function isLessThanOrEqualTo(BigNumber|int|float|string $that) : bool + final public function isLessThanOrEqualTo(BigNumber|int|float|string $that) : bool { return $this->compareTo($that) <= 0; } @@ -377,7 +370,7 @@ public function isLessThanOrEqualTo(BigNumber|int|float|string $that) : bool /** * Checks if this number is strictly greater than the given one. */ - public function isGreaterThan(BigNumber|int|float|string $that) : bool + final public function isGreaterThan(BigNumber|int|float|string $that) : bool { return $this->compareTo($that) > 0; } @@ -385,7 +378,7 @@ public function isGreaterThan(BigNumber|int|float|string $that) : bool /** * Checks if this number is greater than or equal to the given one. */ - public function isGreaterThanOrEqualTo(BigNumber|int|float|string $that) : bool + final public function isGreaterThanOrEqualTo(BigNumber|int|float|string $that) : bool { return $this->compareTo($that) >= 0; } @@ -393,7 +386,7 @@ public function isGreaterThanOrEqualTo(BigNumber|int|float|string $that) : bool /** * Checks if this number equals zero. */ - public function isZero() : bool + final public function isZero() : bool { return $this->getSign() === 0; } @@ -401,7 +394,7 @@ public function isZero() : bool /** * Checks if this number is strictly negative. */ - public function isNegative() : bool + final public function isNegative() : bool { return $this->getSign() < 0; } @@ -409,7 +402,7 @@ public function isNegative() : bool /** * Checks if this number is negative or zero. */ - public function isNegativeOrZero() : bool + final public function isNegativeOrZero() : bool { return $this->getSign() <= 0; } @@ -417,7 +410,7 @@ public function isNegativeOrZero() : bool /** * Checks if this number is strictly positive. */ - public function isPositive() : bool + final public function isPositive() : bool { return $this->getSign() > 0; } @@ -425,7 +418,7 @@ public function isPositive() : bool /** * Checks if this number is positive or zero. */ - public function isPositiveOrZero() : bool + final public function isPositiveOrZero() : bool { return $this->getSign() >= 0; } @@ -433,6 +426,8 @@ public function isPositiveOrZero() : bool /** * Returns the sign of this number. * + * @psalm-return -1|0|1 + * * @return int -1 if the number is negative, 0 if zero, 1 if positive. */ abstract public function getSign() : int; @@ -440,7 +435,9 @@ abstract public function getSign() : int; /** * Compares this number to the given one. * - * @return int [-1,0,1] If `$this` is lower than, equal to, or greater than `$that`. + * @psalm-return -1|0|1 + * + * @return int -1 if `$this` is lower than, 0 if equal to, 1 if greater than `$that`. * * @throws MathException If the number is not valid. */ @@ -468,13 +465,13 @@ abstract public function toBigRational() : BigRational; /** * Converts this number to a BigDecimal with the given scale, using rounding if necessary. * - * @param int $scale The scale of the resulting `BigDecimal`. - * @param int $roundingMode A `RoundingMode` constant. + * @param int $scale The scale of the resulting `BigDecimal`. + * @param RoundingMode $roundingMode An optional rounding mode, defaults to UNNECESSARY. * * @throws RoundingNecessaryException If this number cannot be converted to the given scale without rounding. * This only applies when RoundingMode::UNNECESSARY is used. */ - abstract public function toScale(int $scale, int $roundingMode = RoundingMode::UNNECESSARY) : BigDecimal; + abstract public function toScale(int $scale, RoundingMode $roundingMode = RoundingMode::UNNECESSARY) : BigDecimal; /** * Returns the exact value of this number as a native integer. @@ -505,7 +502,7 @@ abstract public function toFloat() : float; */ abstract public function __toString() : string; - public function jsonSerialize() : string + final public function jsonSerialize() : string { return $this->__toString(); } diff --git a/vendor/brick/math/src/BigRational.php b/vendor/brick/math/src/BigRational.php index 31f2904f..fc3060ed 100644 --- a/vendor/brick/math/src/BigRational.php +++ b/vendor/brick/math/src/BigRational.php @@ -21,12 +21,12 @@ final class BigRational extends BigNumber /** * The numerator. */ - private BigInteger $numerator; + private readonly BigInteger $numerator; /** * The denominator. Always strictly positive. */ - private BigInteger $denominator; + private readonly BigInteger $denominator; /** * Protected constructor. Use a factory method to obtain an instance. @@ -55,15 +55,11 @@ protected function __construct(BigInteger $numerator, BigInteger $denominator, b } /** - * Creates a BigRational of the given value. - * - * @throws MathException If the value cannot be converted to a BigRational. - * * @psalm-pure */ - public static function of(BigNumber|int|float|string $value) : BigRational + protected static function from(BigNumber $number): static { - return parent::of($value)->toBigRational(); + return $number->toBigRational(); } /** @@ -181,6 +177,8 @@ public function remainder() : BigInteger * Returns the quotient and remainder of the division of the numerator by the denominator. * * @return BigInteger[] + * + * @psalm-return array{BigInteger, BigInteger} */ public function quotientAndRemainder() : array { @@ -353,7 +351,7 @@ public function toBigRational() : BigRational return $this; } - public function toScale(int $scale, int $roundingMode = RoundingMode::UNNECESSARY) : BigDecimal + public function toScale(int $scale, RoundingMode $roundingMode = RoundingMode::UNNECESSARY) : BigDecimal { return $this->numerator->toBigDecimal()->dividedBy($this->denominator, $scale, $roundingMode); } @@ -412,34 +410,4 @@ public function __unserialize(array $data): void $this->numerator = $data['numerator']; $this->denominator = $data['denominator']; } - - /** - * This method is required by interface Serializable and SHOULD NOT be accessed directly. - * - * @internal - */ - public function serialize() : string - { - return $this->numerator . '/' . $this->denominator; - } - - /** - * This method is only here to implement interface Serializable and cannot be accessed directly. - * - * @internal - * @psalm-suppress RedundantPropertyInitializationCheck - * - * @throws \LogicException - */ - public function unserialize($value) : void - { - if (isset($this->numerator)) { - throw new \LogicException('unserialize() is an internal function, it must not be called directly.'); - } - - [$numerator, $denominator] = \explode('/', $value); - - $this->numerator = BigInteger::of($numerator); - $this->denominator = BigInteger::of($denominator); - } } diff --git a/vendor/brick/math/src/Exception/NumberFormatException.php b/vendor/brick/math/src/Exception/NumberFormatException.php index d9cf6ff5..119cadbb 100644 --- a/vendor/brick/math/src/Exception/NumberFormatException.php +++ b/vendor/brick/math/src/Exception/NumberFormatException.php @@ -9,6 +9,14 @@ */ class NumberFormatException extends MathException { + public static function invalidFormat(string $value) : self + { + return new self(\sprintf( + 'The given value "%s" does not represent a valid number.', + $value, + )); + } + /** * @param string $char The failing character. * @@ -28,6 +36,6 @@ public static function charNotInAlphabet(string $char) : self $char = '"' . $char . '"'; } - return new self(sprintf('Char %s is not a valid character in the given alphabet.', $char)); + return new self(\sprintf('Char %s is not a valid character in the given alphabet.', $char)); } } diff --git a/vendor/brick/math/src/Internal/Calculator.php b/vendor/brick/math/src/Internal/Calculator.php index b8cecda9..44dd6692 100644 --- a/vendor/brick/math/src/Internal/Calculator.php +++ b/vendor/brick/math/src/Internal/Calculator.php @@ -25,7 +25,7 @@ abstract class Calculator /** * The maximum exponent value allowed for the pow() method. */ - public const MAX_POWER = 1000000; + public const MAX_POWER = 1_000_000; /** * The alphabet for converting from and to base 2 to 36, lowercase. @@ -128,7 +128,9 @@ final public function neg(string $n) : string /** * Compares two numbers. * - * @return int [-1, 0, 1] If the first number is less than, equal to, or greater than the second number. + * @psalm-return -1|0|1 + * + * @return int -1 if the first number is less than, 0 if equal to, 1 if greater than the second number. */ final public function cmp(string $a, string $b) : int { @@ -428,16 +430,16 @@ final public function toArbitraryBase(string $number, string $alphabet, int $bas * * Rounding is performed when the remainder of the division is not zero. * - * @param string $a The dividend. - * @param string $b The divisor, must not be zero. - * @param int $roundingMode The rounding mode. + * @param string $a The dividend. + * @param string $b The divisor, must not be zero. + * @param RoundingMode $roundingMode The rounding mode. * * @throws \InvalidArgumentException If the rounding mode is invalid. * @throws RoundingNecessaryException If RoundingMode::UNNECESSARY is provided but rounding is necessary. * * @psalm-suppress ImpureFunctionCall */ - final public function divRound(string $a, string $b, int $roundingMode) : string + final public function divRound(string $a, string $b, RoundingMode $roundingMode) : string { [$quotient, $remainder] = $this->divQR($a, $b); @@ -571,27 +573,17 @@ private function bitwise(string $operator, string $a, string $b) : string $bBin = $this->twosComplement($bBin); } - switch ($operator) { - case 'and': - $value = $aBin & $bBin; - $negative = ($aNeg and $bNeg); - break; - - case 'or': - $value = $aBin | $bBin; - $negative = ($aNeg or $bNeg); - break; - - case 'xor': - $value = $aBin ^ $bBin; - $negative = ($aNeg xor $bNeg); - break; + $value = match ($operator) { + 'and' => $aBin & $bBin, + 'or' => $aBin | $bBin, + 'xor' => $aBin ^ $bBin, + }; - // @codeCoverageIgnoreStart - default: - throw new \InvalidArgumentException('Invalid bitwise operator.'); - // @codeCoverageIgnoreEnd - } + $negative = match ($operator) { + 'and' => $aNeg and $bNeg, + 'or' => $aNeg or $bNeg, + 'xor' => $aNeg xor $bNeg, + }; if ($negative) { $value = $this->twosComplement($value); diff --git a/vendor/brick/math/src/Internal/Calculator/BcMathCalculator.php b/vendor/brick/math/src/Internal/Calculator/BcMathCalculator.php index 5457a3c9..067085e2 100644 --- a/vendor/brick/math/src/Internal/Calculator/BcMathCalculator.php +++ b/vendor/brick/math/src/Internal/Calculator/BcMathCalculator.php @@ -35,10 +35,6 @@ public function divQ(string $a, string $b) : string return \bcdiv($a, $b, 0); } - /** - * @psalm-suppress InvalidNullableReturnType - * @psalm-suppress NullableReturnStatement - */ public function divR(string $a, string $b) : string { return \bcmod($a, $b, 0); @@ -49,8 +45,6 @@ public function divQR(string $a, string $b) : array $q = \bcdiv($a, $b, 0); $r = \bcmod($a, $b, 0); - assert($r !== null); - return [$q, $r]; } @@ -64,10 +58,6 @@ public function modPow(string $base, string $exp, string $mod) : string return \bcpowmod($base, $exp, $mod, 0); } - /** - * @psalm-suppress InvalidNullableReturnType - * @psalm-suppress NullableReturnStatement - */ public function sqrt(string $n) : string { return \bcsqrt($n, 0); diff --git a/vendor/brick/math/src/Internal/Calculator/NativeCalculator.php b/vendor/brick/math/src/Internal/Calculator/NativeCalculator.php index 7c679d24..6acd0638 100644 --- a/vendor/brick/math/src/Internal/Calculator/NativeCalculator.php +++ b/vendor/brick/math/src/Internal/Calculator/NativeCalculator.php @@ -23,25 +23,18 @@ class NativeCalculator extends Calculator * Example: 32-bit: max number 1,999,999,999 (9 digits + carry) * 64-bit: max number 1,999,999,999,999,999,999 (18 digits + carry) */ - private int $maxDigits; + private readonly int $maxDigits; /** * @codeCoverageIgnore */ public function __construct() { - switch (PHP_INT_SIZE) { - case 4: - $this->maxDigits = 9; - break; - - case 8: - $this->maxDigits = 18; - break; - - default: - throw new \RuntimeException('The platform is not 32-bit or 64-bit as expected.'); - } + $this->maxDigits = match (PHP_INT_SIZE) { + 4 => 9, + 8 => 18, + default => throw new \RuntimeException('The platform is not 32-bit or 64-bit as expected.') + }; } public function add(string $a, string $b) : string @@ -161,10 +154,8 @@ public function divQR(string $a, string $b) : array if (is_int($nb)) { // the only division that may overflow is PHP_INT_MIN / -1, // which cannot happen here as we've already handled a divisor of -1 above. + $q = intdiv($na, $nb); $r = $na % $nb; - $q = ($na - $r) / $nb; - - assert(is_int($q)); return [ (string) $q, @@ -536,7 +527,7 @@ private function doDiv(string $a, string $b) : array /** * Compares two non-signed large numbers. * - * @return int [-1, 0, 1] + * @psalm-return -1|0|1 */ private function doCmp(string $a, string $b) : int { @@ -549,7 +540,7 @@ private function doCmp(string $a, string $b) : int return $cmp; } - return \strcmp($a, $b) <=> 0; // enforce [-1, 0, 1] + return \strcmp($a, $b) <=> 0; // enforce -1|0|1 } /** diff --git a/vendor/brick/math/src/RoundingMode.php b/vendor/brick/math/src/RoundingMode.php index 06936d8d..e8ee6a8b 100644 --- a/vendor/brick/math/src/RoundingMode.php +++ b/vendor/brick/math/src/RoundingMode.php @@ -13,24 +13,15 @@ * regardless the digits' contribution to the value of the number. In other words, considered * as a numerical value, the discarded fraction could have an absolute value greater than one. */ -final class RoundingMode +enum RoundingMode { - /** - * Private constructor. This class is not instantiable. - * - * @codeCoverageIgnore - */ - private function __construct() - { - } - /** * Asserts that the requested operation has an exact result, hence no rounding is necessary. * * If this rounding mode is specified on an operation that yields a result that * cannot be represented at the requested scale, a RoundingNecessaryException is thrown. */ - public const UNNECESSARY = 0; + case UNNECESSARY; /** * Rounds away from zero. @@ -38,7 +29,7 @@ private function __construct() * Always increments the digit prior to a nonzero discarded fraction. * Note that this rounding mode never decreases the magnitude of the calculated value. */ - public const UP = 1; + case UP; /** * Rounds towards zero. @@ -46,7 +37,7 @@ private function __construct() * Never increments the digit prior to a discarded fraction (i.e., truncates). * Note that this rounding mode never increases the magnitude of the calculated value. */ - public const DOWN = 2; + case DOWN; /** * Rounds towards positive infinity. @@ -54,7 +45,7 @@ private function __construct() * If the result is positive, behaves as for UP; if negative, behaves as for DOWN. * Note that this rounding mode never decreases the calculated value. */ - public const CEILING = 3; + case CEILING; /** * Rounds towards negative infinity. @@ -62,7 +53,7 @@ private function __construct() * If the result is positive, behave as for DOWN; if negative, behave as for UP. * Note that this rounding mode never increases the calculated value. */ - public const FLOOR = 4; + case FLOOR; /** * Rounds towards "nearest neighbor" unless both neighbors are equidistant, in which case round up. @@ -70,28 +61,28 @@ private function __construct() * Behaves as for UP if the discarded fraction is >= 0.5; otherwise, behaves as for DOWN. * Note that this is the rounding mode commonly taught at school. */ - public const HALF_UP = 5; + case HALF_UP; /** * Rounds towards "nearest neighbor" unless both neighbors are equidistant, in which case round down. * * Behaves as for UP if the discarded fraction is > 0.5; otherwise, behaves as for DOWN. */ - public const HALF_DOWN = 6; + case HALF_DOWN; /** * Rounds towards "nearest neighbor" unless both neighbors are equidistant, in which case round towards positive infinity. * * If the result is positive, behaves as for HALF_UP; if negative, behaves as for HALF_DOWN. */ - public const HALF_CEILING = 7; + case HALF_CEILING; /** * Rounds towards "nearest neighbor" unless both neighbors are equidistant, in which case round towards negative infinity. * * If the result is positive, behaves as for HALF_DOWN; if negative, behaves as for HALF_UP. */ - public const HALF_FLOOR = 8; + case HALF_FLOOR; /** * Rounds towards the "nearest neighbor" unless both neighbors are equidistant, in which case rounds towards the even neighbor. @@ -103,5 +94,5 @@ private function __construct() * cumulative error when applied repeatedly over a sequence of calculations. * It is sometimes known as "Banker's rounding", and is chiefly used in the USA. */ - public const HALF_EVEN = 9; + case HALF_EVEN; } diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index d0567818..79584a37 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -148,6 +148,7 @@ 'DeepCopy\\Matcher\\PropertyTypeMatcher' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/Matcher/PropertyTypeMatcher.php', 'DeepCopy\\Reflection\\ReflectionHelper' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/Reflection/ReflectionHelper.php', 'DeepCopy\\TypeFilter\\Date\\DateIntervalFilter' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/Date/DateIntervalFilter.php', + 'DeepCopy\\TypeFilter\\Date\\DatePeriodFilter' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/Date/DatePeriodFilter.php', 'DeepCopy\\TypeFilter\\ReplaceFilter' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/ReplaceFilter.php', 'DeepCopy\\TypeFilter\\ShallowCopyFilter' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/ShallowCopyFilter.php', 'DeepCopy\\TypeFilter\\Spl\\ArrayObjectFilter' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/Spl/ArrayObjectFilter.php', @@ -1604,23 +1605,42 @@ 'Jean85\\PrettyVersions' => $vendorDir . '/jean85/pretty-package-versions/src/PrettyVersions.php', 'Jean85\\Version' => $vendorDir . '/jean85/pretty-package-versions/src/Version.php', 'JoliCode\\PhpOsHelper\\OsHelper' => $vendorDir . '/jolicode/php-os-helper/src/OsHelper.php', + 'Joli\\JoliNotif\\DefaultNotifier' => $vendorDir . '/jolicode/jolinotif/src/DefaultNotifier.php', + 'Joli\\JoliNotif\\Driver\\AbstractCliBasedDriver' => $vendorDir . '/jolicode/jolinotif/src/Driver/AbstractCliBasedDriver.php', + 'Joli\\JoliNotif\\Driver\\AppleScriptDriver' => $vendorDir . '/jolicode/jolinotif/src/Driver/AppleScriptDriver.php', + 'Joli\\JoliNotif\\Driver\\BinaryProviderInterface' => $vendorDir . '/jolicode/jolinotif/src/Driver/BinaryProviderInterface.php', + 'Joli\\JoliNotif\\Driver\\DriverInterface' => $vendorDir . '/jolicode/jolinotif/src/Driver/DriverInterface.php', + 'Joli\\JoliNotif\\Driver\\GrowlNotifyDriver' => $vendorDir . '/jolicode/jolinotif/src/Driver/GrowlNotifyDriver.php', + 'Joli\\JoliNotif\\Driver\\KDialogDriver' => $vendorDir . '/jolicode/jolinotif/src/Driver/KDialogDriver.php', + 'Joli\\JoliNotif\\Driver\\LibNotifyDriver' => $vendorDir . '/jolicode/jolinotif/src/Driver/LibNotifyDriver.php', + 'Joli\\JoliNotif\\Driver\\NotifuDriver' => $vendorDir . '/jolicode/jolinotif/src/Driver/NotifuDriver.php', + 'Joli\\JoliNotif\\Driver\\NotifySendDriver' => $vendorDir . '/jolicode/jolinotif/src/Driver/NotifySendDriver.php', + 'Joli\\JoliNotif\\Driver\\SnoreToastDriver' => $vendorDir . '/jolicode/jolinotif/src/Driver/SnoreToastDriver.php', + 'Joli\\JoliNotif\\Driver\\TerminalNotifierDriver' => $vendorDir . '/jolicode/jolinotif/src/Driver/TerminalNotifierDriver.php', + 'Joli\\JoliNotif\\Driver\\WslNotifySendDriver' => $vendorDir . '/jolicode/jolinotif/src/Driver/WslNotifySendDriver.php', 'Joli\\JoliNotif\\Exception\\Exception' => $vendorDir . '/jolicode/jolinotif/src/Exception/Exception.php', + 'Joli\\JoliNotif\\Exception\\ExceptionInterface' => $vendorDir . '/jolicode/jolinotif/src/Exception/ExceptionInterface.php', + 'Joli\\JoliNotif\\Exception\\FFIRuntimeException' => $vendorDir . '/jolicode/jolinotif/src/Exception/FFIRuntimeException.php', 'Joli\\JoliNotif\\Exception\\InvalidNotificationException' => $vendorDir . '/jolicode/jolinotif/src/Exception/InvalidNotificationException.php', 'Joli\\JoliNotif\\Exception\\NoSupportedNotifierException' => $vendorDir . '/jolicode/jolinotif/src/Exception/NoSupportedNotifierException.php', + 'Joli\\JoliNotif\\LegacyNotifier' => $vendorDir . '/jolicode/jolinotif/src/LegacyNotifier.php', 'Joli\\JoliNotif\\Notification' => $vendorDir . '/jolicode/jolinotif/src/Notification.php', 'Joli\\JoliNotif\\Notifier' => $vendorDir . '/jolicode/jolinotif/src/Notifier.php', 'Joli\\JoliNotif\\NotifierFactory' => $vendorDir . '/jolicode/jolinotif/src/NotifierFactory.php', + 'Joli\\JoliNotif\\NotifierInterface' => $vendorDir . '/jolicode/jolinotif/src/NotifierInterface.php', 'Joli\\JoliNotif\\Notifier\\AppleScriptNotifier' => $vendorDir . '/jolicode/jolinotif/src/Notifier/AppleScriptNotifier.php', 'Joli\\JoliNotif\\Notifier\\BinaryProvider' => $vendorDir . '/jolicode/jolinotif/src/Notifier/BinaryProvider.php', 'Joli\\JoliNotif\\Notifier\\CliBasedNotifier' => $vendorDir . '/jolicode/jolinotif/src/Notifier/CliBasedNotifier.php', 'Joli\\JoliNotif\\Notifier\\GrowlNotifyNotifier' => $vendorDir . '/jolicode/jolinotif/src/Notifier/GrowlNotifyNotifier.php', 'Joli\\JoliNotif\\Notifier\\KDialogNotifier' => $vendorDir . '/jolicode/jolinotif/src/Notifier/KDialogNotifier.php', + 'Joli\\JoliNotif\\Notifier\\LibNotifyNotifier' => $vendorDir . '/jolicode/jolinotif/src/Notifier/LibNotifyNotifier.php', 'Joli\\JoliNotif\\Notifier\\NotifuNotifier' => $vendorDir . '/jolicode/jolinotif/src/Notifier/NotifuNotifier.php', 'Joli\\JoliNotif\\Notifier\\NotifySendNotifier' => $vendorDir . '/jolicode/jolinotif/src/Notifier/NotifySendNotifier.php', 'Joli\\JoliNotif\\Notifier\\NullNotifier' => $vendorDir . '/jolicode/jolinotif/src/Notifier/NullNotifier.php', 'Joli\\JoliNotif\\Notifier\\SnoreToastNotifier' => $vendorDir . '/jolicode/jolinotif/src/Notifier/SnoreToastNotifier.php', 'Joli\\JoliNotif\\Notifier\\TerminalNotifierNotifier' => $vendorDir . '/jolicode/jolinotif/src/Notifier/TerminalNotifierNotifier.php', 'Joli\\JoliNotif\\Notifier\\ToasterNotifier' => $vendorDir . '/jolicode/jolinotif/src/Notifier/ToasterNotifier.php', + 'Joli\\JoliNotif\\Notifier\\WslNotifySendNotifier' => $vendorDir . '/jolicode/jolinotif/src/Notifier/WslNotifySendNotifier.php', 'Joli\\JoliNotif\\Util\\OsHelper' => $vendorDir . '/jolicode/jolinotif/src/Util/OsHelper.php', 'Joli\\JoliNotif\\Util\\PharExtractor' => $vendorDir . '/jolicode/jolinotif/src/Util/PharExtractor.php', 'LaravelZero\\Framework\\Application' => $vendorDir . '/laravel-zero/framework/src/Application.php', @@ -1669,7 +1689,7 @@ 'LaravelZero\\Framework\\Components\\Updater\\Updater' => $vendorDir . '/laravel-zero/framework/src/Components/Updater/Updater.php', 'LaravelZero\\Framework\\Components\\View\\Installer' => $vendorDir . '/laravel-zero/framework/src/Components/View/Installer.php', 'LaravelZero\\Framework\\Components\\View\\Provider' => $vendorDir . '/laravel-zero/framework/src/Components/View/Provider.php', - 'LaravelZero\\Framework\\Contracts\\BoostrapperContract' => $vendorDir . '/laravel-zero/framework/src/Contracts/BoostrapperContract.php', + 'LaravelZero\\Framework\\Contracts\\BootstrapperContract' => $vendorDir . '/laravel-zero/framework/src/Contracts/BootstrapperContract.php', 'LaravelZero\\Framework\\Contracts\\Commands\\Component\\InstallerContract' => $vendorDir . '/laravel-zero/framework/src/Contracts/Commands/Component/InstallerContract.php', 'LaravelZero\\Framework\\Contracts\\Exceptions\\ConsoleExceptionContract' => $vendorDir . '/laravel-zero/framework/src/Contracts/Exceptions/ConsoleExceptionContract.php', 'LaravelZero\\Framework\\Contracts\\Providers\\ComposerContract' => $vendorDir . '/laravel-zero/framework/src/Contracts/Providers/ComposerContract.php', @@ -1700,7 +1720,10 @@ 'Laravel\\Prompts\\Concerns\\Truncation' => $vendorDir . '/laravel/prompts/src/Concerns/Truncation.php', 'Laravel\\Prompts\\Concerns\\TypedValue' => $vendorDir . '/laravel/prompts/src/Concerns/TypedValue.php', 'Laravel\\Prompts\\ConfirmPrompt' => $vendorDir . '/laravel/prompts/src/ConfirmPrompt.php', + 'Laravel\\Prompts\\Exceptions\\FormRevertedException' => $vendorDir . '/laravel/prompts/src/Exceptions/FormRevertedException.php', 'Laravel\\Prompts\\Exceptions\\NonInteractiveValidationException' => $vendorDir . '/laravel/prompts/src/Exceptions/NonInteractiveValidationException.php', + 'Laravel\\Prompts\\FormBuilder' => $vendorDir . '/laravel/prompts/src/FormBuilder.php', + 'Laravel\\Prompts\\FormStep' => $vendorDir . '/laravel/prompts/src/FormStep.php', 'Laravel\\Prompts\\Key' => $vendorDir . '/laravel/prompts/src/Key.php', 'Laravel\\Prompts\\MultiSearchPrompt' => $vendorDir . '/laravel/prompts/src/MultiSearchPrompt.php', 'Laravel\\Prompts\\MultiSelectPrompt' => $vendorDir . '/laravel/prompts/src/MultiSelectPrompt.php', @@ -1718,9 +1741,11 @@ 'Laravel\\Prompts\\Table' => $vendorDir . '/laravel/prompts/src/Table.php', 'Laravel\\Prompts\\Terminal' => $vendorDir . '/laravel/prompts/src/Terminal.php', 'Laravel\\Prompts\\TextPrompt' => $vendorDir . '/laravel/prompts/src/TextPrompt.php', + 'Laravel\\Prompts\\TextareaPrompt' => $vendorDir . '/laravel/prompts/src/TextareaPrompt.php', 'Laravel\\Prompts\\Themes\\Contracts\\Scrolling' => $vendorDir . '/laravel/prompts/src/Themes/Contracts/Scrolling.php', 'Laravel\\Prompts\\Themes\\Default\\Concerns\\DrawsBoxes' => $vendorDir . '/laravel/prompts/src/Themes/Default/Concerns/DrawsBoxes.php', 'Laravel\\Prompts\\Themes\\Default\\Concerns\\DrawsScrollbars' => $vendorDir . '/laravel/prompts/src/Themes/Default/Concerns/DrawsScrollbars.php', + 'Laravel\\Prompts\\Themes\\Default\\Concerns\\InteractsWithStrings' => $vendorDir . '/laravel/prompts/src/Themes/Default/Concerns/InteractsWithStrings.php', 'Laravel\\Prompts\\Themes\\Default\\ConfirmPromptRenderer' => $vendorDir . '/laravel/prompts/src/Themes/Default/ConfirmPromptRenderer.php', 'Laravel\\Prompts\\Themes\\Default\\MultiSearchPromptRenderer' => $vendorDir . '/laravel/prompts/src/Themes/Default/MultiSearchPromptRenderer.php', 'Laravel\\Prompts\\Themes\\Default\\MultiSelectPromptRenderer' => $vendorDir . '/laravel/prompts/src/Themes/Default/MultiSelectPromptRenderer.php', @@ -1735,6 +1760,7 @@ 'Laravel\\Prompts\\Themes\\Default\\SuggestPromptRenderer' => $vendorDir . '/laravel/prompts/src/Themes/Default/SuggestPromptRenderer.php', 'Laravel\\Prompts\\Themes\\Default\\TableRenderer' => $vendorDir . '/laravel/prompts/src/Themes/Default/TableRenderer.php', 'Laravel\\Prompts\\Themes\\Default\\TextPromptRenderer' => $vendorDir . '/laravel/prompts/src/Themes/Default/TextPromptRenderer.php', + 'Laravel\\Prompts\\Themes\\Default\\TextareaPromptRenderer' => $vendorDir . '/laravel/prompts/src/Themes/Default/TextareaPromptRenderer.php', 'League\\Flysystem\\CalculateChecksumFromStream' => $vendorDir . '/league/flysystem/src/CalculateChecksumFromStream.php', 'League\\Flysystem\\ChecksumAlgoIsNotSupported' => $vendorDir . '/league/flysystem/src/ChecksumAlgoIsNotSupported.php', 'League\\Flysystem\\ChecksumProvider' => $vendorDir . '/league/flysystem/src/ChecksumProvider.php', @@ -1951,7 +1977,6 @@ 'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprTrueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprTrueNode.php', 'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstFetchNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstFetchNode.php', 'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\DoctrineConstExprStringNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/DoctrineConstExprStringNode.php', - 'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\QuoteAwareConstExprStringNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/QuoteAwareConstExprStringNode.php', 'PHPStan\\PhpDocParser\\Ast\\Node' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Node.php', 'PHPStan\\PhpDocParser\\Ast\\NodeAttributes' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/NodeAttributes.php', 'PHPStan\\PhpDocParser\\Ast\\NodeTraverser' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/NodeTraverser.php', @@ -1984,6 +2009,7 @@ 'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagValueNode.php', 'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocTextNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTextNode.php', 'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PropertyTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PropertyTagValueNode.php', + 'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PureUnlessCallableIsImpureTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PureUnlessCallableIsImpureTagValueNode.php', 'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\RequireExtendsTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireExtendsTagValueNode.php', 'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\RequireImplementsTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireImplementsTagValueNode.php', 'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ReturnTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ReturnTagValueNode.php', @@ -2016,6 +2042,7 @@ 'PHPStan\\PhpDocParser\\Ast\\Type\\TypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/TypeNode.php', 'PHPStan\\PhpDocParser\\Ast\\Type\\UnionTypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/UnionTypeNode.php', 'PHPStan\\PhpDocParser\\Lexer\\Lexer' => $vendorDir . '/phpstan/phpdoc-parser/src/Lexer/Lexer.php', + 'PHPStan\\PhpDocParser\\ParserConfig' => $vendorDir . '/phpstan/phpdoc-parser/src/ParserConfig.php', 'PHPStan\\PhpDocParser\\Parser\\ConstExprParser' => $vendorDir . '/phpstan/phpdoc-parser/src/Parser/ConstExprParser.php', 'PHPStan\\PhpDocParser\\Parser\\ParserException' => $vendorDir . '/phpstan/phpdoc-parser/src/Parser/ParserException.php', 'PHPStan\\PhpDocParser\\Parser\\PhpDocParser' => $vendorDir . '/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php', @@ -2402,12 +2429,11 @@ 'PHPUnit\\Framework\\MockObject\\Builder\\MethodNameMatch' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/MethodNameMatch.php', 'PHPUnit\\Framework\\MockObject\\Builder\\ParametersMatch' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/ParametersMatch.php', 'PHPUnit\\Framework\\MockObject\\Builder\\Stub' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/Stub.php', - 'PHPUnit\\Framework\\MockObject\\CannotUseAddMethodsException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseAddMethodsException.php', 'PHPUnit\\Framework\\MockObject\\CannotUseOnlyMethodsException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseOnlyMethodsException.php', 'PHPUnit\\Framework\\MockObject\\ConfigurableMethod' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/ConfigurableMethod.php', 'PHPUnit\\Framework\\MockObject\\DoubledCloneMethod' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/DoubledCloneMethod.php', 'PHPUnit\\Framework\\MockObject\\Exception' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/Exception.php', - 'PHPUnit\\Framework\\MockObject\\Generator\\ClassAlreadyExistsException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassAlreadyExistsException.php', + 'PHPUnit\\Framework\\MockObject\\Generator\\CannotUseAddMethodsException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/CannotUseAddMethodsException.php', 'PHPUnit\\Framework\\MockObject\\Generator\\ClassIsEnumerationException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsEnumerationException.php', 'PHPUnit\\Framework\\MockObject\\Generator\\ClassIsFinalException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsFinalException.php', 'PHPUnit\\Framework\\MockObject\\Generator\\ClassIsReadonlyException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsReadonlyException.php', @@ -2420,6 +2446,7 @@ 'PHPUnit\\Framework\\MockObject\\Generator\\MockMethodSet' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Generator/MockMethodSet.php', 'PHPUnit\\Framework\\MockObject\\Generator\\MockTrait' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Generator/MockTrait.php', 'PHPUnit\\Framework\\MockObject\\Generator\\MockType' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Generator/MockType.php', + 'PHPUnit\\Framework\\MockObject\\Generator\\NameAlreadyInUseException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/NameAlreadyInUseException.php', 'PHPUnit\\Framework\\MockObject\\Generator\\OriginalConstructorInvocationRequiredException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/OriginalConstructorInvocationRequiredException.php', 'PHPUnit\\Framework\\MockObject\\Generator\\ReflectionException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ReflectionException.php', 'PHPUnit\\Framework\\MockObject\\Generator\\RuntimeException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/RuntimeException.php', @@ -2445,6 +2472,7 @@ 'PHPUnit\\Framework\\MockObject\\MockObjectApi' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/MockObjectApi.php', 'PHPUnit\\Framework\\MockObject\\MockObjectInternal' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Interface/MockObjectInternal.php', 'PHPUnit\\Framework\\MockObject\\NeverReturningMethodException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/NeverReturningMethodException.php', + 'PHPUnit\\Framework\\MockObject\\NoMoreReturnValuesConfiguredException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/NoMoreReturnValuesConfiguredException.php', 'PHPUnit\\Framework\\MockObject\\ProxiedCloneMethod' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/ProxiedCloneMethod.php', 'PHPUnit\\Framework\\MockObject\\ReflectionException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/ReflectionException.php', 'PHPUnit\\Framework\\MockObject\\ReturnValueGenerator' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Runtime/ReturnValueGenerator.php', @@ -2646,7 +2674,7 @@ 'PHPUnit\\Runner\\ClassDoesNotExtendTestCaseException' => $vendorDir . '/phpunit/phpunit/src/Runner/Exception/ClassDoesNotExtendTestCaseException.php', 'PHPUnit\\Runner\\ClassIsAbstractException' => $vendorDir . '/phpunit/phpunit/src/Runner/Exception/ClassIsAbstractException.php', 'PHPUnit\\Runner\\CodeCoverage' => $vendorDir . '/phpunit/phpunit/src/Runner/CodeCoverage.php', - 'PHPUnit\\Runner\\DirectoryCannotBeCreatedException' => $vendorDir . '/phpunit/phpunit/src/Runner/Exception/DirectoryCannotBeCreatedException.php', + 'PHPUnit\\Runner\\DirectoryDoesNotExistException' => $vendorDir . '/phpunit/phpunit/src/Runner/Exception/DirectoryDoesNotExistException.php', 'PHPUnit\\Runner\\ErrorException' => $vendorDir . '/phpunit/phpunit/src/Runner/Exception/ErrorException.php', 'PHPUnit\\Runner\\ErrorHandler' => $vendorDir . '/phpunit/phpunit/src/Runner/ErrorHandler.php', 'PHPUnit\\Runner\\Exception' => $vendorDir . '/phpunit/phpunit/src/Runner/Exception/Exception.php', @@ -2723,6 +2751,7 @@ 'PHPUnit\\TestRunner\\TestResult\\TestTriggeredPhpunitWarningSubscriber' => $vendorDir . '/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpunitWarningSubscriber.php', 'PHPUnit\\TestRunner\\TestResult\\TestTriggeredWarningSubscriber' => $vendorDir . '/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredWarningSubscriber.php', 'PHPUnit\\TextUI\\Application' => $vendorDir . '/phpunit/phpunit/src/TextUI/Application.php', + 'PHPUnit\\TextUI\\CannotOpenSocketException' => $vendorDir . '/phpunit/phpunit/src/TextUI/Exception/CannotOpenSocketException.php', 'PHPUnit\\TextUI\\CliArguments\\Builder' => $vendorDir . '/phpunit/phpunit/src/TextUI/Configuration/Cli/Builder.php', 'PHPUnit\\TextUI\\CliArguments\\Configuration' => $vendorDir . '/phpunit/phpunit/src/TextUI/Configuration/Cli/Configuration.php', 'PHPUnit\\TextUI\\CliArguments\\Exception' => $vendorDir . '/phpunit/phpunit/src/TextUI/Configuration/Cli/Exception.php', @@ -2799,7 +2828,6 @@ 'PHPUnit\\TextUI\\Configuration\\Variable' => $vendorDir . '/phpunit/phpunit/src/TextUI/Configuration/Value/Variable.php', 'PHPUnit\\TextUI\\Configuration\\VariableCollection' => $vendorDir . '/phpunit/phpunit/src/TextUI/Configuration/Value/VariableCollection.php', 'PHPUnit\\TextUI\\Configuration\\VariableCollectionIterator' => $vendorDir . '/phpunit/phpunit/src/TextUI/Configuration/Value/VariableCollectionIterator.php', - 'PHPUnit\\TextUI\\DirectoryDoesNotExistException' => $vendorDir . '/phpunit/phpunit/src/TextUI/Exception/DirectoryDoesNotExistException.php', 'PHPUnit\\TextUI\\Exception' => $vendorDir . '/phpunit/phpunit/src/TextUI/Exception/Exception.php', 'PHPUnit\\TextUI\\ExtensionsNotConfiguredException' => $vendorDir . '/phpunit/phpunit/src/TextUI/Exception/ExtensionsNotConfiguredException.php', 'PHPUnit\\TextUI\\Help' => $vendorDir . '/phpunit/phpunit/src/TextUI/Help.php', @@ -3032,6 +3060,7 @@ 'Pest\\Exceptions\\TestAlreadyExist' => $vendorDir . '/pestphp/pest/src/Exceptions/TestAlreadyExist.php', 'Pest\\Exceptions\\TestCaseAlreadyInUse' => $vendorDir . '/pestphp/pest/src/Exceptions/TestCaseAlreadyInUse.php', 'Pest\\Exceptions\\TestCaseClassOrTraitNotFound' => $vendorDir . '/pestphp/pest/src/Exceptions/TestCaseClassOrTraitNotFound.php', + 'Pest\\Exceptions\\TestClosureMustNotBeStatic' => $vendorDir . '/pestphp/pest/src/Exceptions/TestClosureMustNotBeStatic.php', 'Pest\\Exceptions\\TestDescriptionMissing' => $vendorDir . '/pestphp/pest/src/Exceptions/TestDescriptionMissing.php', 'Pest\\Expectation' => $vendorDir . '/pestphp/pest/src/Expectation.php', 'Pest\\Expectations\\EachExpectation' => $vendorDir . '/pestphp/pest/src/Expectations/EachExpectation.php', @@ -3255,12 +3284,14 @@ 'PhpParser\\JsonDecoder' => $vendorDir . '/nikic/php-parser/lib/PhpParser/JsonDecoder.php', 'PhpParser\\Lexer' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer.php', 'PhpParser\\Lexer\\Emulative' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php', + 'PhpParser\\Lexer\\TokenEmulator\\AsymmetricVisibilityTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/AsymmetricVisibilityTokenEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\AttributeEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/AttributeEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\EnumTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/EnumTokenEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\ExplicitOctalEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ExplicitOctalEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\KeywordEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\MatchTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/MatchTokenEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\NullsafeTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NullsafeTokenEmulator.php', + 'PhpParser\\Lexer\\TokenEmulator\\PropertyTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/PropertyTokenEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\ReadonlyFunctionTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyFunctionTokenEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\ReadonlyTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyTokenEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\ReverseEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReverseEmulator.php', @@ -3394,6 +3425,7 @@ 'PhpParser\\Node\\Name\\Relative' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php', 'PhpParser\\Node\\NullableType' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/NullableType.php', 'PhpParser\\Node\\Param' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Param.php', + 'PhpParser\\Node\\PropertyHook' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/PropertyHook.php', 'PhpParser\\Node\\PropertyItem' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/PropertyItem.php', 'PhpParser\\Node\\Scalar' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar.php', 'PhpParser\\Node\\Scalar\\Float_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/Float_.php', @@ -3407,6 +3439,7 @@ 'PhpParser\\Node\\Scalar\\MagicConst\\Line' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Line.php', 'PhpParser\\Node\\Scalar\\MagicConst\\Method' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Method.php', 'PhpParser\\Node\\Scalar\\MagicConst\\Namespace_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Namespace_.php', + 'PhpParser\\Node\\Scalar\\MagicConst\\Property' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Property.php', 'PhpParser\\Node\\Scalar\\MagicConst\\Trait_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Trait_.php', 'PhpParser\\Node\\Scalar\\String_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php', 'PhpParser\\Node\\StaticVar' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/StaticVar.php', @@ -4408,7 +4441,6 @@ 'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\Regex' => $vendorDir . '/symfony/polyfill-intl-idn/Resources/unidata/Regex.php', 'Symfony\\Polyfill\\Intl\\Normalizer\\Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Normalizer.php', 'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php', - 'Symfony\\Polyfill\\Php72\\Php72' => $vendorDir . '/symfony/polyfill-php72/Php72.php', 'Symfony\\Polyfill\\Php80\\Php80' => $vendorDir . '/symfony/polyfill-php80/Php80.php', 'Symfony\\Polyfill\\Php80\\PhpToken' => $vendorDir . '/symfony/polyfill-php80/PhpToken.php', 'Symfony\\Polyfill\\Php83\\Php83' => $vendorDir . '/symfony/polyfill-php83/Php83.php', @@ -4502,9 +4534,13 @@ 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Covers' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Covers.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Deprecated' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Deprecated.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Example' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Example.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Extends_' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Extends_.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\AbstractPHPStanFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ExtendsFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ExtendsFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\Factory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/Factory.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ImplementsFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ImplementsFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\MethodFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodFactory.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\MethodParameterFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodParameterFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\PHPStanFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PHPStanFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ParamFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ParamFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\PropertyFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyFactory.php', @@ -4512,15 +4548,20 @@ 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\PropertyWriteFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyWriteFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ReturnFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ReturnFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\StaticMethod' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/StaticMethod.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\TemplateExtendsFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateExtendsFactory.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\TemplateFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateFactory.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\TemplateImplementsFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateImplementsFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\VarFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/VarFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Formatter' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Formatter\\AlignFormatter' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter/AlignFormatter.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Formatter\\PassthroughFormatter' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter/PassthroughFormatter.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Generic' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Generic.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Implements_' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Implements_.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\InvalidTag' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/InvalidTag.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Link' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Link.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Method' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Method.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\MethodParameter' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/MethodParameter.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Mixin' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Mixin.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Param' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Param.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Property' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Property.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\PropertyRead' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyRead.php', @@ -4533,6 +4574,10 @@ 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Since' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Since.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Source' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Source.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\TagWithType' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TagWithType.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Template' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Template.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\TemplateCovariant' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateCovariant.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\TemplateExtends' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateExtends.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\TemplateImplements' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateImplements.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Throws' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Throws.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Uses' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Uses.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Var_' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Var_.php', @@ -4555,16 +4600,22 @@ 'phpDocumentor\\Reflection\\PseudoTypes\\HtmlEscapedString' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/HtmlEscapedString.php', 'phpDocumentor\\Reflection\\PseudoTypes\\IntegerRange' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/IntegerRange.php', 'phpDocumentor\\Reflection\\PseudoTypes\\IntegerValue' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/IntegerValue.php', + 'phpDocumentor\\Reflection\\PseudoTypes\\ListShape' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/ListShape.php', + 'phpDocumentor\\Reflection\\PseudoTypes\\ListShapeItem' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/ListShapeItem.php', 'phpDocumentor\\Reflection\\PseudoTypes\\List_' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/List_.php', 'phpDocumentor\\Reflection\\PseudoTypes\\LiteralString' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/LiteralString.php', 'phpDocumentor\\Reflection\\PseudoTypes\\LowercaseString' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/LowercaseString.php', 'phpDocumentor\\Reflection\\PseudoTypes\\NegativeInteger' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/NegativeInteger.php', + 'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyArray' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyArray.php', 'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyList' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyList.php', 'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyLowercaseString' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyLowercaseString.php', 'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyString' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyString.php', 'phpDocumentor\\Reflection\\PseudoTypes\\NumericString' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/NumericString.php', 'phpDocumentor\\Reflection\\PseudoTypes\\Numeric_' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/Numeric_.php', + 'phpDocumentor\\Reflection\\PseudoTypes\\ObjectShape' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/ObjectShape.php', + 'phpDocumentor\\Reflection\\PseudoTypes\\ObjectShapeItem' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/ObjectShapeItem.php', 'phpDocumentor\\Reflection\\PseudoTypes\\PositiveInteger' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/PositiveInteger.php', + 'phpDocumentor\\Reflection\\PseudoTypes\\ShapeItem' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/ShapeItem.php', 'phpDocumentor\\Reflection\\PseudoTypes\\StringValue' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/StringValue.php', 'phpDocumentor\\Reflection\\PseudoTypes\\TraitString' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/TraitString.php', 'phpDocumentor\\Reflection\\PseudoTypes\\True_' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/True_.php', diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index bc79e5ab..805e3edb 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -23,7 +23,6 @@ 'ec07570ca5a812141189b1fa81503674' => $vendorDir . '/phpunit/phpunit/src/Framework/Assert/Functions.php', '47e1160838b5e5a10346ac4084b58c23' => $vendorDir . '/laravel/prompts/src/helpers.php', 'a1cfe24d14977df6878b9bf804af2d1c' => $vendorDir . '/nunomaduro/collision/src/Adapters/Phpunit/Autoload.php', - '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php', 'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php', '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php', 'aadac1114cab8dc19489a7f6dc24c003' => $vendorDir . '/pestphp/pest-plugin-arch/src/Autoload.php', diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index f98c2165..ad115c1a 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -15,7 +15,6 @@ 'Termwind\\' => array($vendorDir . '/nunomaduro/termwind/src'), 'Symfony\\Polyfill\\Php83\\' => array($vendorDir . '/symfony/polyfill-php83'), 'Symfony\\Polyfill\\Php80\\' => array($vendorDir . '/symfony/polyfill-php80'), - 'Symfony\\Polyfill\\Php72\\' => array($vendorDir . '/symfony/polyfill-php72'), 'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'), 'Symfony\\Polyfill\\Intl\\Normalizer\\' => array($vendorDir . '/symfony/polyfill-intl-normalizer'), 'Symfony\\Polyfill\\Intl\\Idn\\' => array($vendorDir . '/symfony/polyfill-intl-idn'), diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 32c55198..c1636e76 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -24,7 +24,6 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'ec07570ca5a812141189b1fa81503674' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Assert/Functions.php', '47e1160838b5e5a10346ac4084b58c23' => __DIR__ . '/..' . '/laravel/prompts/src/helpers.php', 'a1cfe24d14977df6878b9bf804af2d1c' => __DIR__ . '/..' . '/nunomaduro/collision/src/Adapters/Phpunit/Autoload.php', - '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php', 'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php', '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php', 'aadac1114cab8dc19489a7f6dc24c003' => __DIR__ . '/..' . '/pestphp/pest-plugin-arch/src/Autoload.php', @@ -65,7 +64,6 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 array ( 'Symfony\\Polyfill\\Php83\\' => 23, 'Symfony\\Polyfill\\Php80\\' => 23, - 'Symfony\\Polyfill\\Php72\\' => 23, 'Symfony\\Polyfill\\Mbstring\\' => 26, 'Symfony\\Polyfill\\Intl\\Normalizer\\' => 33, 'Symfony\\Polyfill\\Intl\\Idn\\' => 26, @@ -227,10 +225,6 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 array ( 0 => __DIR__ . '/..' . '/symfony/polyfill-php80', ), - 'Symfony\\Polyfill\\Php72\\' => - array ( - 0 => __DIR__ . '/..' . '/symfony/polyfill-php72', - ), 'Symfony\\Polyfill\\Mbstring\\' => array ( 0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring', @@ -687,6 +681,7 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'DeepCopy\\Matcher\\PropertyTypeMatcher' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/Matcher/PropertyTypeMatcher.php', 'DeepCopy\\Reflection\\ReflectionHelper' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/Reflection/ReflectionHelper.php', 'DeepCopy\\TypeFilter\\Date\\DateIntervalFilter' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/Date/DateIntervalFilter.php', + 'DeepCopy\\TypeFilter\\Date\\DatePeriodFilter' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/Date/DatePeriodFilter.php', 'DeepCopy\\TypeFilter\\ReplaceFilter' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/ReplaceFilter.php', 'DeepCopy\\TypeFilter\\ShallowCopyFilter' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/ShallowCopyFilter.php', 'DeepCopy\\TypeFilter\\Spl\\ArrayObjectFilter' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/Spl/ArrayObjectFilter.php', @@ -2143,23 +2138,42 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'Jean85\\PrettyVersions' => __DIR__ . '/..' . '/jean85/pretty-package-versions/src/PrettyVersions.php', 'Jean85\\Version' => __DIR__ . '/..' . '/jean85/pretty-package-versions/src/Version.php', 'JoliCode\\PhpOsHelper\\OsHelper' => __DIR__ . '/..' . '/jolicode/php-os-helper/src/OsHelper.php', + 'Joli\\JoliNotif\\DefaultNotifier' => __DIR__ . '/..' . '/jolicode/jolinotif/src/DefaultNotifier.php', + 'Joli\\JoliNotif\\Driver\\AbstractCliBasedDriver' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Driver/AbstractCliBasedDriver.php', + 'Joli\\JoliNotif\\Driver\\AppleScriptDriver' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Driver/AppleScriptDriver.php', + 'Joli\\JoliNotif\\Driver\\BinaryProviderInterface' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Driver/BinaryProviderInterface.php', + 'Joli\\JoliNotif\\Driver\\DriverInterface' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Driver/DriverInterface.php', + 'Joli\\JoliNotif\\Driver\\GrowlNotifyDriver' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Driver/GrowlNotifyDriver.php', + 'Joli\\JoliNotif\\Driver\\KDialogDriver' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Driver/KDialogDriver.php', + 'Joli\\JoliNotif\\Driver\\LibNotifyDriver' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Driver/LibNotifyDriver.php', + 'Joli\\JoliNotif\\Driver\\NotifuDriver' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Driver/NotifuDriver.php', + 'Joli\\JoliNotif\\Driver\\NotifySendDriver' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Driver/NotifySendDriver.php', + 'Joli\\JoliNotif\\Driver\\SnoreToastDriver' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Driver/SnoreToastDriver.php', + 'Joli\\JoliNotif\\Driver\\TerminalNotifierDriver' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Driver/TerminalNotifierDriver.php', + 'Joli\\JoliNotif\\Driver\\WslNotifySendDriver' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Driver/WslNotifySendDriver.php', 'Joli\\JoliNotif\\Exception\\Exception' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Exception/Exception.php', + 'Joli\\JoliNotif\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Exception/ExceptionInterface.php', + 'Joli\\JoliNotif\\Exception\\FFIRuntimeException' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Exception/FFIRuntimeException.php', 'Joli\\JoliNotif\\Exception\\InvalidNotificationException' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Exception/InvalidNotificationException.php', 'Joli\\JoliNotif\\Exception\\NoSupportedNotifierException' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Exception/NoSupportedNotifierException.php', + 'Joli\\JoliNotif\\LegacyNotifier' => __DIR__ . '/..' . '/jolicode/jolinotif/src/LegacyNotifier.php', 'Joli\\JoliNotif\\Notification' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Notification.php', 'Joli\\JoliNotif\\Notifier' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Notifier.php', 'Joli\\JoliNotif\\NotifierFactory' => __DIR__ . '/..' . '/jolicode/jolinotif/src/NotifierFactory.php', + 'Joli\\JoliNotif\\NotifierInterface' => __DIR__ . '/..' . '/jolicode/jolinotif/src/NotifierInterface.php', 'Joli\\JoliNotif\\Notifier\\AppleScriptNotifier' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Notifier/AppleScriptNotifier.php', 'Joli\\JoliNotif\\Notifier\\BinaryProvider' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Notifier/BinaryProvider.php', 'Joli\\JoliNotif\\Notifier\\CliBasedNotifier' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Notifier/CliBasedNotifier.php', 'Joli\\JoliNotif\\Notifier\\GrowlNotifyNotifier' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Notifier/GrowlNotifyNotifier.php', 'Joli\\JoliNotif\\Notifier\\KDialogNotifier' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Notifier/KDialogNotifier.php', + 'Joli\\JoliNotif\\Notifier\\LibNotifyNotifier' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Notifier/LibNotifyNotifier.php', 'Joli\\JoliNotif\\Notifier\\NotifuNotifier' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Notifier/NotifuNotifier.php', 'Joli\\JoliNotif\\Notifier\\NotifySendNotifier' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Notifier/NotifySendNotifier.php', 'Joli\\JoliNotif\\Notifier\\NullNotifier' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Notifier/NullNotifier.php', 'Joli\\JoliNotif\\Notifier\\SnoreToastNotifier' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Notifier/SnoreToastNotifier.php', 'Joli\\JoliNotif\\Notifier\\TerminalNotifierNotifier' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Notifier/TerminalNotifierNotifier.php', 'Joli\\JoliNotif\\Notifier\\ToasterNotifier' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Notifier/ToasterNotifier.php', + 'Joli\\JoliNotif\\Notifier\\WslNotifySendNotifier' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Notifier/WslNotifySendNotifier.php', 'Joli\\JoliNotif\\Util\\OsHelper' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Util/OsHelper.php', 'Joli\\JoliNotif\\Util\\PharExtractor' => __DIR__ . '/..' . '/jolicode/jolinotif/src/Util/PharExtractor.php', 'LaravelZero\\Framework\\Application' => __DIR__ . '/..' . '/laravel-zero/framework/src/Application.php', @@ -2208,7 +2222,7 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'LaravelZero\\Framework\\Components\\Updater\\Updater' => __DIR__ . '/..' . '/laravel-zero/framework/src/Components/Updater/Updater.php', 'LaravelZero\\Framework\\Components\\View\\Installer' => __DIR__ . '/..' . '/laravel-zero/framework/src/Components/View/Installer.php', 'LaravelZero\\Framework\\Components\\View\\Provider' => __DIR__ . '/..' . '/laravel-zero/framework/src/Components/View/Provider.php', - 'LaravelZero\\Framework\\Contracts\\BoostrapperContract' => __DIR__ . '/..' . '/laravel-zero/framework/src/Contracts/BoostrapperContract.php', + 'LaravelZero\\Framework\\Contracts\\BootstrapperContract' => __DIR__ . '/..' . '/laravel-zero/framework/src/Contracts/BootstrapperContract.php', 'LaravelZero\\Framework\\Contracts\\Commands\\Component\\InstallerContract' => __DIR__ . '/..' . '/laravel-zero/framework/src/Contracts/Commands/Component/InstallerContract.php', 'LaravelZero\\Framework\\Contracts\\Exceptions\\ConsoleExceptionContract' => __DIR__ . '/..' . '/laravel-zero/framework/src/Contracts/Exceptions/ConsoleExceptionContract.php', 'LaravelZero\\Framework\\Contracts\\Providers\\ComposerContract' => __DIR__ . '/..' . '/laravel-zero/framework/src/Contracts/Providers/ComposerContract.php', @@ -2239,7 +2253,10 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'Laravel\\Prompts\\Concerns\\Truncation' => __DIR__ . '/..' . '/laravel/prompts/src/Concerns/Truncation.php', 'Laravel\\Prompts\\Concerns\\TypedValue' => __DIR__ . '/..' . '/laravel/prompts/src/Concerns/TypedValue.php', 'Laravel\\Prompts\\ConfirmPrompt' => __DIR__ . '/..' . '/laravel/prompts/src/ConfirmPrompt.php', + 'Laravel\\Prompts\\Exceptions\\FormRevertedException' => __DIR__ . '/..' . '/laravel/prompts/src/Exceptions/FormRevertedException.php', 'Laravel\\Prompts\\Exceptions\\NonInteractiveValidationException' => __DIR__ . '/..' . '/laravel/prompts/src/Exceptions/NonInteractiveValidationException.php', + 'Laravel\\Prompts\\FormBuilder' => __DIR__ . '/..' . '/laravel/prompts/src/FormBuilder.php', + 'Laravel\\Prompts\\FormStep' => __DIR__ . '/..' . '/laravel/prompts/src/FormStep.php', 'Laravel\\Prompts\\Key' => __DIR__ . '/..' . '/laravel/prompts/src/Key.php', 'Laravel\\Prompts\\MultiSearchPrompt' => __DIR__ . '/..' . '/laravel/prompts/src/MultiSearchPrompt.php', 'Laravel\\Prompts\\MultiSelectPrompt' => __DIR__ . '/..' . '/laravel/prompts/src/MultiSelectPrompt.php', @@ -2257,9 +2274,11 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'Laravel\\Prompts\\Table' => __DIR__ . '/..' . '/laravel/prompts/src/Table.php', 'Laravel\\Prompts\\Terminal' => __DIR__ . '/..' . '/laravel/prompts/src/Terminal.php', 'Laravel\\Prompts\\TextPrompt' => __DIR__ . '/..' . '/laravel/prompts/src/TextPrompt.php', + 'Laravel\\Prompts\\TextareaPrompt' => __DIR__ . '/..' . '/laravel/prompts/src/TextareaPrompt.php', 'Laravel\\Prompts\\Themes\\Contracts\\Scrolling' => __DIR__ . '/..' . '/laravel/prompts/src/Themes/Contracts/Scrolling.php', 'Laravel\\Prompts\\Themes\\Default\\Concerns\\DrawsBoxes' => __DIR__ . '/..' . '/laravel/prompts/src/Themes/Default/Concerns/DrawsBoxes.php', 'Laravel\\Prompts\\Themes\\Default\\Concerns\\DrawsScrollbars' => __DIR__ . '/..' . '/laravel/prompts/src/Themes/Default/Concerns/DrawsScrollbars.php', + 'Laravel\\Prompts\\Themes\\Default\\Concerns\\InteractsWithStrings' => __DIR__ . '/..' . '/laravel/prompts/src/Themes/Default/Concerns/InteractsWithStrings.php', 'Laravel\\Prompts\\Themes\\Default\\ConfirmPromptRenderer' => __DIR__ . '/..' . '/laravel/prompts/src/Themes/Default/ConfirmPromptRenderer.php', 'Laravel\\Prompts\\Themes\\Default\\MultiSearchPromptRenderer' => __DIR__ . '/..' . '/laravel/prompts/src/Themes/Default/MultiSearchPromptRenderer.php', 'Laravel\\Prompts\\Themes\\Default\\MultiSelectPromptRenderer' => __DIR__ . '/..' . '/laravel/prompts/src/Themes/Default/MultiSelectPromptRenderer.php', @@ -2274,6 +2293,7 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'Laravel\\Prompts\\Themes\\Default\\SuggestPromptRenderer' => __DIR__ . '/..' . '/laravel/prompts/src/Themes/Default/SuggestPromptRenderer.php', 'Laravel\\Prompts\\Themes\\Default\\TableRenderer' => __DIR__ . '/..' . '/laravel/prompts/src/Themes/Default/TableRenderer.php', 'Laravel\\Prompts\\Themes\\Default\\TextPromptRenderer' => __DIR__ . '/..' . '/laravel/prompts/src/Themes/Default/TextPromptRenderer.php', + 'Laravel\\Prompts\\Themes\\Default\\TextareaPromptRenderer' => __DIR__ . '/..' . '/laravel/prompts/src/Themes/Default/TextareaPromptRenderer.php', 'League\\Flysystem\\CalculateChecksumFromStream' => __DIR__ . '/..' . '/league/flysystem/src/CalculateChecksumFromStream.php', 'League\\Flysystem\\ChecksumAlgoIsNotSupported' => __DIR__ . '/..' . '/league/flysystem/src/ChecksumAlgoIsNotSupported.php', 'League\\Flysystem\\ChecksumProvider' => __DIR__ . '/..' . '/league/flysystem/src/ChecksumProvider.php', @@ -2490,7 +2510,6 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprTrueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprTrueNode.php', 'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstFetchNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstFetchNode.php', 'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\DoctrineConstExprStringNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/DoctrineConstExprStringNode.php', - 'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\QuoteAwareConstExprStringNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/QuoteAwareConstExprStringNode.php', 'PHPStan\\PhpDocParser\\Ast\\Node' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Node.php', 'PHPStan\\PhpDocParser\\Ast\\NodeAttributes' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/NodeAttributes.php', 'PHPStan\\PhpDocParser\\Ast\\NodeTraverser' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/NodeTraverser.php', @@ -2523,6 +2542,7 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagValueNode.php', 'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocTextNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTextNode.php', 'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PropertyTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PropertyTagValueNode.php', + 'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PureUnlessCallableIsImpureTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PureUnlessCallableIsImpureTagValueNode.php', 'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\RequireExtendsTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireExtendsTagValueNode.php', 'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\RequireImplementsTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireImplementsTagValueNode.php', 'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ReturnTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ReturnTagValueNode.php', @@ -2555,6 +2575,7 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'PHPStan\\PhpDocParser\\Ast\\Type\\TypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/TypeNode.php', 'PHPStan\\PhpDocParser\\Ast\\Type\\UnionTypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/UnionTypeNode.php', 'PHPStan\\PhpDocParser\\Lexer\\Lexer' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Lexer/Lexer.php', + 'PHPStan\\PhpDocParser\\ParserConfig' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/ParserConfig.php', 'PHPStan\\PhpDocParser\\Parser\\ConstExprParser' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Parser/ConstExprParser.php', 'PHPStan\\PhpDocParser\\Parser\\ParserException' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Parser/ParserException.php', 'PHPStan\\PhpDocParser\\Parser\\PhpDocParser' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php', @@ -2941,12 +2962,11 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'PHPUnit\\Framework\\MockObject\\Builder\\MethodNameMatch' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/MethodNameMatch.php', 'PHPUnit\\Framework\\MockObject\\Builder\\ParametersMatch' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/ParametersMatch.php', 'PHPUnit\\Framework\\MockObject\\Builder\\Stub' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/Stub.php', - 'PHPUnit\\Framework\\MockObject\\CannotUseAddMethodsException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseAddMethodsException.php', 'PHPUnit\\Framework\\MockObject\\CannotUseOnlyMethodsException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseOnlyMethodsException.php', 'PHPUnit\\Framework\\MockObject\\ConfigurableMethod' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/ConfigurableMethod.php', 'PHPUnit\\Framework\\MockObject\\DoubledCloneMethod' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/DoubledCloneMethod.php', 'PHPUnit\\Framework\\MockObject\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/Exception.php', - 'PHPUnit\\Framework\\MockObject\\Generator\\ClassAlreadyExistsException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassAlreadyExistsException.php', + 'PHPUnit\\Framework\\MockObject\\Generator\\CannotUseAddMethodsException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/CannotUseAddMethodsException.php', 'PHPUnit\\Framework\\MockObject\\Generator\\ClassIsEnumerationException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsEnumerationException.php', 'PHPUnit\\Framework\\MockObject\\Generator\\ClassIsFinalException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsFinalException.php', 'PHPUnit\\Framework\\MockObject\\Generator\\ClassIsReadonlyException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsReadonlyException.php', @@ -2959,6 +2979,7 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'PHPUnit\\Framework\\MockObject\\Generator\\MockMethodSet' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Generator/MockMethodSet.php', 'PHPUnit\\Framework\\MockObject\\Generator\\MockTrait' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Generator/MockTrait.php', 'PHPUnit\\Framework\\MockObject\\Generator\\MockType' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Generator/MockType.php', + 'PHPUnit\\Framework\\MockObject\\Generator\\NameAlreadyInUseException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/NameAlreadyInUseException.php', 'PHPUnit\\Framework\\MockObject\\Generator\\OriginalConstructorInvocationRequiredException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/OriginalConstructorInvocationRequiredException.php', 'PHPUnit\\Framework\\MockObject\\Generator\\ReflectionException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ReflectionException.php', 'PHPUnit\\Framework\\MockObject\\Generator\\RuntimeException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/RuntimeException.php', @@ -2984,6 +3005,7 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'PHPUnit\\Framework\\MockObject\\MockObjectApi' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/MockObjectApi.php', 'PHPUnit\\Framework\\MockObject\\MockObjectInternal' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Interface/MockObjectInternal.php', 'PHPUnit\\Framework\\MockObject\\NeverReturningMethodException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/NeverReturningMethodException.php', + 'PHPUnit\\Framework\\MockObject\\NoMoreReturnValuesConfiguredException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/NoMoreReturnValuesConfiguredException.php', 'PHPUnit\\Framework\\MockObject\\ProxiedCloneMethod' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/ProxiedCloneMethod.php', 'PHPUnit\\Framework\\MockObject\\ReflectionException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/ReflectionException.php', 'PHPUnit\\Framework\\MockObject\\ReturnValueGenerator' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Runtime/ReturnValueGenerator.php', @@ -3185,7 +3207,7 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'PHPUnit\\Runner\\ClassDoesNotExtendTestCaseException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/Exception/ClassDoesNotExtendTestCaseException.php', 'PHPUnit\\Runner\\ClassIsAbstractException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/Exception/ClassIsAbstractException.php', 'PHPUnit\\Runner\\CodeCoverage' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/CodeCoverage.php', - 'PHPUnit\\Runner\\DirectoryCannotBeCreatedException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/Exception/DirectoryCannotBeCreatedException.php', + 'PHPUnit\\Runner\\DirectoryDoesNotExistException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/Exception/DirectoryDoesNotExistException.php', 'PHPUnit\\Runner\\ErrorException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/Exception/ErrorException.php', 'PHPUnit\\Runner\\ErrorHandler' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/ErrorHandler.php', 'PHPUnit\\Runner\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/Exception/Exception.php', @@ -3262,6 +3284,7 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'PHPUnit\\TestRunner\\TestResult\\TestTriggeredPhpunitWarningSubscriber' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpunitWarningSubscriber.php', 'PHPUnit\\TestRunner\\TestResult\\TestTriggeredWarningSubscriber' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredWarningSubscriber.php', 'PHPUnit\\TextUI\\Application' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/Application.php', + 'PHPUnit\\TextUI\\CannotOpenSocketException' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/Exception/CannotOpenSocketException.php', 'PHPUnit\\TextUI\\CliArguments\\Builder' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/Configuration/Cli/Builder.php', 'PHPUnit\\TextUI\\CliArguments\\Configuration' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/Configuration/Cli/Configuration.php', 'PHPUnit\\TextUI\\CliArguments\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/Configuration/Cli/Exception.php', @@ -3338,7 +3361,6 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'PHPUnit\\TextUI\\Configuration\\Variable' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/Configuration/Value/Variable.php', 'PHPUnit\\TextUI\\Configuration\\VariableCollection' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/Configuration/Value/VariableCollection.php', 'PHPUnit\\TextUI\\Configuration\\VariableCollectionIterator' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/Configuration/Value/VariableCollectionIterator.php', - 'PHPUnit\\TextUI\\DirectoryDoesNotExistException' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/Exception/DirectoryDoesNotExistException.php', 'PHPUnit\\TextUI\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/Exception/Exception.php', 'PHPUnit\\TextUI\\ExtensionsNotConfiguredException' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/Exception/ExtensionsNotConfiguredException.php', 'PHPUnit\\TextUI\\Help' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/Help.php', @@ -3571,6 +3593,7 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'Pest\\Exceptions\\TestAlreadyExist' => __DIR__ . '/..' . '/pestphp/pest/src/Exceptions/TestAlreadyExist.php', 'Pest\\Exceptions\\TestCaseAlreadyInUse' => __DIR__ . '/..' . '/pestphp/pest/src/Exceptions/TestCaseAlreadyInUse.php', 'Pest\\Exceptions\\TestCaseClassOrTraitNotFound' => __DIR__ . '/..' . '/pestphp/pest/src/Exceptions/TestCaseClassOrTraitNotFound.php', + 'Pest\\Exceptions\\TestClosureMustNotBeStatic' => __DIR__ . '/..' . '/pestphp/pest/src/Exceptions/TestClosureMustNotBeStatic.php', 'Pest\\Exceptions\\TestDescriptionMissing' => __DIR__ . '/..' . '/pestphp/pest/src/Exceptions/TestDescriptionMissing.php', 'Pest\\Expectation' => __DIR__ . '/..' . '/pestphp/pest/src/Expectation.php', 'Pest\\Expectations\\EachExpectation' => __DIR__ . '/..' . '/pestphp/pest/src/Expectations/EachExpectation.php', @@ -3794,12 +3817,14 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'PhpParser\\JsonDecoder' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/JsonDecoder.php', 'PhpParser\\Lexer' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer.php', 'PhpParser\\Lexer\\Emulative' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php', + 'PhpParser\\Lexer\\TokenEmulator\\AsymmetricVisibilityTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/AsymmetricVisibilityTokenEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\AttributeEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/AttributeEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\EnumTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/EnumTokenEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\ExplicitOctalEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ExplicitOctalEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\KeywordEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\MatchTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/MatchTokenEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\NullsafeTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NullsafeTokenEmulator.php', + 'PhpParser\\Lexer\\TokenEmulator\\PropertyTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/PropertyTokenEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\ReadonlyFunctionTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyFunctionTokenEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\ReadonlyTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyTokenEmulator.php', 'PhpParser\\Lexer\\TokenEmulator\\ReverseEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReverseEmulator.php', @@ -3933,6 +3958,7 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'PhpParser\\Node\\Name\\Relative' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php', 'PhpParser\\Node\\NullableType' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/NullableType.php', 'PhpParser\\Node\\Param' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Param.php', + 'PhpParser\\Node\\PropertyHook' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/PropertyHook.php', 'PhpParser\\Node\\PropertyItem' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/PropertyItem.php', 'PhpParser\\Node\\Scalar' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar.php', 'PhpParser\\Node\\Scalar\\Float_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/Float_.php', @@ -3946,6 +3972,7 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'PhpParser\\Node\\Scalar\\MagicConst\\Line' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Line.php', 'PhpParser\\Node\\Scalar\\MagicConst\\Method' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Method.php', 'PhpParser\\Node\\Scalar\\MagicConst\\Namespace_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Namespace_.php', + 'PhpParser\\Node\\Scalar\\MagicConst\\Property' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Property.php', 'PhpParser\\Node\\Scalar\\MagicConst\\Trait_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Trait_.php', 'PhpParser\\Node\\Scalar\\String_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php', 'PhpParser\\Node\\StaticVar' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/StaticVar.php', @@ -4947,7 +4974,6 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\Regex' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/Resources/unidata/Regex.php', 'Symfony\\Polyfill\\Intl\\Normalizer\\Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Normalizer.php', 'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php', - 'Symfony\\Polyfill\\Php72\\Php72' => __DIR__ . '/..' . '/symfony/polyfill-php72/Php72.php', 'Symfony\\Polyfill\\Php80\\Php80' => __DIR__ . '/..' . '/symfony/polyfill-php80/Php80.php', 'Symfony\\Polyfill\\Php80\\PhpToken' => __DIR__ . '/..' . '/symfony/polyfill-php80/PhpToken.php', 'Symfony\\Polyfill\\Php83\\Php83' => __DIR__ . '/..' . '/symfony/polyfill-php83/Php83.php', @@ -5041,9 +5067,13 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Covers' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Covers.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Deprecated' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Deprecated.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Example' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Example.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Extends_' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Extends_.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\AbstractPHPStanFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ExtendsFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ExtendsFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\Factory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/Factory.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ImplementsFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ImplementsFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\MethodFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodFactory.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\MethodParameterFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodParameterFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\PHPStanFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PHPStanFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ParamFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ParamFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\PropertyFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyFactory.php', @@ -5051,15 +5081,20 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\PropertyWriteFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyWriteFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ReturnFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ReturnFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\StaticMethod' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/StaticMethod.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\TemplateExtendsFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateExtendsFactory.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\TemplateFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateFactory.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\TemplateImplementsFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateImplementsFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\VarFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/VarFactory.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Formatter' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Formatter\\AlignFormatter' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter/AlignFormatter.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Formatter\\PassthroughFormatter' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter/PassthroughFormatter.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Generic' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Generic.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Implements_' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Implements_.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\InvalidTag' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/InvalidTag.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Link' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Link.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Method' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Method.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\MethodParameter' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/MethodParameter.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Mixin' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Mixin.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Param' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Param.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Property' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Property.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\PropertyRead' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyRead.php', @@ -5072,6 +5107,10 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Since' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Since.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Source' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Source.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\TagWithType' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TagWithType.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Template' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Template.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\TemplateCovariant' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateCovariant.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\TemplateExtends' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateExtends.php', + 'phpDocumentor\\Reflection\\DocBlock\\Tags\\TemplateImplements' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateImplements.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Throws' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Throws.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Uses' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Uses.php', 'phpDocumentor\\Reflection\\DocBlock\\Tags\\Var_' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Var_.php', @@ -5094,16 +5133,22 @@ class ComposerStaticInit2c03775041dea17ffd0165399e042f36 'phpDocumentor\\Reflection\\PseudoTypes\\HtmlEscapedString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/HtmlEscapedString.php', 'phpDocumentor\\Reflection\\PseudoTypes\\IntegerRange' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/IntegerRange.php', 'phpDocumentor\\Reflection\\PseudoTypes\\IntegerValue' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/IntegerValue.php', + 'phpDocumentor\\Reflection\\PseudoTypes\\ListShape' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/ListShape.php', + 'phpDocumentor\\Reflection\\PseudoTypes\\ListShapeItem' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/ListShapeItem.php', 'phpDocumentor\\Reflection\\PseudoTypes\\List_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/List_.php', 'phpDocumentor\\Reflection\\PseudoTypes\\LiteralString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/LiteralString.php', 'phpDocumentor\\Reflection\\PseudoTypes\\LowercaseString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/LowercaseString.php', 'phpDocumentor\\Reflection\\PseudoTypes\\NegativeInteger' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/NegativeInteger.php', + 'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyArray' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyArray.php', 'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyList' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyList.php', 'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyLowercaseString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyLowercaseString.php', 'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyString.php', 'phpDocumentor\\Reflection\\PseudoTypes\\NumericString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/NumericString.php', 'phpDocumentor\\Reflection\\PseudoTypes\\Numeric_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/Numeric_.php', + 'phpDocumentor\\Reflection\\PseudoTypes\\ObjectShape' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/ObjectShape.php', + 'phpDocumentor\\Reflection\\PseudoTypes\\ObjectShapeItem' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/ObjectShapeItem.php', 'phpDocumentor\\Reflection\\PseudoTypes\\PositiveInteger' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/PositiveInteger.php', + 'phpDocumentor\\Reflection\\PseudoTypes\\ShapeItem' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/ShapeItem.php', 'phpDocumentor\\Reflection\\PseudoTypes\\StringValue' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/StringValue.php', 'phpDocumentor\\Reflection\\PseudoTypes\\TraitString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/TraitString.php', 'phpDocumentor\\Reflection\\PseudoTypes\\True_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/True_.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 8df37913..96290958 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -155,28 +155,28 @@ }, { "name": "brick/math", - "version": "0.11.0", - "version_normalized": "0.11.0.0", + "version": "0.12.1", + "version_normalized": "0.12.1.0", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478" + "reference": "f510c0a40911935b77b86859eb5223d58d660df1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/0ad82ce168c82ba30d1c01ec86116ab52f589478", - "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478", + "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1", + "reference": "f510c0a40911935b77b86859eb5223d58d660df1", "shasum": "" }, "require": { - "php": "^8.0" + "php": "^8.1" }, "require-dev": { "php-coveralls/php-coveralls": "^2.2", - "phpunit/phpunit": "^9.0", - "vimeo/psalm": "5.0.0" + "phpunit/phpunit": "^10.1", + "vimeo/psalm": "5.16.0" }, - "time": "2023-01-15T23:15:59+00:00", + "time": "2023-11-29T23:19:16+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -196,12 +196,17 @@ "arithmetic", "bigdecimal", "bignum", + "bignumber", "brick", - "math" + "decimal", + "integer", + "math", + "mathematics", + "rational" ], "support": { "issues": "https://github.com/brick/math/issues", - "source": "https://github.com/brick/math/tree/0.11.0" + "source": "https://github.com/brick/math/tree/0.12.1" }, "funding": [ { @@ -509,17 +514,17 @@ }, { "name": "dragonmantank/cron-expression", - "version": "v3.3.3", - "version_normalized": "3.3.3.0", + "version": "v3.4.0", + "version_normalized": "3.4.0.0", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a" + "reference": "8c784d071debd117328803d86b2097615b457500" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", - "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500", + "reference": "8c784d071debd117328803d86b2097615b457500", "shasum": "" }, "require": { @@ -532,11 +537,15 @@ "require-dev": { "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.0", - "phpstan/phpstan-webmozart-assert": "^1.0", "phpunit/phpunit": "^7.0|^8.0|^9.0" }, - "time": "2023-08-10T19:36:49+00:00", + "time": "2024-10-09T13:47:03+00:00", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, "installation-source": "dist", "autoload": { "psr-4": { @@ -561,7 +570,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0" }, "funding": [ { @@ -643,17 +652,17 @@ }, { "name": "fakerphp/faker", - "version": "v1.23.1", - "version_normalized": "1.23.1.0", + "version": "v1.24.1", + "version_normalized": "1.24.1.0", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b" + "reference": "e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b", - "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5", + "reference": "e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5", "shasum": "" }, "require": { @@ -678,7 +687,7 @@ "ext-iconv": "Required by Faker\\Provider\\ru_RU\\Text::realText() for generating real Russian text.", "ext-mbstring": "Required for multibyte Unicode string functionality." }, - "time": "2024-01-02T13:46:09+00:00", + "time": "2024-11-21T13:46:39+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -703,7 +712,7 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.23.1" + "source": "https://github.com/FakerPHP/Faker/tree/v1.24.1" }, "install-path": "../fakerphp/faker" }, @@ -773,33 +782,33 @@ }, { "name": "filp/whoops", - "version": "2.15.4", - "version_normalized": "2.15.4.0", + "version": "2.16.0", + "version_normalized": "2.16.0.0", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546" + "reference": "befcdc0e5dce67252aa6322d82424be928214fa2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546", - "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546", + "url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2", + "reference": "befcdc0e5dce67252aa6322d82424be928214fa2", "shasum": "" }, "require": { - "php": "^5.5.9 || ^7.0 || ^8.0", + "php": "^7.1 || ^8.0", "psr/log": "^1.0.1 || ^2.0 || ^3.0" }, "require-dev": { - "mockery/mockery": "^0.9 || ^1.0", - "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3", - "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0" + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.3", + "symfony/var-dumper": "^4.0 || ^5.0" }, "suggest": { "symfony/var-dumper": "Pretty print complex values better with var-dumper available", "whoops/soap": "Formats errors as SOAP responses" }, - "time": "2023-11-03T12:00:00+00:00", + "time": "2024-09-25T12:00:00+00:00", "type": "library", "extra": { "branch-alias": { @@ -835,7 +844,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.15.4" + "source": "https://github.com/filp/whoops/tree/2.16.0" }, "funding": [ { @@ -847,27 +856,27 @@ }, { "name": "graham-campbell/result-type", - "version": "v1.1.2", - "version_normalized": "1.1.2.0", + "version": "v1.1.3", + "version_normalized": "1.1.3.0", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862" + "reference": "3ba905c11371512af9d9bdd27d99b782216b6945" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862", - "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945", + "reference": "3ba905c11371512af9d9bdd27d99b782216b6945", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", - "phpoption/phpoption": "^1.9.2" + "phpoption/phpoption": "^1.9.3" }, "require-dev": { - "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28" }, - "time": "2023-11-12T22:16:48+00:00", + "time": "2024-07-20T21:45:45+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -896,7 +905,7 @@ ], "support": { "issues": "https://github.com/GrahamCampbell/Result-Type/issues", - "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2" + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3" }, "funding": [ { @@ -966,17 +975,17 @@ }, { "name": "illuminate/bus", - "version": "v10.48.4", - "version_normalized": "10.48.4.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/bus.git", - "reference": "33993b8f54e91b03fb5000e55693e146e7370763" + "reference": "42cf510d0dcf20a1a27580290e283b7df2621bc7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/bus/zipball/33993b8f54e91b03fb5000e55693e146e7370763", - "reference": "33993b8f54e91b03fb5000e55693e146e7370763", + "url": "https://api.github.com/repos/illuminate/bus/zipball/42cf510d0dcf20a1a27580290e283b7df2621bc7", + "reference": "42cf510d0dcf20a1a27580290e283b7df2621bc7", "shasum": "" }, "require": { @@ -989,7 +998,7 @@ "suggest": { "illuminate/queue": "Required to use closures when chaining jobs (^7.0)." }, - "time": "2024-02-23T15:38:25+00:00", + "time": "2024-11-11T20:53:37+00:00", "type": "library", "extra": { "branch-alias": { @@ -1022,17 +1031,17 @@ }, { "name": "illuminate/cache", - "version": "v10.48.4", - "version_normalized": "10.48.4.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/cache.git", - "reference": "017403b7ff5926fbf80c21645106f72ce1023e6f" + "reference": "6020bc5f40b62cc680be3eb57e980e5cb26884ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/cache/zipball/017403b7ff5926fbf80c21645106f72ce1023e6f", - "reference": "017403b7ff5926fbf80c21645106f72ce1023e6f", + "url": "https://api.github.com/repos/illuminate/cache/zipball/6020bc5f40b62cc680be3eb57e980e5cb26884ff", + "reference": "6020bc5f40b62cc680be3eb57e980e5cb26884ff", "shasum": "" }, "require": { @@ -1054,7 +1063,7 @@ "illuminate/redis": "Required to use the redis cache driver (^10.0).", "symfony/cache": "Required to use PSR-6 cache bridge (^6.2)." }, - "time": "2024-03-08T02:31:57+00:00", + "time": "2024-05-23T18:38:25+00:00", "type": "library", "extra": { "branch-alias": { @@ -1087,8 +1096,8 @@ }, { "name": "illuminate/collections", - "version": "v10.48.14", - "version_normalized": "10.48.14.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", @@ -1145,8 +1154,8 @@ }, { "name": "illuminate/conditionable", - "version": "v10.48.14", - "version_normalized": "10.48.14.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", @@ -1194,8 +1203,8 @@ }, { "name": "illuminate/config", - "version": "v10.48.4", - "version_normalized": "10.48.4.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/config.git", @@ -1245,17 +1254,17 @@ }, { "name": "illuminate/console", - "version": "v10.48.4", - "version_normalized": "10.48.4.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/console.git", - "reference": "f6f9b944ef0f59dd331350bdd1e720c850946bb1" + "reference": "d10e2fb5331b82b2e58a9be05ea798e5a0899890" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/console/zipball/f6f9b944ef0f59dd331350bdd1e720c850946bb1", - "reference": "f6f9b944ef0f59dd331350bdd1e720c850946bb1", + "url": "https://api.github.com/repos/illuminate/console/zipball/d10e2fb5331b82b2e58a9be05ea798e5a0899890", + "reference": "d10e2fb5331b82b2e58a9be05ea798e5a0899890", "shasum": "" }, "require": { @@ -1280,7 +1289,7 @@ "illuminate/filesystem": "Required to use the generator command (^10.0).", "illuminate/queue": "Required to use closures for scheduled jobs (^10.0)." }, - "time": "2024-03-11T21:46:09+00:00", + "time": "2024-06-18T17:24:16+00:00", "type": "library", "extra": { "branch-alias": { @@ -1313,8 +1322,8 @@ }, { "name": "illuminate/container", - "version": "v10.48.14", - "version_normalized": "10.48.14.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/container.git", @@ -1367,8 +1376,8 @@ }, { "name": "illuminate/contracts", - "version": "v10.48.14", - "version_normalized": "10.48.14.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", @@ -1418,8 +1427,8 @@ }, { "name": "illuminate/events", - "version": "v10.48.4", - "version_normalized": "10.48.4.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/events.git", @@ -1476,8 +1485,8 @@ }, { "name": "illuminate/filesystem", - "version": "v10.48.14", - "version_normalized": "10.48.14.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", @@ -1546,8 +1555,8 @@ }, { "name": "illuminate/macroable", - "version": "v10.48.14", - "version_normalized": "10.48.14.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -1595,8 +1604,8 @@ }, { "name": "illuminate/pipeline", - "version": "v10.48.4", - "version_normalized": "10.48.4.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/pipeline.git", @@ -1646,8 +1655,8 @@ }, { "name": "illuminate/process", - "version": "v10.48.4", - "version_normalized": "10.48.4.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/process.git", @@ -1700,17 +1709,17 @@ }, { "name": "illuminate/support", - "version": "v10.48.14", - "version_normalized": "10.48.14.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "263f389d81488c237846b69469f91387ca2729f3" + "reference": "56c6d9895605b019e3debb9440454596ef99312a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/263f389d81488c237846b69469f91387ca2729f3", - "reference": "263f389d81488c237846b69469f91387ca2729f3", + "url": "https://api.github.com/repos/illuminate/support/zipball/56c6d9895605b019e3debb9440454596ef99312a", + "reference": "56c6d9895605b019e3debb9440454596ef99312a", "shasum": "" }, "require": { @@ -1738,7 +1747,7 @@ "symfony/var-dumper": "Required to use the dd function (^6.2).", "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.4.1)." }, - "time": "2024-05-16T21:33:51+00:00", + "time": "2024-05-20T13:31:33+00:00", "type": "library", "extra": { "branch-alias": { @@ -1774,17 +1783,17 @@ }, { "name": "illuminate/testing", - "version": "v10.48.4", - "version_normalized": "10.48.4.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/testing.git", - "reference": "5e5f0d8a30cae66f8383098bee623cc75b60af8c" + "reference": "ff641ff4813040c2a5abfcbe8e38590106608cd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/testing/zipball/5e5f0d8a30cae66f8383098bee623cc75b60af8c", - "reference": "5e5f0d8a30cae66f8383098bee623cc75b60af8c", + "url": "https://api.github.com/repos/illuminate/testing/zipball/ff641ff4813040c2a5abfcbe8e38590106608cd7", + "reference": "ff641ff4813040c2a5abfcbe8e38590106608cd7", "shasum": "" }, "require": { @@ -1803,7 +1812,7 @@ "mockery/mockery": "Required to use mocking (^1.5.1).", "phpunit/phpunit": "Required to use assertions and run tests (^9.5.8|^10.0.7)." }, - "time": "2024-02-08T15:10:07+00:00", + "time": "2024-04-22T13:20:30+00:00", "type": "library", "extra": { "branch-alias": { @@ -1836,8 +1845,8 @@ }, { "name": "illuminate/translation", - "version": "v10.48.14", - "version_normalized": "10.48.14.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/translation.git", @@ -1890,8 +1899,8 @@ }, { "name": "illuminate/validation", - "version": "v10.48.14", - "version_normalized": "10.48.14.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/validation.git", @@ -1954,17 +1963,17 @@ }, { "name": "illuminate/view", - "version": "v10.48.4", - "version_normalized": "10.48.4.0", + "version": "v10.48.24", + "version_normalized": "10.48.24.0", "source": { "type": "git", "url": "https://github.com/illuminate/view.git", - "reference": "504d55e0f2d90c75588627e6a77a4d1228cf1a02" + "reference": "76a1405bc3e1d0a19e8d2db3bd5b991ed10b31f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/view/zipball/504d55e0f2d90c75588627e6a77a4d1228cf1a02", - "reference": "504d55e0f2d90c75588627e6a77a4d1228cf1a02", + "url": "https://api.github.com/repos/illuminate/view/zipball/76a1405bc3e1d0a19e8d2db3bd5b991ed10b31f7", + "reference": "76a1405bc3e1d0a19e8d2db3bd5b991ed10b31f7", "shasum": "" }, "require": { @@ -1978,7 +1987,7 @@ "illuminate/support": "^10.0", "php": "^8.1" }, - "time": "2024-03-12T16:33:42+00:00", + "time": "2024-05-21T17:37:01+00:00", "type": "library", "extra": { "branch-alias": { @@ -2011,31 +2020,31 @@ }, { "name": "jean85/pretty-package-versions", - "version": "2.0.6", - "version_normalized": "2.0.6.0", + "version": "2.1.0", + "version_normalized": "2.1.0.0", "source": { "type": "git", "url": "https://github.com/Jean85/pretty-package-versions.git", - "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4" + "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/f9fdd29ad8e6d024f52678b570e5593759b550b4", - "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4", + "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/3c4e5f62ba8d7de1734312e4fff32f67a8daaf10", + "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10", "shasum": "" }, "require": { - "composer-runtime-api": "^2.0.0", - "php": "^7.1|^8.0" + "composer-runtime-api": "^2.1.0", + "php": "^7.4|^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.2", "jean85/composer-provided-replaced-stub-package": "^1.0", "phpstan/phpstan": "^1.4", - "phpunit/phpunit": "^7.5|^8.5|^9.4", - "vimeo/psalm": "^4.3" + "phpunit/phpunit": "^7.5|^8.5|^9.6", + "vimeo/psalm": "^4.3 || ^5.0" }, - "time": "2024-03-08T09:58:59+00:00", + "time": "2024-11-18T16:19:46+00:00", "type": "library", "extra": { "branch-alias": { @@ -2067,36 +2076,40 @@ ], "support": { "issues": "https://github.com/Jean85/pretty-package-versions/issues", - "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.6" + "source": "https://github.com/Jean85/pretty-package-versions/tree/2.1.0" }, "install-path": "../jean85/pretty-package-versions" }, { "name": "jolicode/jolinotif", - "version": "v2.6.0", - "version_normalized": "2.6.0.0", + "version": "v2.7.3", + "version_normalized": "2.7.3.0", "source": { "type": "git", "url": "https://github.com/jolicode/JoliNotif.git", - "reference": "6a886aa19aec7cc283125631f31f93f71729bf40" + "reference": "3c3e1c410b107dd2603b732508fd95830f0e0196" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jolicode/JoliNotif/zipball/6a886aa19aec7cc283125631f31f93f71729bf40", - "reference": "6a886aa19aec7cc283125631f31f93f71729bf40", + "url": "https://api.github.com/repos/jolicode/JoliNotif/zipball/3c3e1c410b107dd2603b732508fd95830f0e0196", + "reference": "3c3e1c410b107dd2603b732508fd95830f0e0196", "shasum": "" }, "require": { "jolicode/php-os-helper": "^0.1.0", "php": ">=8.1", + "psr/log": "^1.0 || ^2.0 || ^3.0", + "symfony/deprecation-contracts": "^3", "symfony/process": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.13", "symfony/finder": "^5.4 || ^6.0 || ^7.0", "symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0" }, - "time": "2023-12-03T13:14:21+00:00", + "suggest": { + "ext-ffi": "Needed to send notifications via libnotify on Linux" + }, + "time": "2024-09-30T13:34:54+00:00", "bin": [ "jolinotif" ], @@ -2127,7 +2140,7 @@ ], "support": { "issues": "https://github.com/jolicode/JoliNotif/issues", - "source": "https://github.com/jolicode/JoliNotif/tree/v2.6.0" + "source": "https://github.com/jolicode/JoliNotif/tree/v2.7.3" }, "funding": [ { @@ -2192,23 +2205,23 @@ }, { "name": "laravel-zero/foundation", - "version": "v10.48.4", - "version_normalized": "10.48.4.0", + "version": "v10.48.8", + "version_normalized": "10.48.8.0", "source": { "type": "git", "url": "https://github.com/laravel-zero/foundation.git", - "reference": "0b5f09875ae22ede06b77d66432f470c5aa32b73" + "reference": "5203cc84ace9c74e26735888f4c46396450b4b4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel-zero/foundation/zipball/0b5f09875ae22ede06b77d66432f470c5aa32b73", - "reference": "0b5f09875ae22ede06b77d66432f470c5aa32b73", + "url": "https://api.github.com/repos/laravel-zero/foundation/zipball/5203cc84ace9c74e26735888f4c46396450b4b4f", + "reference": "5203cc84ace9c74e26735888f4c46396450b4b4f", "shasum": "" }, "require": { "php": "^8.1" }, - "time": "2024-04-02T09:29:16+00:00", + "time": "2024-04-18T13:09:49+00:00", "type": "library", "extra": { "branch-alias": { @@ -2234,23 +2247,23 @@ "laravel" ], "support": { - "source": "https://github.com/laravel-zero/foundation/tree/v10.48.4" + "source": "https://github.com/laravel-zero/foundation/tree/v10.48.8" }, "install-path": "../laravel-zero/foundation" }, { "name": "laravel-zero/framework", - "version": "v10.3.0", - "version_normalized": "10.3.0.0", + "version": "v10.4.0", + "version_normalized": "10.4.0.0", "source": { "type": "git", "url": "https://github.com/laravel-zero/framework.git", - "reference": "517dddb90948f7c894440f54a726249e384f70e1" + "reference": "1c44f0cdb936b447d5556e0a23733bfc17cdd997" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel-zero/framework/zipball/517dddb90948f7c894440f54a726249e384f70e1", - "reference": "517dddb90948f7c894440f54a726249e384f70e1", + "url": "https://api.github.com/repos/laravel-zero/framework/zipball/1c44f0cdb936b447d5556e0a23733bfc17cdd997", + "reference": "1c44f0cdb936b447d5556e0a23733bfc17cdd997", "shasum": "" }, "require": { @@ -2267,25 +2280,25 @@ "illuminate/process": "^10.28", "illuminate/support": "^10.28", "illuminate/testing": "^10.28", - "laravel-zero/foundation": "^10.28", - "league/flysystem": "^3.15.1", - "nunomaduro/collision": "^6.4.0|^7.8.1", - "nunomaduro/laravel-console-summary": "^1.10.0", - "nunomaduro/laravel-console-task": "^1.8", - "nunomaduro/laravel-desktop-notifier": "^2.7", + "laravel-zero/foundation": "^10.48.8", + "league/flysystem": "^3.27.0", + "nunomaduro/collision": "^6.4.0|^7.10.0", + "nunomaduro/laravel-console-summary": "^1.11.1", + "nunomaduro/laravel-console-task": "^1.9", + "nunomaduro/laravel-desktop-notifier": "^2.8.1", "php": "^8.1", "psr/log": "^1.1|^2.0|^3.0", - "ramsey/uuid": "^4.7.4", - "symfony/console": "^6.3.2", - "symfony/error-handler": "^6.3.2", - "symfony/event-dispatcher": "^6.3.2", - "symfony/finder": "^6.3.3", - "symfony/process": "^6.3.2", - "symfony/var-dumper": "^6.3.3", - "vlucas/phpdotenv": "^5.5" + "ramsey/uuid": "^4.7.5", + "symfony/console": "^6.4.6", + "symfony/error-handler": "^6.4.6", + "symfony/event-dispatcher": "^6.4.3", + "symfony/finder": "^6.4.0", + "symfony/process": "^6.4.4", + "symfony/var-dumper": "^6.4.6", + "vlucas/phpdotenv": "^5.6" }, "require-dev": { - "guzzlehttp/guzzle": "^7.7", + "guzzlehttp/guzzle": "^7.8.1", "illuminate/bus": "^10.28", "illuminate/database": "^10.28", "illuminate/http": "^10.28", @@ -2293,20 +2306,20 @@ "illuminate/queue": "^10.28", "illuminate/redis": "^10.28", "illuminate/view": "^10.28", - "laminas/laminas-text": "^2.10", + "laminas/laminas-text": "^2.11", "laravel-zero/phar-updater": "^1.4", - "laravel/pint": "^1.13.3", - "nunomaduro/laravel-console-dusk": "^1.11", - "nunomaduro/laravel-console-menu": "^3.4", + "laravel/pint": "^1.15.1", + "nunomaduro/laravel-console-dusk": "^1.12", + "nunomaduro/laravel-console-menu": "^3.5", "nunomaduro/termwind": "^1.15.1", - "pestphp/pest": "^2.22.1", - "pestphp/pest-plugin-laravel": "^2.2", - "phpstan/phpstan": "^1.10.38" + "pestphp/pest": "^2.34.7", + "pestphp/pest-plugin-laravel": "^2.3", + "phpstan/phpstan": "^1.10.67" }, "suggest": { "ext-pcntl": "Required to ensure that data is cleared when cancelling the build process." }, - "time": "2023-10-30T09:40:05+00:00", + "time": "2024-04-18T13:12:28+00:00", "type": "library", "extra": { "branch-alias": { @@ -2350,17 +2363,17 @@ }, { "name": "laravel/prompts", - "version": "v0.1.17", - "version_normalized": "0.1.17.0", + "version": "v0.1.25", + "version_normalized": "0.1.25.0", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5" + "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5", - "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5", + "url": "https://api.github.com/repos/laravel/prompts/zipball/7b4029a84c37cb2725fc7f011586e2997040bc95", + "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95", "shasum": "" }, "require": { @@ -2382,7 +2395,7 @@ "suggest": { "ext-pcntl": "Required for the spinner to be animated." }, - "time": "2024-03-13T16:05:43+00:00", + "time": "2024-08-12T22:06:33+00:00", "type": "library", "extra": { "branch-alias": { @@ -2402,25 +2415,26 @@ "license": [ "MIT" ], + "description": "Add beautiful and user-friendly forms to your command-line applications.", "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.17" + "source": "https://github.com/laravel/prompts/tree/v0.1.25" }, "install-path": "../laravel/prompts" }, { "name": "league/flysystem", - "version": "3.26.0", - "version_normalized": "3.26.0.0", + "version": "3.29.1", + "version_normalized": "3.29.1.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "072735c56cc0da00e10716dd90d5a7f7b40b36be" + "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/072735c56cc0da00e10716dd90d5a7f7b40b36be", - "reference": "072735c56cc0da00e10716dd90d5a7f7b40b36be", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319", + "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319", "shasum": "" }, "require": { @@ -2444,16 +2458,19 @@ "composer/semver": "^3.0", "ext-fileinfo": "*", "ext-ftp": "*", + "ext-mongodb": "^1.3", "ext-zip": "*", "friendsofphp/php-cs-fixer": "^3.5", "google/cloud-storage": "^1.23", + "guzzlehttp/psr7": "^2.6", "microsoft/azure-storage-blob": "^1.1", + "mongodb/mongodb": "^1.2", "phpseclib/phpseclib": "^3.0.36", "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.5.11|^10.0", "sabre/dav": "^4.6.0" }, - "time": "2024-03-25T11:49:53+00:00", + "time": "2024-10-08T08:58:34+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2487,33 +2504,23 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.26.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.29.1" }, - "funding": [ - { - "url": "https://ecologi.com/frankdejonge", - "type": "custom" - }, - { - "url": "https://github.com/frankdejonge", - "type": "github" - } - ], "install-path": "../league/flysystem" }, { "name": "league/flysystem-local", - "version": "3.25.1", - "version_normalized": "3.25.1.0", + "version": "3.29.0", + "version_normalized": "3.29.0.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-local.git", - "reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92" + "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/61a6a90d6e999e4ddd9ce5adb356de0939060b92", - "reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92", + "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27", + "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27", "shasum": "" }, "require": { @@ -2522,7 +2529,7 @@ "league/mime-type-detection": "^1.0.0", "php": "^8.0.2" }, - "time": "2024-03-15T19:58:44+00:00", + "time": "2024-08-09T21:24:39+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2549,33 +2556,23 @@ "local" ], "support": { - "source": "https://github.com/thephpleague/flysystem-local/tree/3.25.1" + "source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0" }, - "funding": [ - { - "url": "https://ecologi.com/frankdejonge", - "type": "custom" - }, - { - "url": "https://github.com/frankdejonge", - "type": "github" - } - ], "install-path": "../league/flysystem-local" }, { "name": "league/mime-type-detection", - "version": "1.15.0", - "version_normalized": "1.15.0.0", + "version": "1.16.0", + "version_normalized": "1.16.0.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301" + "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", - "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/2d6702ff215bf922936ccc1ad31007edc76451b9", + "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9", "shasum": "" }, "require": { @@ -2587,7 +2584,7 @@ "phpstan/phpstan": "^0.12.68", "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0" }, - "time": "2024-01-28T23:22:08+00:00", + "time": "2024-09-21T08:32:55+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2608,7 +2605,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.15.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.16.0" }, "funding": [ { @@ -2710,17 +2707,17 @@ }, { "name": "myclabs/deep-copy", - "version": "1.12.0", - "version_normalized": "1.12.0.0", + "version": "1.12.1", + "version_normalized": "1.12.1.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845", + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845", "shasum": "" }, "require": { @@ -2736,7 +2733,7 @@ "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, - "time": "2024-06-12T14:39:25+00:00", + "time": "2024-11-08T17:47:46+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2761,7 +2758,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1" }, "funding": [ { @@ -2883,17 +2880,17 @@ }, { "name": "nikic/php-parser", - "version": "v5.1.0", - "version_normalized": "5.1.0.0", + "version": "v5.3.1", + "version_normalized": "5.3.1.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1" + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1", - "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", "shasum": "" }, "require": { @@ -2906,7 +2903,7 @@ "ircmaxell/php-yacc": "^0.0.7", "phpunit/phpunit": "^9.0" }, - "time": "2024-07-01T20:03:41+00:00", + "time": "2024-10-08T18:51:32+00:00", "bin": [ "bin/php-parse" ], @@ -2938,49 +2935,49 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" }, "install-path": "../nikic/php-parser" }, { "name": "nunomaduro/collision", - "version": "v7.10.0", - "version_normalized": "7.10.0.0", + "version": "v7.11.0", + "version_normalized": "7.11.0.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "49ec67fa7b002712da8526678abd651c09f375b2" + "reference": "994ea93df5d4132f69d3f1bd74730509df6e8a05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/49ec67fa7b002712da8526678abd651c09f375b2", - "reference": "49ec67fa7b002712da8526678abd651c09f375b2", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/994ea93df5d4132f69d3f1bd74730509df6e8a05", + "reference": "994ea93df5d4132f69d3f1bd74730509df6e8a05", "shasum": "" }, "require": { - "filp/whoops": "^2.15.3", + "filp/whoops": "^2.16.0", "nunomaduro/termwind": "^1.15.1", "php": "^8.1.0", - "symfony/console": "^6.3.4" + "symfony/console": "^6.4.12" }, "conflict": { "laravel/framework": ">=11.0.0" }, "require-dev": { - "brianium/paratest": "^7.3.0", - "laravel/framework": "^10.28.0", - "laravel/pint": "^1.13.3", - "laravel/sail": "^1.25.0", - "laravel/sanctum": "^3.3.1", - "laravel/tinker": "^2.8.2", - "nunomaduro/larastan": "^2.6.4", - "orchestra/testbench-core": "^8.13.0", - "pestphp/pest": "^2.23.2", - "phpunit/phpunit": "^10.4.1", - "sebastian/environment": "^6.0.1", - "spatie/laravel-ignition": "^2.3.1" + "brianium/paratest": "^7.3.1", + "laravel/framework": "^10.48.22", + "laravel/pint": "^1.18.1", + "laravel/sail": "^1.36.0", + "laravel/sanctum": "^3.3.3", + "laravel/tinker": "^2.10.0", + "nunomaduro/larastan": "^2.9.8", + "orchestra/testbench-core": "^8.28.3", + "pestphp/pest": "^2.35.1", + "phpunit/phpunit": "^10.5.36", + "sebastian/environment": "^6.1.0", + "spatie/laravel-ignition": "^2.8.0" }, - "time": "2023-10-11T15:45:01+00:00", + "time": "2024-10-15T15:12:40+00:00", "type": "library", "extra": { "laravel": { @@ -3043,17 +3040,17 @@ }, { "name": "nunomaduro/laravel-console-summary", - "version": "v1.11.0", - "version_normalized": "1.11.0.0", + "version": "v1.11.1", + "version_normalized": "1.11.1.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/laravel-console-summary.git", - "reference": "14834db07c9900f8228098d7c345dece45c4c3d9" + "reference": "2e3cf7b261697eed3fdf87a66be4470d32b405bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/laravel-console-summary/zipball/14834db07c9900f8228098d7c345dece45c4c3d9", - "reference": "14834db07c9900f8228098d7c345dece45c4c3d9", + "url": "https://api.github.com/repos/nunomaduro/laravel-console-summary/zipball/2e3cf7b261697eed3fdf87a66be4470d32b405bd", + "reference": "2e3cf7b261697eed3fdf87a66be4470d32b405bd", "shasum": "" }, "require": { @@ -3064,7 +3061,7 @@ "require-dev": { "laravel/pint": "^1.4" }, - "time": "2024-03-05T09:24:48+00:00", + "time": "2024-04-09T08:41:54+00:00", "type": "library", "extra": { "laravel": { @@ -3108,28 +3105,28 @@ }, { "name": "nunomaduro/laravel-console-task", - "version": "v1.8.0", - "version_normalized": "1.8.0.0", + "version": "v1.9.0", + "version_normalized": "1.9.0.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/laravel-console-task.git", - "reference": "e49e7be261a7b7329c4538777489b355fb234bde" + "reference": "02b2a550318fda3355e45763885e30b4e650bc1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/laravel-console-task/zipball/e49e7be261a7b7329c4538777489b355fb234bde", - "reference": "e49e7be261a7b7329c4538777489b355fb234bde", + "url": "https://api.github.com/repos/nunomaduro/laravel-console-task/zipball/02b2a550318fda3355e45763885e30b4e650bc1b", + "reference": "02b2a550318fda3355e45763885e30b4e650bc1b", "shasum": "" }, "require": { - "illuminate/console": "^9.0|^10.0", - "illuminate/support": "^9.0|^10.0", + "illuminate/console": "^10.0|^11.0", + "illuminate/support": "^10.0|^11.0", "php": "^8.1" }, "require-dev": { - "pestphp/pest": "^1.22.3" + "pestphp/pest": "^2.34" }, - "time": "2023-01-11T15:16:19+00:00", + "time": "2024-04-11T07:51:10+00:00", "type": "library", "extra": { "laravel": { @@ -3173,17 +3170,17 @@ }, { "name": "nunomaduro/laravel-desktop-notifier", - "version": "v2.8.0", - "version_normalized": "2.8.0.0", + "version": "v2.8.1", + "version_normalized": "2.8.1.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/laravel-desktop-notifier.git", - "reference": "d9935c73670f368032d84092a554417d71ee2233" + "reference": "9937f1f8898077ad6d058c03ecee39d6eae7eb39" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/laravel-desktop-notifier/zipball/d9935c73670f368032d84092a554417d71ee2233", - "reference": "d9935c73670f368032d84092a554417d71ee2233", + "url": "https://api.github.com/repos/nunomaduro/laravel-desktop-notifier/zipball/9937f1f8898077ad6d058c03ecee39d6eae7eb39", + "reference": "9937f1f8898077ad6d058c03ecee39d6eae7eb39", "shasum": "" }, "require": { @@ -3196,7 +3193,7 @@ "graham-campbell/testbench": "^5.7|^6.1", "pestphp/pest": "^2.34" }, - "time": "2024-03-05T13:34:36+00:00", + "time": "2024-04-06T06:39:11+00:00", "type": "library", "extra": { "laravel": { @@ -3240,43 +3237,42 @@ ], "support": { "issues": "https://github.com/nunomaduro/laravel-desktop-notifier/issues", - "source": "https://github.com/nunomaduro/laravel-desktop-notifier/tree/v2.8.0" + "source": "https://github.com/nunomaduro/laravel-desktop-notifier/tree/v2.8.1" }, "install-path": "../nunomaduro/laravel-desktop-notifier" }, { "name": "nunomaduro/termwind", - "version": "v1.15.1", - "version_normalized": "1.15.1.0", + "version": "v1.17.0", + "version_normalized": "1.17.0.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/termwind.git", - "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc" + "reference": "5369ef84d8142c1d87e4ec278711d4ece3cbf301" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/8ab0b32c8caa4a2e09700ea32925441385e4a5dc", - "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc", + "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/5369ef84d8142c1d87e4ec278711d4ece3cbf301", + "reference": "5369ef84d8142c1d87e4ec278711d4ece3cbf301", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": "^8.0", - "symfony/console": "^5.3.0|^6.0.0" + "php": "^8.1", + "symfony/console": "^6.4.15" }, "require-dev": { - "ergebnis/phpstan-rules": "^1.0.", - "illuminate/console": "^8.0|^9.0", - "illuminate/support": "^8.0|^9.0", - "laravel/pint": "^1.0.0", - "pestphp/pest": "^1.21.0", - "pestphp/pest-plugin-mock": "^1.0", - "phpstan/phpstan": "^1.4.6", - "phpstan/phpstan-strict-rules": "^1.1.0", - "symfony/var-dumper": "^5.2.7|^6.0.0", + "illuminate/console": "^10.48.24", + "illuminate/support": "^10.48.24", + "laravel/pint": "^1.18.2", + "pestphp/pest": "^2.36.0", + "pestphp/pest-plugin-mock": "2.0.0", + "phpstan/phpstan": "^1.12.11", + "phpstan/phpstan-strict-rules": "^1.6.1", + "symfony/var-dumper": "^6.4.15", "thecodingmachine/phpstan-strict-rules": "^1.0.0" }, - "time": "2023-02-08T01:06:31+00:00", + "time": "2024-11-21T10:36:35+00:00", "type": "library", "extra": { "laravel": { @@ -3315,7 +3311,7 @@ ], "support": { "issues": "https://github.com/nunomaduro/termwind/issues", - "source": "https://github.com/nunomaduro/termwind/tree/v1.15.1" + "source": "https://github.com/nunomaduro/termwind/tree/v1.17.0" }, "funding": [ { @@ -3335,39 +3331,40 @@ }, { "name": "pestphp/pest", - "version": "v2.35.1", - "version_normalized": "2.35.1.0", + "version": "v2.36.0", + "version_normalized": "2.36.0.0", "source": { "type": "git", "url": "https://github.com/pestphp/pest.git", - "reference": "b13acb630df52c06123588d321823c31fc685545" + "reference": "f8c88bd14dc1772bfaf02169afb601ecdf2724cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pestphp/pest/zipball/b13acb630df52c06123588d321823c31fc685545", - "reference": "b13acb630df52c06123588d321823c31fc685545", + "url": "https://api.github.com/repos/pestphp/pest/zipball/f8c88bd14dc1772bfaf02169afb601ecdf2724cd", + "reference": "f8c88bd14dc1772bfaf02169afb601ecdf2724cd", "shasum": "" }, "require": { "brianium/paratest": "^7.3.1", - "nunomaduro/collision": "^7.10.0|^8.4.0", - "nunomaduro/termwind": "^1.15.1|^2.0.1", + "nunomaduro/collision": "^7.11.0|^8.4.0", + "nunomaduro/termwind": "^1.16.0|^2.1.0", "pestphp/pest-plugin": "^2.1.1", "pestphp/pest-plugin-arch": "^2.7.0", "php": "^8.1.0", - "phpunit/phpunit": "^10.5.17" + "phpunit/phpunit": "^10.5.36" }, "conflict": { - "phpunit/phpunit": ">10.5.17", + "filp/whoops": "<2.16.0", + "phpunit/phpunit": ">10.5.36", "sebastian/exporter": "<5.1.0", "webmozart/assert": "<1.11.0" }, "require-dev": { - "pestphp/pest-dev-tools": "^2.16.0", - "pestphp/pest-plugin-type-coverage": "^2.8.5", - "symfony/process": "^6.4.0|^7.1.3" + "pestphp/pest-dev-tools": "^2.17.0", + "pestphp/pest-plugin-type-coverage": "^2.8.7", + "symfony/process": "^6.4.0|^7.1.5" }, - "time": "2024-08-20T21:41:50+00:00", + "time": "2024-10-15T15:30:56+00:00", "bin": [ "bin/pest" ], @@ -3430,7 +3427,7 @@ ], "support": { "issues": "https://github.com/pestphp/pest/issues", - "source": "https://github.com/pestphp/pest/tree/v2.35.1" + "source": "https://github.com/pestphp/pest/tree/v2.36.0" }, "funding": [ { @@ -3841,17 +3838,17 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.4.1", - "version_normalized": "5.4.1.0", + "version": "5.6.0", + "version_normalized": "5.6.0.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c" + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", - "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/f3558a4c23426d12bffeaab463f8a8d8b681193c", + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c", "shasum": "" }, "require": { @@ -3860,19 +3857,19 @@ "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", "phpdocumentor/type-resolver": "^1.7", - "phpstan/phpdoc-parser": "^1.7", + "phpstan/phpdoc-parser": "^1.7|^2.0", "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.5", + "mockery/mockery": "~1.3.5 || ~1.6.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.8", "phpstan/phpstan-mockery": "^1.1", "phpstan/phpstan-webmozart-assert": "^1.2", "phpunit/phpunit": "^9.5", - "vimeo/psalm": "^5.13" + "psalm/phar": "^5.26" }, - "time": "2024-05-21T05:55:05+00:00", + "time": "2024-11-12T11:25:25+00:00", "type": "library", "extra": { "branch-alias": { @@ -3902,30 +3899,30 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.0" }, "install-path": "../phpdocumentor/reflection-docblock" }, { "name": "phpdocumentor/type-resolver", - "version": "1.8.2", - "version_normalized": "1.8.2.0", + "version": "1.10.0", + "version_normalized": "1.10.0.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "153ae662783729388a584b4361f2545e4d841e3c" + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", - "reference": "153ae662783729388a584b4361f2545e4d841e3c", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a", + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.13" + "phpstan/phpdoc-parser": "^1.18|^2.0" }, "require-dev": { "ext-tokenizer": "*", @@ -3937,7 +3934,7 @@ "rector/rector": "^0.13.9", "vimeo/psalm": "^4.25" }, - "time": "2024-02-23T11:10:43+00:00", + "time": "2024-11-09T15:12:26+00:00", "type": "library", "extra": { "branch-alias": { @@ -3963,23 +3960,23 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0" }, "install-path": "../phpdocumentor/type-resolver" }, { "name": "phpoption/phpoption", - "version": "1.9.2", - "version_normalized": "1.9.2.0", + "version": "1.9.3", + "version_normalized": "1.9.3.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820" + "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820", - "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54", + "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54", "shasum": "" }, "require": { @@ -3987,14 +3984,14 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28" }, - "time": "2023-11-12T21:59:55+00:00", + "time": "2024-07-20T21:41:07+00:00", "type": "library", "extra": { "bamarni-bin": { "bin-links": true, - "forward-command": true + "forward-command": false }, "branch-alias": { "dev-master": "1.9-dev" @@ -4031,7 +4028,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.9.2" + "source": "https://github.com/schmittjoh/php-option/tree/1.9.3" }, "funding": [ { @@ -4047,34 +4044,34 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.30.0", - "version_normalized": "1.30.0.0", + "version": "2.0.0", + "version_normalized": "2.0.0.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "5ceb0e384997db59f38774bf79c2a6134252c08f" + "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/5ceb0e384997db59f38774bf79c2a6134252c08f", - "reference": "5ceb0e384997db59f38774bf79c2a6134252c08f", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/c00d78fb6b29658347f9d37ebe104bffadf36299", + "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "doctrine/annotations": "^2.0", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^5.3.0", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.5", - "phpstan/phpstan-phpunit": "^1.1", - "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^9.5", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan-strict-rules": "^2.0", + "phpunit/phpunit": "^9.6", "symfony/process": "^5.2" }, - "time": "2024-08-29T09:54:52+00:00", + "time": "2024-10-13T11:29:49+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -4091,7 +4088,7 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.30.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.0" }, "install-path": "../phpstan/phpdoc-parser" }, @@ -4433,17 +4430,17 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.17", - "version_normalized": "10.5.17.0", + "version": "10.5.36", + "version_normalized": "10.5.36.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c1f736a473d21957ead7e94fcc029f571895abf5" + "reference": "aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c1f736a473d21957ead7e94fcc029f571895abf5", - "reference": "c1f736a473d21957ead7e94fcc029f571895abf5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870", + "reference": "aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870", "shasum": "" }, "require": { @@ -4453,31 +4450,31 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", "php": ">=8.1", - "phpunit/php-code-coverage": "^10.1.5", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-invoker": "^4.0", - "phpunit/php-text-template": "^3.0", - "phpunit/php-timer": "^6.0", - "sebastian/cli-parser": "^2.0", - "sebastian/code-unit": "^2.0", - "sebastian/comparator": "^5.0", - "sebastian/diff": "^5.0", - "sebastian/environment": "^6.0", - "sebastian/exporter": "^5.1", - "sebastian/global-state": "^6.0.1", - "sebastian/object-enumerator": "^5.0", - "sebastian/recursion-context": "^5.0", - "sebastian/type": "^4.0", - "sebastian/version": "^4.0" + "phpunit/php-code-coverage": "^10.1.16", + "phpunit/php-file-iterator": "^4.1.0", + "phpunit/php-invoker": "^4.0.0", + "phpunit/php-text-template": "^3.0.1", + "phpunit/php-timer": "^6.0.0", + "sebastian/cli-parser": "^2.0.1", + "sebastian/code-unit": "^2.0.0", + "sebastian/comparator": "^5.0.2", + "sebastian/diff": "^5.1.1", + "sebastian/environment": "^6.1.0", + "sebastian/exporter": "^5.1.2", + "sebastian/global-state": "^6.0.2", + "sebastian/object-enumerator": "^5.0.0", + "sebastian/recursion-context": "^5.0.0", + "sebastian/type": "^4.0.0", + "sebastian/version": "^4.0.1" }, "suggest": { "ext-soap": "To be able to generate mocks based on WSDL files" }, - "time": "2024-04-05T04:39:01+00:00", + "time": "2024-10-08T15:36:51+00:00", "bin": [ "phpunit" ], @@ -4517,7 +4514,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.17" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.36" }, "funding": [ { @@ -4697,23 +4694,23 @@ }, { "name": "psr/log", - "version": "3.0.1", - "version_normalized": "3.0.1.0", + "version": "3.0.2", + "version_normalized": "3.0.2.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "79dff0b268932c640297f5208d6298f71855c03e" + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e", - "reference": "79dff0b268932c640297f5208d6298f71855c03e", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", "shasum": "" }, "require": { "php": ">=8.0.0" }, - "time": "2024-08-21T13:31:24+00:00", + "time": "2024-09-11T13:17:53+00:00", "type": "library", "extra": { "branch-alias": { @@ -4744,7 +4741,7 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.1" + "source": "https://github.com/php-fig/log/tree/3.0.2" }, "install-path": "../psr/log" }, @@ -4896,21 +4893,21 @@ }, { "name": "ramsey/uuid", - "version": "4.7.5", - "version_normalized": "4.7.5.0", + "version": "4.7.6", + "version_normalized": "4.7.6.0", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e" + "reference": "91039bc1faa45ba123c4328958e620d382ec7088" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e", - "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088", + "reference": "91039bc1faa45ba123c4328958e620d382ec7088", "shasum": "" }, "require": { - "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11", + "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12", "ext-json": "*", "php": "^8.0", "ramsey/collection": "^1.2 || ^2.0" @@ -4947,7 +4944,7 @@ "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter", "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type." }, - "time": "2023-11-08T05:53:05+00:00", + "time": "2024-04-27T21:32:50+00:00", "type": "library", "extra": { "captainhook": { @@ -4975,7 +4972,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.7.5" + "source": "https://github.com/ramsey/uuid/tree/4.7.6" }, "funding": [ { @@ -5168,17 +5165,17 @@ }, { "name": "sebastian/comparator", - "version": "5.0.2", - "version_normalized": "5.0.2.0", + "version": "5.0.3", + "version_normalized": "5.0.3.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53" + "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53", - "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", + "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", "shasum": "" }, "require": { @@ -5189,9 +5186,9 @@ "sebastian/exporter": "^5.0" }, "require-dev": { - "phpunit/phpunit": "^10.4" + "phpunit/phpunit": "^10.5" }, - "time": "2024-08-12T06:03:08+00:00", + "time": "2024-10-18T14:56:07+00:00", "type": "library", "extra": { "branch-alias": { @@ -5236,7 +5233,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.2" + "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3" }, "funding": [ { @@ -5952,17 +5949,17 @@ }, { "name": "symfony/console", - "version": "v6.4.11", - "version_normalized": "6.4.11.0", + "version": "v6.4.15", + "version_normalized": "6.4.15.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "42686880adaacdad1835ee8fc2a9ec5b7bd63998" + "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/42686880adaacdad1835ee8fc2a9ec5b7bd63998", - "reference": "42686880adaacdad1835ee8fc2a9ec5b7bd63998", + "url": "https://api.github.com/repos/symfony/console/zipball/f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", + "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", "shasum": "" }, "require": { @@ -5995,7 +5992,7 @@ "symfony/stopwatch": "^5.4|^6.0|^7.0", "symfony/var-dumper": "^5.4|^6.0|^7.0" }, - "time": "2024-08-15T22:48:29+00:00", + "time": "2024-11-06T14:19:14+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -6029,7 +6026,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.11" + "source": "https://github.com/symfony/console/tree/v6.4.15" }, "funding": [ { @@ -6119,17 +6116,17 @@ }, { "name": "symfony/error-handler", - "version": "v6.4.6", - "version_normalized": "6.4.6.0", + "version": "v6.4.14", + "version_normalized": "6.4.14.0", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "64db1c1802e3a4557e37ba33031ac39f452ac5d4" + "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/64db1c1802e3a4557e37ba33031ac39f452ac5d4", - "reference": "64db1c1802e3a4557e37ba33031ac39f452ac5d4", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/9e024324511eeb00983ee76b9aedc3e6ecd993d9", + "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9", "shasum": "" }, "require": { @@ -6146,7 +6143,7 @@ "symfony/http-kernel": "^6.4|^7.0", "symfony/serializer": "^5.4|^6.0|^7.0" }, - "time": "2024-03-19T11:56:30+00:00", + "time": "2024-11-05T15:34:40+00:00", "bin": [ "Resources/bin/patch-type-declarations" ], @@ -6177,7 +6174,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.6" + "source": "https://github.com/symfony/error-handler/tree/v6.4.14" }, "funding": [ { @@ -6197,17 +6194,17 @@ }, { "name": "symfony/event-dispatcher", - "version": "v6.4.3", - "version_normalized": "6.4.3.0", + "version": "v6.4.13", + "version_normalized": "6.4.13.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef" + "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae9d3a6f3003a6caf56acd7466d8d52378d44fef", - "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", + "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", "shasum": "" }, "require": { @@ -6232,7 +6229,7 @@ "symfony/service-contracts": "^2.5|^3", "symfony/stopwatch": "^5.4|^6.0|^7.0" }, - "time": "2024-01-23T14:51:35+00:00", + "time": "2024-09-25T14:18:03+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -6260,7 +6257,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.3" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.13" }, "funding": [ { @@ -6359,17 +6356,17 @@ }, { "name": "symfony/finder", - "version": "v6.4.11", - "version_normalized": "6.4.11.0", + "version": "v6.4.13", + "version_normalized": "6.4.13.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453" + "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/d7eb6daf8cd7e9ac4976e9576b32042ef7253453", - "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453", + "url": "https://api.github.com/repos/symfony/finder/zipball/daea9eca0b08d0ed1dc9ab702a46128fd1be4958", + "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958", "shasum": "" }, "require": { @@ -6378,7 +6375,7 @@ "require-dev": { "symfony/filesystem": "^6.0|^7.0" }, - "time": "2024-08-13T14:27:37+00:00", + "time": "2024-10-01T08:30:56+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -6406,7 +6403,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.11" + "source": "https://github.com/symfony/finder/tree/v6.4.13" }, "funding": [ { @@ -6426,17 +6423,17 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.8", - "version_normalized": "6.4.8.0", + "version": "v6.4.15", + "version_normalized": "6.4.15.0", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "27de8cc95e11db7a50b027e71caaab9024545947" + "reference": "9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/27de8cc95e11db7a50b027e71caaab9024545947", - "reference": "27de8cc95e11db7a50b027e71caaab9024545947", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6", + "reference": "9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6", "shasum": "" }, "require": { @@ -6446,19 +6443,19 @@ "symfony/polyfill-php83": "^1.27" }, "conflict": { - "symfony/cache": "<6.3" + "symfony/cache": "<6.4.12|>=7.0,<7.1.5" }, "require-dev": { "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1|^2.0", - "symfony/cache": "^6.3|^7.0", + "symfony/cache": "^6.4.12|^7.1.5", "symfony/dependency-injection": "^5.4|^6.0|^7.0", "symfony/expression-language": "^5.4|^6.0|^7.0", "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0", "symfony/mime": "^5.4|^6.0|^7.0", "symfony/rate-limiter": "^5.4|^6.0|^7.0" }, - "time": "2024-05-31T14:49:08+00:00", + "time": "2024-11-08T16:09:24+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -6486,7 +6483,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.8" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.15" }, "funding": [ { @@ -6506,17 +6503,17 @@ }, { "name": "symfony/mime", - "version": "v6.4.9", - "version_normalized": "6.4.9.0", + "version": "v6.4.13", + "version_normalized": "6.4.13.0", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "7d048964877324debdcb4e0549becfa064a20d43" + "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/7d048964877324debdcb4e0549becfa064a20d43", - "reference": "7d048964877324debdcb4e0549becfa064a20d43", + "url": "https://api.github.com/repos/symfony/mime/zipball/1de1cf14d99b12c7ebbb850491ec6ae3ed468855", + "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855", "shasum": "" }, "require": { @@ -6542,7 +6539,7 @@ "symfony/property-info": "^5.4|^6.0|^7.0", "symfony/serializer": "^6.4.3|^7.0.3" }, - "time": "2024-06-28T09:49:33+00:00", + "time": "2024-10-25T15:07:50+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -6574,7 +6571,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.9" + "source": "https://github.com/symfony/mime/tree/v6.4.13" }, "funding": [ { @@ -6594,21 +6591,21 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.30.0", - "version_normalized": "1.30.0.0", + "version": "v1.31.0", + "version_normalized": "1.31.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "0424dff1c58f028c451efff2045f5d92410bd540" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", - "reference": "0424dff1c58f028c451efff2045f5d92410bd540", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -6616,7 +6613,7 @@ "suggest": { "ext-ctype": "For best performance" }, - "time": "2024-05-31T15:07:36+00:00", + "time": "2024-09-09T11:45:10+00:00", "type": "library", "extra": { "thanks": { @@ -6656,7 +6653,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -6676,26 +6673,26 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.30.0", - "version_normalized": "1.30.0.0", + "version": "v1.31.0", + "version_normalized": "1.31.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a" + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a", - "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" }, - "time": "2024-05-31T15:07:36+00:00", + "time": "2024-09-09T11:45:10+00:00", "type": "library", "extra": { "thanks": { @@ -6737,7 +6734,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" }, "funding": [ { @@ -6757,28 +6754,27 @@ }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.30.0", - "version_normalized": "1.30.0.0", + "version": "v1.31.0", + "version_normalized": "1.31.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c" + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", - "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773", + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" + "php": ">=7.2", + "symfony/polyfill-intl-normalizer": "^1.10" }, "suggest": { "ext-intl": "For best performance" }, - "time": "2024-05-31T15:07:36+00:00", + "time": "2024-09-09T11:45:10+00:00", "type": "library", "extra": { "thanks": { @@ -6824,7 +6820,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0" }, "funding": [ { @@ -6844,26 +6840,26 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.30.0", - "version_normalized": "1.30.0.0", + "version": "v1.31.0", + "version_normalized": "1.31.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb", - "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" }, - "time": "2024-05-31T15:07:36+00:00", + "time": "2024-09-09T11:45:10+00:00", "type": "library", "extra": { "thanks": { @@ -6908,7 +6904,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -6928,21 +6924,21 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.30.0", - "version_normalized": "1.30.0.0", + "version": "v1.31.0", + "version_normalized": "1.31.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -6950,7 +6946,7 @@ "suggest": { "ext-mbstring": "For best performance" }, - "time": "2024-06-19T12:30:46+00:00", + "time": "2024-09-09T11:45:10+00:00", "type": "library", "extra": { "thanks": { @@ -6991,7 +6987,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -7009,101 +7005,25 @@ ], "install-path": "../symfony/polyfill-mbstring" }, - { - "name": "symfony/polyfill-php72", - "version": "v1.30.0", - "version_normalized": "1.30.0.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "10112722600777e02d2745716b70c5db4ca70442" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442", - "reference": "10112722600777e02d2745716b70c5db4ca70442", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "time": "2024-06-19T12:30:46+00:00", - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "installation-source": "dist", - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.30.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "install-path": "../symfony/polyfill-php72" - }, { "name": "symfony/polyfill-php80", - "version": "v1.30.0", - "version_normalized": "1.30.0.0", + "version": "v1.31.0", + "version_normalized": "1.31.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, - "time": "2024-05-31T15:07:36+00:00", + "time": "2024-09-09T11:45:10+00:00", "type": "library", "extra": { "thanks": { @@ -7150,7 +7070,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -7170,23 +7090,23 @@ }, { "name": "symfony/polyfill-php83", - "version": "v1.30.0", - "version_normalized": "1.30.0.0", + "version": "v1.31.0", + "version_normalized": "1.31.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php83.git", - "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9" + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9", - "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491", + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, - "time": "2024-06-19T12:35:24+00:00", + "time": "2024-09-09T11:45:10+00:00", "type": "library", "extra": { "thanks": { @@ -7229,7 +7149,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php83/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0" }, "funding": [ { @@ -7249,23 +7169,23 @@ }, { "name": "symfony/process", - "version": "v6.4.8", - "version_normalized": "6.4.8.0", + "version": "v6.4.15", + "version_normalized": "6.4.15.0", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5" + "reference": "3cb242f059c14ae08591c5c4087d1fe443564392" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5", - "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5", + "url": "https://api.github.com/repos/symfony/process/zipball/3cb242f059c14ae08591c5c4087d1fe443564392", + "reference": "3cb242f059c14ae08591c5c4087d1fe443564392", "shasum": "" }, "require": { "php": ">=8.1" }, - "time": "2024-05-31T14:49:08+00:00", + "time": "2024-11-06T14:19:14+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -7293,7 +7213,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.8" + "source": "https://github.com/symfony/process/tree/v6.4.15" }, "funding": [ { @@ -7399,17 +7319,17 @@ }, { "name": "symfony/string", - "version": "v6.4.11", - "version_normalized": "6.4.11.0", + "version": "v6.4.15", + "version_normalized": "6.4.15.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "5bc3eb632cf9c8dbfd6529d89be9950d1518883b" + "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/5bc3eb632cf9c8dbfd6529d89be9950d1518883b", - "reference": "5bc3eb632cf9c8dbfd6529d89be9950d1518883b", + "url": "https://api.github.com/repos/symfony/string/zipball/73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", + "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", "shasum": "" }, "require": { @@ -7429,7 +7349,7 @@ "symfony/translation-contracts": "^2.5|^3.0", "symfony/var-exporter": "^5.4|^6.0|^7.0" }, - "time": "2024-08-12T09:55:28+00:00", + "time": "2024-11-13T13:31:12+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -7468,7 +7388,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.11" + "source": "https://github.com/symfony/string/tree/v6.4.15" }, "funding": [ { @@ -7488,17 +7408,17 @@ }, { "name": "symfony/translation", - "version": "v6.4.8", - "version_normalized": "6.4.8.0", + "version": "v6.4.13", + "version_normalized": "6.4.13.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "a002933b13989fc4bd0b58e04bf7eec5210e438a" + "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/a002933b13989fc4bd0b58e04bf7eec5210e438a", - "reference": "a002933b13989fc4bd0b58e04bf7eec5210e438a", + "url": "https://api.github.com/repos/symfony/translation/zipball/bee9bfabfa8b4045a66bf82520e492cddbaffa66", + "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66", "shasum": "" }, "require": { @@ -7535,7 +7455,7 @@ "symfony/service-contracts": "^2.5|^3", "symfony/yaml": "^5.4|^6.0|^7.0" }, - "time": "2024-05-31T14:49:08+00:00", + "time": "2024-09-27T18:14:25+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -7566,7 +7486,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.4.8" + "source": "https://github.com/symfony/translation/tree/v6.4.13" }, "funding": [ { @@ -7667,17 +7587,17 @@ }, { "name": "symfony/var-dumper", - "version": "v6.4.6", - "version_normalized": "6.4.6.0", + "version": "v6.4.15", + "version_normalized": "6.4.15.0", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4" + "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/95bd2706a97fb875185b51ecaa6112ec184233d4", - "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80", + "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80", "shasum": "" }, "require": { @@ -7697,7 +7617,7 @@ "symfony/uid": "^5.4|^6.0|^7.0", "twig/twig": "^2.13|^3.0.4" }, - "time": "2024-03-19T11:56:30+00:00", + "time": "2024-11-08T15:28:48+00:00", "bin": [ "Resources/bin/var-dump-server" ], @@ -7735,7 +7655,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.6" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.15" }, "funding": [ { @@ -7870,24 +7790,24 @@ }, { "name": "vlucas/phpdotenv", - "version": "v5.6.0", - "version_normalized": "5.6.0.0", + "version": "v5.6.1", + "version_normalized": "5.6.1.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4" + "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", - "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2", + "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2", "shasum": "" }, "require": { "ext-pcre": "*", - "graham-campbell/result-type": "^1.1.2", + "graham-campbell/result-type": "^1.1.3", "php": "^7.2.5 || ^8.0", - "phpoption/phpoption": "^1.9.2", + "phpoption/phpoption": "^1.9.3", "symfony/polyfill-ctype": "^1.24", "symfony/polyfill-mbstring": "^1.24", "symfony/polyfill-php80": "^1.24" @@ -7900,12 +7820,12 @@ "suggest": { "ext-filter": "Required to use the boolean validator." }, - "time": "2023-11-12T22:43:29+00:00", + "time": "2024-07-20T21:52:34+00:00", "type": "library", "extra": { "bamarni-bin": { "bin-links": true, - "forward-command": true + "forward-command": false }, "branch-alias": { "dev-master": "5.6-dev" @@ -7941,7 +7861,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.1" }, "funding": [ { @@ -7957,17 +7877,17 @@ }, { "name": "voku/portable-ascii", - "version": "2.0.1", - "version_normalized": "2.0.1.0", + "version": "2.0.3", + "version_normalized": "2.0.3.0", "source": { "type": "git", "url": "https://github.com/voku/portable-ascii.git", - "reference": "b56450eed252f6801410d810c8e1727224ae0743" + "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743", - "reference": "b56450eed252f6801410d810c8e1727224ae0743", + "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b1d923f88091c6bf09699efcd7c8a1b1bfd7351d", + "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d", "shasum": "" }, "require": { @@ -7979,7 +7899,7 @@ "suggest": { "ext-intl": "Use Intl for transliterator_transliterate() support" }, - "time": "2022-03-08T17:03:00+00:00", + "time": "2024-11-21T01:49:47+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -7994,7 +7914,7 @@ "authors": [ { "name": "Lars Moelleken", - "homepage": "http://www.moelleken.org/" + "homepage": "https://www.moelleken.org/" } ], "description": "Portable ASCII library - performance optimized (ascii) string functions for php.", @@ -8006,7 +7926,7 @@ ], "support": { "issues": "https://github.com/voku/portable-ascii/issues", - "source": "https://github.com/voku/portable-ascii/tree/2.0.1" + "source": "https://github.com/voku/portable-ascii/tree/2.0.3" }, "funding": [ { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 7a37e271..bd27440a 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,9 +1,9 @@ array( 'name' => 'abenevaut/phpunit-slicer', - 'pretty_version' => '1.0.0+no-version-set', - 'version' => '1.0.0.0', - 'reference' => null, + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'reference' => '4526d243f2f0433e333446cb726ed09756c616ab', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -20,9 +20,9 @@ 'dev_requirement' => false, ), 'abenevaut/phpunit-slicer' => array( - 'pretty_version' => '1.0.0+no-version-set', - 'version' => '1.0.0.0', - 'reference' => null, + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'reference' => '4526d243f2f0433e333446cb726ed09756c616ab', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -38,9 +38,9 @@ 'dev_requirement' => true, ), 'brick/math' => array( - 'pretty_version' => '0.11.0', - 'version' => '0.11.0.0', - 'reference' => '0ad82ce168c82ba30d1c01ec86116ab52f589478', + 'pretty_version' => '0.12.1', + 'version' => '0.12.1.0', + 'reference' => 'f510c0a40911935b77b86859eb5223d58d660df1', 'type' => 'library', 'install_path' => __DIR__ . '/../brick/math', 'aliases' => array(), @@ -95,9 +95,9 @@ 'dev_requirement' => false, ), 'dragonmantank/cron-expression' => array( - 'pretty_version' => 'v3.3.3', - 'version' => '3.3.3.0', - 'reference' => 'adfb1f505deb6384dc8b39804c5065dd3c8c8c0a', + 'pretty_version' => 'v3.4.0', + 'version' => '3.4.0.0', + 'reference' => '8c784d071debd117328803d86b2097615b457500', 'type' => 'library', 'install_path' => __DIR__ . '/../dragonmantank/cron-expression', 'aliases' => array(), @@ -113,9 +113,9 @@ 'dev_requirement' => false, ), 'fakerphp/faker' => array( - 'pretty_version' => 'v1.23.1', - 'version' => '1.23.1.0', - 'reference' => 'bfb4fe148adbf78eff521199619b93a52ae3554b', + 'pretty_version' => 'v1.24.1', + 'version' => '1.24.1.0', + 'reference' => 'e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5', 'type' => 'library', 'install_path' => __DIR__ . '/../fakerphp/faker', 'aliases' => array(), @@ -131,18 +131,18 @@ 'dev_requirement' => true, ), 'filp/whoops' => array( - 'pretty_version' => '2.15.4', - 'version' => '2.15.4.0', - 'reference' => 'a139776fa3f5985a50b509f2a02ff0f709d2a546', + 'pretty_version' => '2.16.0', + 'version' => '2.16.0.0', + 'reference' => 'befcdc0e5dce67252aa6322d82424be928214fa2', 'type' => 'library', 'install_path' => __DIR__ . '/../filp/whoops', 'aliases' => array(), 'dev_requirement' => true, ), 'graham-campbell/result-type' => array( - 'pretty_version' => 'v1.1.2', - 'version' => '1.1.2.0', - 'reference' => 'fbd48bce38f73f8a4ec8583362e732e4095e5862', + 'pretty_version' => 'v1.1.3', + 'version' => '1.1.3.0', + 'reference' => '3ba905c11371512af9d9bdd27d99b782216b6945', 'type' => 'library', 'install_path' => __DIR__ . '/../graham-campbell/result-type', 'aliases' => array(), @@ -158,26 +158,26 @@ 'dev_requirement' => true, ), 'illuminate/bus' => array( - 'pretty_version' => 'v10.48.4', - 'version' => '10.48.4.0', - 'reference' => '33993b8f54e91b03fb5000e55693e146e7370763', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', + 'reference' => '42cf510d0dcf20a1a27580290e283b7df2621bc7', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/bus', 'aliases' => array(), 'dev_requirement' => true, ), 'illuminate/cache' => array( - 'pretty_version' => 'v10.48.4', - 'version' => '10.48.4.0', - 'reference' => '017403b7ff5926fbf80c21645106f72ce1023e6f', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', + 'reference' => '6020bc5f40b62cc680be3eb57e980e5cb26884ff', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/cache', 'aliases' => array(), 'dev_requirement' => true, ), 'illuminate/collections' => array( - 'pretty_version' => 'v10.48.14', - 'version' => '10.48.14.0', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', 'reference' => '37c863cffb345869dd134eff8e646bc82a19cc96', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/collections', @@ -185,8 +185,8 @@ 'dev_requirement' => false, ), 'illuminate/conditionable' => array( - 'pretty_version' => 'v10.48.14', - 'version' => '10.48.14.0', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', 'reference' => 'd0958e4741fc9d6f516a552060fd1b829a85e009', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/conditionable', @@ -194,8 +194,8 @@ 'dev_requirement' => false, ), 'illuminate/config' => array( - 'pretty_version' => 'v10.48.4', - 'version' => '10.48.4.0', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', 'reference' => 'd5e83ceff5c4d5607b1b81763eb4c436911c35da', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/config', @@ -203,17 +203,17 @@ 'dev_requirement' => true, ), 'illuminate/console' => array( - 'pretty_version' => 'v10.48.4', - 'version' => '10.48.4.0', - 'reference' => 'f6f9b944ef0f59dd331350bdd1e720c850946bb1', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', + 'reference' => 'd10e2fb5331b82b2e58a9be05ea798e5a0899890', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/console', 'aliases' => array(), 'dev_requirement' => true, ), 'illuminate/container' => array( - 'pretty_version' => 'v10.48.14', - 'version' => '10.48.14.0', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', 'reference' => 'ddc26273085fad3c471b2602ad820e0097ff7939', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/container', @@ -221,8 +221,8 @@ 'dev_requirement' => false, ), 'illuminate/contracts' => array( - 'pretty_version' => 'v10.48.14', - 'version' => '10.48.14.0', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', 'reference' => '8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/contracts', @@ -230,8 +230,8 @@ 'dev_requirement' => false, ), 'illuminate/events' => array( - 'pretty_version' => 'v10.48.4', - 'version' => '10.48.4.0', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', 'reference' => 'a931bfa88edc6ac52c9abbfd7b769343d321d3eb', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/events', @@ -239,8 +239,8 @@ 'dev_requirement' => true, ), 'illuminate/filesystem' => array( - 'pretty_version' => 'v10.48.14', - 'version' => '10.48.14.0', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', 'reference' => '592fb581a52fba43bf78c2e4b22db540c9f9f149', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/filesystem', @@ -248,8 +248,8 @@ 'dev_requirement' => false, ), 'illuminate/macroable' => array( - 'pretty_version' => 'v10.48.14', - 'version' => '10.48.14.0', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', 'reference' => 'dff667a46ac37b634dcf68909d9d41e94dc97c27', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/macroable', @@ -257,8 +257,8 @@ 'dev_requirement' => false, ), 'illuminate/pipeline' => array( - 'pretty_version' => 'v10.48.4', - 'version' => '10.48.4.0', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', 'reference' => 'f802187e917a171332cc90f8c1a102939c57405d', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/pipeline', @@ -266,8 +266,8 @@ 'dev_requirement' => true, ), 'illuminate/process' => array( - 'pretty_version' => 'v10.48.4', - 'version' => '10.48.4.0', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', 'reference' => '1568d348daaa9d55637c616edb8889a083949b4a', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/process', @@ -275,26 +275,26 @@ 'dev_requirement' => true, ), 'illuminate/support' => array( - 'pretty_version' => 'v10.48.14', - 'version' => '10.48.14.0', - 'reference' => '263f389d81488c237846b69469f91387ca2729f3', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', + 'reference' => '56c6d9895605b019e3debb9440454596ef99312a', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/support', 'aliases' => array(), 'dev_requirement' => false, ), 'illuminate/testing' => array( - 'pretty_version' => 'v10.48.4', - 'version' => '10.48.4.0', - 'reference' => '5e5f0d8a30cae66f8383098bee623cc75b60af8c', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', + 'reference' => 'ff641ff4813040c2a5abfcbe8e38590106608cd7', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/testing', 'aliases' => array(), 'dev_requirement' => true, ), 'illuminate/translation' => array( - 'pretty_version' => 'v10.48.14', - 'version' => '10.48.14.0', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', 'reference' => '4da8ed16d6ea6008acf43c7375a9b2073fb10e0b', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/translation', @@ -302,8 +302,8 @@ 'dev_requirement' => false, ), 'illuminate/validation' => array( - 'pretty_version' => 'v10.48.14', - 'version' => '10.48.14.0', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', 'reference' => 'c9be8b183279f0175233e0758285a297431045ac', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/validation', @@ -311,27 +311,27 @@ 'dev_requirement' => false, ), 'illuminate/view' => array( - 'pretty_version' => 'v10.48.4', - 'version' => '10.48.4.0', - 'reference' => '504d55e0f2d90c75588627e6a77a4d1228cf1a02', + 'pretty_version' => 'v10.48.24', + 'version' => '10.48.24.0', + 'reference' => '76a1405bc3e1d0a19e8d2db3bd5b991ed10b31f7', 'type' => 'library', 'install_path' => __DIR__ . '/../illuminate/view', 'aliases' => array(), 'dev_requirement' => true, ), 'jean85/pretty-package-versions' => array( - 'pretty_version' => '2.0.6', - 'version' => '2.0.6.0', - 'reference' => 'f9fdd29ad8e6d024f52678b570e5593759b550b4', + 'pretty_version' => '2.1.0', + 'version' => '2.1.0.0', + 'reference' => '3c4e5f62ba8d7de1734312e4fff32f67a8daaf10', 'type' => 'library', 'install_path' => __DIR__ . '/../jean85/pretty-package-versions', 'aliases' => array(), 'dev_requirement' => true, ), 'jolicode/jolinotif' => array( - 'pretty_version' => 'v2.6.0', - 'version' => '2.6.0.0', - 'reference' => '6a886aa19aec7cc283125631f31f93f71729bf40', + 'pretty_version' => 'v2.7.3', + 'version' => '2.7.3.0', + 'reference' => '3c3e1c410b107dd2603b732508fd95830f0e0196', 'type' => 'library', 'install_path' => __DIR__ . '/../jolicode/jolinotif', 'aliases' => array(), @@ -353,54 +353,54 @@ ), ), 'laravel-zero/foundation' => array( - 'pretty_version' => 'v10.48.4', - 'version' => '10.48.4.0', - 'reference' => '0b5f09875ae22ede06b77d66432f470c5aa32b73', + 'pretty_version' => 'v10.48.8', + 'version' => '10.48.8.0', + 'reference' => '5203cc84ace9c74e26735888f4c46396450b4b4f', 'type' => 'library', 'install_path' => __DIR__ . '/../laravel-zero/foundation', 'aliases' => array(), 'dev_requirement' => true, ), 'laravel-zero/framework' => array( - 'pretty_version' => 'v10.3.0', - 'version' => '10.3.0.0', - 'reference' => '517dddb90948f7c894440f54a726249e384f70e1', + 'pretty_version' => 'v10.4.0', + 'version' => '10.4.0.0', + 'reference' => '1c44f0cdb936b447d5556e0a23733bfc17cdd997', 'type' => 'library', 'install_path' => __DIR__ . '/../laravel-zero/framework', 'aliases' => array(), 'dev_requirement' => true, ), 'laravel/prompts' => array( - 'pretty_version' => 'v0.1.17', - 'version' => '0.1.17.0', - 'reference' => '8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5', + 'pretty_version' => 'v0.1.25', + 'version' => '0.1.25.0', + 'reference' => '7b4029a84c37cb2725fc7f011586e2997040bc95', 'type' => 'library', 'install_path' => __DIR__ . '/../laravel/prompts', 'aliases' => array(), 'dev_requirement' => true, ), 'league/flysystem' => array( - 'pretty_version' => '3.26.0', - 'version' => '3.26.0.0', - 'reference' => '072735c56cc0da00e10716dd90d5a7f7b40b36be', + 'pretty_version' => '3.29.1', + 'version' => '3.29.1.0', + 'reference' => 'edc1bb7c86fab0776c3287dbd19b5fa278347319', 'type' => 'library', 'install_path' => __DIR__ . '/../league/flysystem', 'aliases' => array(), 'dev_requirement' => true, ), 'league/flysystem-local' => array( - 'pretty_version' => '3.25.1', - 'version' => '3.25.1.0', - 'reference' => '61a6a90d6e999e4ddd9ce5adb356de0939060b92', + 'pretty_version' => '3.29.0', + 'version' => '3.29.0.0', + 'reference' => 'e0e8d52ce4b2ed154148453d321e97c8e931bd27', 'type' => 'library', 'install_path' => __DIR__ . '/../league/flysystem-local', 'aliases' => array(), 'dev_requirement' => true, ), 'league/mime-type-detection' => array( - 'pretty_version' => '1.15.0', - 'version' => '1.15.0.0', - 'reference' => 'ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301', + 'pretty_version' => '1.16.0', + 'version' => '1.16.0.0', + 'reference' => '2d6702ff215bf922936ccc1ad31007edc76451b9', 'type' => 'library', 'install_path' => __DIR__ . '/../league/mime-type-detection', 'aliases' => array(), @@ -422,9 +422,9 @@ ), ), 'myclabs/deep-copy' => array( - 'pretty_version' => '1.12.0', - 'version' => '1.12.0.0', - 'reference' => '3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c', + 'pretty_version' => '1.12.1', + 'version' => '1.12.1.0', + 'reference' => '123267b2c49fbf30d78a7b2d333f6be754b94845', 'type' => 'library', 'install_path' => __DIR__ . '/../myclabs/deep-copy', 'aliases' => array(), @@ -440,63 +440,63 @@ 'dev_requirement' => false, ), 'nikic/php-parser' => array( - 'pretty_version' => 'v5.1.0', - 'version' => '5.1.0.0', - 'reference' => '683130c2ff8c2739f4822ff7ac5c873ec529abd1', + 'pretty_version' => 'v5.3.1', + 'version' => '5.3.1.0', + 'reference' => '8eea230464783aa9671db8eea6f8c6ac5285794b', 'type' => 'library', 'install_path' => __DIR__ . '/../nikic/php-parser', 'aliases' => array(), 'dev_requirement' => true, ), 'nunomaduro/collision' => array( - 'pretty_version' => 'v7.10.0', - 'version' => '7.10.0.0', - 'reference' => '49ec67fa7b002712da8526678abd651c09f375b2', + 'pretty_version' => 'v7.11.0', + 'version' => '7.11.0.0', + 'reference' => '994ea93df5d4132f69d3f1bd74730509df6e8a05', 'type' => 'library', 'install_path' => __DIR__ . '/../nunomaduro/collision', 'aliases' => array(), 'dev_requirement' => true, ), 'nunomaduro/laravel-console-summary' => array( - 'pretty_version' => 'v1.11.0', - 'version' => '1.11.0.0', - 'reference' => '14834db07c9900f8228098d7c345dece45c4c3d9', + 'pretty_version' => 'v1.11.1', + 'version' => '1.11.1.0', + 'reference' => '2e3cf7b261697eed3fdf87a66be4470d32b405bd', 'type' => 'library', 'install_path' => __DIR__ . '/../nunomaduro/laravel-console-summary', 'aliases' => array(), 'dev_requirement' => true, ), 'nunomaduro/laravel-console-task' => array( - 'pretty_version' => 'v1.8.0', - 'version' => '1.8.0.0', - 'reference' => 'e49e7be261a7b7329c4538777489b355fb234bde', + 'pretty_version' => 'v1.9.0', + 'version' => '1.9.0.0', + 'reference' => '02b2a550318fda3355e45763885e30b4e650bc1b', 'type' => 'library', 'install_path' => __DIR__ . '/../nunomaduro/laravel-console-task', 'aliases' => array(), 'dev_requirement' => true, ), 'nunomaduro/laravel-desktop-notifier' => array( - 'pretty_version' => 'v2.8.0', - 'version' => '2.8.0.0', - 'reference' => 'd9935c73670f368032d84092a554417d71ee2233', + 'pretty_version' => 'v2.8.1', + 'version' => '2.8.1.0', + 'reference' => '9937f1f8898077ad6d058c03ecee39d6eae7eb39', 'type' => 'library', 'install_path' => __DIR__ . '/../nunomaduro/laravel-desktop-notifier', 'aliases' => array(), 'dev_requirement' => true, ), 'nunomaduro/termwind' => array( - 'pretty_version' => 'v1.15.1', - 'version' => '1.15.1.0', - 'reference' => '8ab0b32c8caa4a2e09700ea32925441385e4a5dc', + 'pretty_version' => 'v1.17.0', + 'version' => '1.17.0.0', + 'reference' => '5369ef84d8142c1d87e4ec278711d4ece3cbf301', 'type' => 'library', 'install_path' => __DIR__ . '/../nunomaduro/termwind', 'aliases' => array(), 'dev_requirement' => false, ), 'pestphp/pest' => array( - 'pretty_version' => 'v2.35.1', - 'version' => '2.35.1.0', - 'reference' => 'b13acb630df52c06123588d321823c31fc685545', + 'pretty_version' => 'v2.36.0', + 'version' => '2.36.0.0', + 'reference' => 'f8c88bd14dc1772bfaf02169afb601ecdf2724cd', 'type' => 'library', 'install_path' => __DIR__ . '/../pestphp/pest', 'aliases' => array(), @@ -557,36 +557,36 @@ 'dev_requirement' => true, ), 'phpdocumentor/reflection-docblock' => array( - 'pretty_version' => '5.4.1', - 'version' => '5.4.1.0', - 'reference' => '9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c', + 'pretty_version' => '5.6.0', + 'version' => '5.6.0.0', + 'reference' => 'f3558a4c23426d12bffeaab463f8a8d8b681193c', 'type' => 'library', 'install_path' => __DIR__ . '/../phpdocumentor/reflection-docblock', 'aliases' => array(), 'dev_requirement' => true, ), 'phpdocumentor/type-resolver' => array( - 'pretty_version' => '1.8.2', - 'version' => '1.8.2.0', - 'reference' => '153ae662783729388a584b4361f2545e4d841e3c', + 'pretty_version' => '1.10.0', + 'version' => '1.10.0.0', + 'reference' => '679e3ce485b99e84c775d28e2e96fade9a7fb50a', 'type' => 'library', 'install_path' => __DIR__ . '/../phpdocumentor/type-resolver', 'aliases' => array(), 'dev_requirement' => true, ), 'phpoption/phpoption' => array( - 'pretty_version' => '1.9.2', - 'version' => '1.9.2.0', - 'reference' => '80735db690fe4fc5c76dfa7f9b770634285fa820', + 'pretty_version' => '1.9.3', + 'version' => '1.9.3.0', + 'reference' => 'e3fac8b24f56113f7cb96af14958c0dd16330f54', 'type' => 'library', 'install_path' => __DIR__ . '/../phpoption/phpoption', 'aliases' => array(), 'dev_requirement' => true, ), 'phpstan/phpdoc-parser' => array( - 'pretty_version' => '1.30.0', - 'version' => '1.30.0.0', - 'reference' => '5ceb0e384997db59f38774bf79c2a6134252c08f', + 'pretty_version' => '2.0.0', + 'version' => '2.0.0.0', + 'reference' => 'c00d78fb6b29658347f9d37ebe104bffadf36299', 'type' => 'library', 'install_path' => __DIR__ . '/../phpstan/phpdoc-parser', 'aliases' => array(), @@ -638,9 +638,9 @@ 'dev_requirement' => true, ), 'phpunit/phpunit' => array( - 'pretty_version' => '10.5.17', - 'version' => '10.5.17.0', - 'reference' => 'c1f736a473d21957ead7e94fcc029f571895abf5', + 'pretty_version' => '10.5.36', + 'version' => '10.5.36.0', + 'reference' => 'aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870', 'type' => 'library', 'install_path' => __DIR__ . '/../phpunit/phpunit', 'aliases' => array(), @@ -692,9 +692,9 @@ ), ), 'psr/log' => array( - 'pretty_version' => '3.0.1', - 'version' => '3.0.1.0', - 'reference' => '79dff0b268932c640297f5208d6298f71855c03e', + 'pretty_version' => '3.0.2', + 'version' => '3.0.2.0', + 'reference' => 'f16e1d5863e37f8d8c2a01719f5b34baa2b714d3', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/log', 'aliases' => array(), @@ -731,9 +731,9 @@ 'dev_requirement' => true, ), 'ramsey/uuid' => array( - 'pretty_version' => '4.7.5', - 'version' => '4.7.5.0', - 'reference' => '5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e', + 'pretty_version' => '4.7.6', + 'version' => '4.7.6.0', + 'reference' => '91039bc1faa45ba123c4328958e620d382ec7088', 'type' => 'library', 'install_path' => __DIR__ . '/../ramsey/uuid', 'aliases' => array(), @@ -742,7 +742,7 @@ 'rhumsaa/uuid' => array( 'dev_requirement' => true, 'replaced' => array( - 0 => '4.7.5', + 0 => '4.7.6', ), ), 'sebastian/cli-parser' => array( @@ -773,9 +773,9 @@ 'dev_requirement' => true, ), 'sebastian/comparator' => array( - 'pretty_version' => '5.0.2', - 'version' => '5.0.2.0', - 'reference' => '2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53', + 'pretty_version' => '5.0.3', + 'version' => '5.0.3.0', + 'reference' => 'a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e', 'type' => 'library', 'install_path' => __DIR__ . '/../sebastian/comparator', 'aliases' => array(), @@ -881,9 +881,9 @@ 'dev_requirement' => true, ), 'symfony/console' => array( - 'pretty_version' => 'v6.4.11', - 'version' => '6.4.11.0', - 'reference' => '42686880adaacdad1835ee8fc2a9ec5b7bd63998', + 'pretty_version' => 'v6.4.15', + 'version' => '6.4.15.0', + 'reference' => 'f1fc6f47283e27336e7cebb9e8946c8de7bff9bd', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/console', 'aliases' => array(), @@ -899,18 +899,18 @@ 'dev_requirement' => false, ), 'symfony/error-handler' => array( - 'pretty_version' => 'v6.4.6', - 'version' => '6.4.6.0', - 'reference' => '64db1c1802e3a4557e37ba33031ac39f452ac5d4', + 'pretty_version' => 'v6.4.14', + 'version' => '6.4.14.0', + 'reference' => '9e024324511eeb00983ee76b9aedc3e6ecd993d9', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/error-handler', 'aliases' => array(), 'dev_requirement' => true, ), 'symfony/event-dispatcher' => array( - 'pretty_version' => 'v6.4.3', - 'version' => '6.4.3.0', - 'reference' => 'ae9d3a6f3003a6caf56acd7466d8d52378d44fef', + 'pretty_version' => 'v6.4.13', + 'version' => '6.4.13.0', + 'reference' => '0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/event-dispatcher', 'aliases' => array(), @@ -932,108 +932,99 @@ ), ), 'symfony/finder' => array( - 'pretty_version' => 'v6.4.11', - 'version' => '6.4.11.0', - 'reference' => 'd7eb6daf8cd7e9ac4976e9576b32042ef7253453', + 'pretty_version' => 'v6.4.13', + 'version' => '6.4.13.0', + 'reference' => 'daea9eca0b08d0ed1dc9ab702a46128fd1be4958', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/finder', 'aliases' => array(), 'dev_requirement' => false, ), 'symfony/http-foundation' => array( - 'pretty_version' => 'v6.4.8', - 'version' => '6.4.8.0', - 'reference' => '27de8cc95e11db7a50b027e71caaab9024545947', + 'pretty_version' => 'v6.4.15', + 'version' => '6.4.15.0', + 'reference' => '9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/http-foundation', 'aliases' => array(), 'dev_requirement' => false, ), 'symfony/mime' => array( - 'pretty_version' => 'v6.4.9', - 'version' => '6.4.9.0', - 'reference' => '7d048964877324debdcb4e0549becfa064a20d43', + 'pretty_version' => 'v6.4.13', + 'version' => '6.4.13.0', + 'reference' => '1de1cf14d99b12c7ebbb850491ec6ae3ed468855', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/mime', 'aliases' => array(), 'dev_requirement' => false, ), 'symfony/polyfill-ctype' => array( - 'pretty_version' => 'v1.30.0', - 'version' => '1.30.0.0', - 'reference' => '0424dff1c58f028c451efff2045f5d92410bd540', + 'pretty_version' => 'v1.31.0', + 'version' => '1.31.0.0', + 'reference' => 'a3cc8b044a6ea513310cbd48ef7333b384945638', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-ctype', 'aliases' => array(), 'dev_requirement' => false, ), 'symfony/polyfill-intl-grapheme' => array( - 'pretty_version' => 'v1.30.0', - 'version' => '1.30.0.0', - 'reference' => '64647a7c30b2283f5d49b874d84a18fc22054b7a', + 'pretty_version' => 'v1.31.0', + 'version' => '1.31.0.0', + 'reference' => 'b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-intl-grapheme', 'aliases' => array(), 'dev_requirement' => false, ), 'symfony/polyfill-intl-idn' => array( - 'pretty_version' => 'v1.30.0', - 'version' => '1.30.0.0', - 'reference' => 'a6e83bdeb3c84391d1dfe16f42e40727ce524a5c', + 'pretty_version' => 'v1.31.0', + 'version' => '1.31.0.0', + 'reference' => 'c36586dcf89a12315939e00ec9b4474adcb1d773', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-intl-idn', 'aliases' => array(), 'dev_requirement' => false, ), 'symfony/polyfill-intl-normalizer' => array( - 'pretty_version' => 'v1.30.0', - 'version' => '1.30.0.0', - 'reference' => 'a95281b0be0d9ab48050ebd988b967875cdb9fdb', + 'pretty_version' => 'v1.31.0', + 'version' => '1.31.0.0', + 'reference' => '3833d7255cc303546435cb650316bff708a1c75c', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer', 'aliases' => array(), 'dev_requirement' => false, ), 'symfony/polyfill-mbstring' => array( - 'pretty_version' => 'v1.30.0', - 'version' => '1.30.0.0', - 'reference' => 'fd22ab50000ef01661e2a31d850ebaa297f8e03c', + 'pretty_version' => 'v1.31.0', + 'version' => '1.31.0.0', + 'reference' => '85181ba99b2345b0ef10ce42ecac37612d9fd341', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-mbstring', 'aliases' => array(), 'dev_requirement' => false, ), - 'symfony/polyfill-php72' => array( - 'pretty_version' => 'v1.30.0', - 'version' => '1.30.0.0', - 'reference' => '10112722600777e02d2745716b70c5db4ca70442', - 'type' => 'library', - 'install_path' => __DIR__ . '/../symfony/polyfill-php72', - 'aliases' => array(), - 'dev_requirement' => false, - ), 'symfony/polyfill-php80' => array( - 'pretty_version' => 'v1.30.0', - 'version' => '1.30.0.0', - 'reference' => '77fa7995ac1b21ab60769b7323d600a991a90433', + 'pretty_version' => 'v1.31.0', + 'version' => '1.31.0.0', + 'reference' => '60328e362d4c2c802a54fcbf04f9d3fb892b4cf8', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-php80', 'aliases' => array(), 'dev_requirement' => false, ), 'symfony/polyfill-php83' => array( - 'pretty_version' => 'v1.30.0', - 'version' => '1.30.0.0', - 'reference' => 'dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9', + 'pretty_version' => 'v1.31.0', + 'version' => '1.31.0.0', + 'reference' => '2fb86d65e2d424369ad2905e83b236a8805ba491', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-php83', 'aliases' => array(), 'dev_requirement' => false, ), 'symfony/process' => array( - 'pretty_version' => 'v6.4.8', - 'version' => '6.4.8.0', - 'reference' => '8d92dd79149f29e89ee0f480254db595f6a6a2c5', + 'pretty_version' => 'v6.4.15', + 'version' => '6.4.15.0', + 'reference' => '3cb242f059c14ae08591c5c4087d1fe443564392', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/process', 'aliases' => array(), @@ -1049,18 +1040,18 @@ 'dev_requirement' => false, ), 'symfony/string' => array( - 'pretty_version' => 'v6.4.11', - 'version' => '6.4.11.0', - 'reference' => '5bc3eb632cf9c8dbfd6529d89be9950d1518883b', + 'pretty_version' => 'v6.4.15', + 'version' => '6.4.15.0', + 'reference' => '73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/string', 'aliases' => array(), 'dev_requirement' => false, ), 'symfony/translation' => array( - 'pretty_version' => 'v6.4.8', - 'version' => '6.4.8.0', - 'reference' => 'a002933b13989fc4bd0b58e04bf7eec5210e438a', + 'pretty_version' => 'v6.4.13', + 'version' => '6.4.13.0', + 'reference' => 'bee9bfabfa8b4045a66bf82520e492cddbaffa66', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/translation', 'aliases' => array(), @@ -1082,9 +1073,9 @@ ), ), 'symfony/var-dumper' => array( - 'pretty_version' => 'v6.4.6', - 'version' => '6.4.6.0', - 'reference' => '95bd2706a97fb875185b51ecaa6112ec184233d4', + 'pretty_version' => 'v6.4.15', + 'version' => '6.4.15.0', + 'reference' => '38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/var-dumper', 'aliases' => array(), @@ -1109,18 +1100,18 @@ 'dev_requirement' => true, ), 'vlucas/phpdotenv' => array( - 'pretty_version' => 'v5.6.0', - 'version' => '5.6.0.0', - 'reference' => '2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4', + 'pretty_version' => 'v5.6.1', + 'version' => '5.6.1.0', + 'reference' => 'a59a13791077fe3d44f90e7133eb68e7d22eaff2', 'type' => 'library', 'install_path' => __DIR__ . '/../vlucas/phpdotenv', 'aliases' => array(), 'dev_requirement' => true, ), 'voku/portable-ascii' => array( - 'pretty_version' => '2.0.1', - 'version' => '2.0.1.0', - 'reference' => 'b56450eed252f6801410d810c8e1727224ae0743', + 'pretty_version' => '2.0.3', + 'version' => '2.0.3.0', + 'reference' => 'b1d923f88091c6bf09699efcd7c8a1b1bfd7351d', 'type' => 'library', 'install_path' => __DIR__ . '/../voku/portable-ascii', 'aliases' => array(), diff --git a/vendor/dragonmantank/cron-expression/README.md b/vendor/dragonmantank/cron-expression/README.md index 494652c8..b9df3db5 100644 --- a/vendor/dragonmantank/cron-expression/README.md +++ b/vendor/dragonmantank/cron-expression/README.md @@ -1,7 +1,7 @@ PHP Cron Expression Parser ========================== -[![Latest Stable Version](https://poser.pugx.org/dragonmantank/cron-expression/v/stable.png)](https://packagist.org/packages/dragonmantank/cron-expression) [![Total Downloads](https://poser.pugx.org/dragonmantank/cron-expression/downloads.png)](https://packagist.org/packages/dragonmantank/cron-expression) [![Build Status](https://secure.travis-ci.org/dragonmantank/cron-expression.png)](http://travis-ci.org/dragonmantank/cron-expression) [![StyleCI](https://github.styleci.io/repos/103715337/shield?branch=master)](https://github.styleci.io/repos/103715337) +[![Latest Stable Version](https://poser.pugx.org/dragonmantank/cron-expression/v/stable.png)](https://packagist.org/packages/dragonmantank/cron-expression) [![Total Downloads](https://poser.pugx.org/dragonmantank/cron-expression/downloads.png)](https://packagist.org/packages/dragonmantank/cron-expression) [![Tests](https://github.com/dragonmantank/cron-expression/actions/workflows/tests.yml/badge.svg)](https://github.com/dragonmantank/cron-expression/actions/workflows/tests.yml) [![StyleCI](https://github.styleci.io/repos/103715337/shield?branch=master)](https://github.styleci.io/repos/103715337) The PHP cron expression parser can parse a CRON expression, determine if it is due to run, calculate the next run date of the expression, and calculate the previous @@ -55,23 +55,65 @@ CRON Expressions A CRON expression is a string representing the schedule for a particular command to execute. The parts of a CRON schedule are as follows: - * * * * * - - - - - - - | | | | | - | | | | | - | | | | +----- day of week (0 - 7) (Sunday=0 or 7) - | | | +---------- month (1 - 12) - | | +--------------- day of month (1 - 31) - | +-------------------- hour (0 - 23) - +------------------------- min (0 - 59) - -This library also supports a few macros: +``` +* * * * * +- - - - - +| | | | | +| | | | | +| | | | +----- day of week (0-7) (Sunday = 0 or 7) (or SUN-SAT) +| | | +--------- month (1-12) (or JAN-DEC) +| | +------------- day of month (1-31) +| +----------------- hour (0-23) ++--------------------- minute (0-59) +``` -* `@yearly`, `@annually` - Run once a year, midnight, Jan. 1 - `0 0 1 1 *` -* `@monthly` - Run once a month, midnight, first of month - `0 0 1 * *` -* `@weekly` - Run once a week, midnight on Sun - `0 0 * * 0` -* `@daily`, `@midnight` - Run once a day, midnight - `0 0 * * *` -* `@hourly` - Run once an hour, first minute - `0 * * * *` +Each part of expression can also use wildcard, lists, ranges and steps: + +- wildcard - match always + - `* * * * *` - At every minute. + - day of week and day of month also support `?`, an alias to `*` +- lists - match list of values, ranges and steps + - e.g. `15,30 * * * *` - At minute 15 and 30. +- ranges - match values in range + - e.g. `1-9 * * * *` - At every minute from 1 through 9. +- steps - match every nth value in range + - e.g. `*/5 * * * *` - At every 5th minute. + - e.g. `0-30/5 * * * *` - At every 5th minute from 0 through 30. +- combinations + - e.g. `0-14,30-44 * * * *` - At every minute from 0 through 14 and every minute from 30 through 44. + +You can also use macro instead of an expression: + +- `@yearly`, `@annually` - At 00:00 on 1st of January. (same as `0 0 1 1 *`) +- `@monthly` - At 00:00 on day-of-month 1. (same as `0 0 1 * *`) +- `@weekly` - At 00:00 on Sunday. (same as `0 0 * * 0`) +- `@daily`, `@midnight` - At 00:00. (same as `0 0 * * *`) +- `@hourly` - At minute 0. (same as `0 * * * *`) + +Day of month extra features: + +- nearest weekday - weekday (Monday-Friday) nearest to the given day + - e.g. `* * 15W * *` - At every minute on a weekday nearest to the 15th. + - If you were to specify `15W` as the value, the meaning is: "the nearest weekday to the 15th of the month" + So if the 15th is a Saturday, the trigger will fire on Friday the 14th. + If the 15th is a Sunday, the trigger will fire on Monday the 16th. + If the 15th is a Tuesday, then it will fire on Tuesday the 15th. + - However, if you specify `1W` as the value for day-of-month, + and the 1st is a Saturday, the trigger will fire on Monday the 3rd, + as it will not 'jump' over the boundary of a month's days. +- last day of the month + - e.g. `* * L * *` - At every minute on a last day-of-month. +- last weekday of the month + - e.g. `* * LW * *` - At every minute on a last weekday. + +Day of week extra features: + +- nth day + - e.g. `* * * * 7#4` - At every minute on 4th Sunday. + - 1-5 + - Every day of week repeats 4-5 times a month. To target the last one, use "last day" feature instead. +- last day + - e.g. `* * * * 7L` - At every minute on the last Sunday. Requirements ============ @@ -85,3 +127,5 @@ Projects that Use cron-expression * Part of the [Laravel Framework](https://github.com/laravel/framework/) * Available as a [Symfony Bundle - setono/cron-expression-bundle](https://github.com/Setono/CronExpressionBundle) * Framework agnostic, PHP-based job scheduler - [Crunz](https://github.com/crunzphp/crunz) +* Framework agnostic job scheduler - with locks, parallelism, per-second scheduling and more - [orisai/scheduler](https://github.com/orisai/scheduler) +* Explain expression in English (and other languages) with [orisai/cron-expression-explainer](https://github.com/orisai/cron-expression-explainer) diff --git a/vendor/dragonmantank/cron-expression/composer.json b/vendor/dragonmantank/cron-expression/composer.json index 657a5b47..fdb46ee4 100644 --- a/vendor/dragonmantank/cron-expression/composer.json +++ b/vendor/dragonmantank/cron-expression/composer.json @@ -18,7 +18,6 @@ "require-dev": { "phpstan/phpstan": "^1.0", "phpunit/phpunit": "^7.0|^8.0|^9.0", - "phpstan/phpstan-webmozart-assert": "^1.0", "phpstan/extension-installer": "^1.0" }, "autoload": { @@ -38,6 +37,11 @@ "phpstan": "./vendor/bin/phpstan analyze", "test": "phpunit" }, + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, "config": { "allow-plugins": { "ocramius/package-versions": true, diff --git a/vendor/dragonmantank/cron-expression/src/Cron/CronExpression.php b/vendor/dragonmantank/cron-expression/src/Cron/CronExpression.php index 216ce432..f3d8eb00 100644 --- a/vendor/dragonmantank/cron-expression/src/Cron/CronExpression.php +++ b/vendor/dragonmantank/cron-expression/src/Cron/CronExpression.php @@ -12,7 +12,6 @@ use InvalidArgumentException; use LogicException; use RuntimeException; -use Webmozart\Assert\Assert; /** * CRON expression parser that can determine whether or not a CRON expression is @@ -148,7 +147,7 @@ public static function getAliases(): array /** * @deprecated since version 3.0.2, use __construct instead. */ - public static function factory(string $expression, FieldFactoryInterface $fieldFactory = null): CronExpression + public static function factory(string $expression, ?FieldFactoryInterface $fieldFactory = null): CronExpression { /** @phpstan-ignore-next-line */ return new static($expression, $fieldFactory); @@ -179,7 +178,7 @@ public static function isValidExpression(string $expression): bool * @param null|FieldFactoryInterface $fieldFactory Factory to create cron fields * @throws InvalidArgumentException */ - public function __construct(string $expression, FieldFactoryInterface $fieldFactory = null) + public function __construct(string $expression, ?FieldFactoryInterface $fieldFactory = null) { $shortcut = strtolower($expression); $expression = self::$registeredAliases[$shortcut] ?? $expression; @@ -200,7 +199,12 @@ public function __construct(string $expression, FieldFactoryInterface $fieldFact public function setExpression(string $value): CronExpression { $split = preg_split('/\s/', $value, -1, PREG_SPLIT_NO_EMPTY); - Assert::isArray($split); + + if (!\is_array($split)) { + throw new InvalidArgumentException( + $value . ' is not a valid CRON expression' + ); + } $notEnoughParts = \count($split) < 5; @@ -334,7 +338,10 @@ public function getMultipleRunDates(int $total, $currentTime = 'now', bool $inve $currentTime = new DateTime($currentTime); } - Assert::isInstanceOf($currentTime, DateTime::class); + if (!$currentTime instanceof DateTime) { + throw new InvalidArgumentException('invalid current time'); + } + $currentTime->setTimezone(new DateTimeZone($timeZone)); $matches = []; @@ -420,7 +427,10 @@ public function isDue($currentTime = 'now', $timeZone = null): bool $currentTime = new DateTime($currentTime); } - Assert::isInstanceOf($currentTime, DateTime::class); + if (!$currentTime instanceof DateTime) { + throw new InvalidArgumentException('invalid current time'); + } + $currentTime->setTimezone(new DateTimeZone($timeZone)); // drop the seconds to 0 @@ -462,7 +472,10 @@ protected function getRunDate($currentTime = null, int $nth = 0, bool $invert = $currentDate = new DateTime('now'); } - Assert::isInstanceOf($currentDate, DateTime::class); + if (!$currentDate instanceof DateTime) { + throw new InvalidArgumentException('invalid current date'); + } + $currentDate->setTimezone(new DateTimeZone($timeZone)); // Workaround for setTime causing an offset change: https://bugs.php.net/bug.php?id=81074 $currentDate = DateTime::createFromFormat("!Y-m-d H:iO", $currentDate->format("Y-m-d H:iP"), $currentDate->getTimezone()); diff --git a/vendor/fakerphp/faker/CHANGELOG.md b/vendor/fakerphp/faker/CHANGELOG.md index d7f8396d..d3e37221 100644 --- a/vendor/fakerphp/faker/CHANGELOG.md +++ b/vendor/fakerphp/faker/CHANGELOG.md @@ -1,6 +1,16 @@ # CHANGELOG -## [Unreleased](https://github.com/FakerPHP/Faker/compare/v1.23.1...1.23) +## [Unreleased](https://github.com/FakerPHP/Faker/compare/v1.24.0...1.24.1) + +- Removed domain `gmail.com.au` from `Provider\en_AU\Internet` (#886) + +## [2024-11-09, v1.24.0](https://github.com/FakerPHP/Faker/compare/v1.23.1..v1.24.0) + +- Fix internal deprecations in Doctrine's populator by @gnutix in (#889) +- Fix mobile phone number pattern for France by @ker0x in (#859) +- PHP 8.4 Support by @Jubeki in (#904) + +- Added support for PHP 8.4 (#904) ## [2023-09-29, v1.23.1](https://github.com/FakerPHP/Faker/compare/v1.23.0..v1.23.1) diff --git a/vendor/fakerphp/faker/src/Faker/Core/Barcode.php b/vendor/fakerphp/faker/src/Faker/Core/Barcode.php index a85420be..4ad17e17 100644 --- a/vendor/fakerphp/faker/src/Faker/Core/Barcode.php +++ b/vendor/fakerphp/faker/src/Faker/Core/Barcode.php @@ -14,7 +14,7 @@ final class Barcode implements Extension\BarcodeExtension { private Extension\NumberExtension $numberExtension; - public function __construct(Extension\NumberExtension $numberExtension = null) + public function __construct(?Extension\NumberExtension $numberExtension = null) { $this->numberExtension = $numberExtension ?: new Number(); } diff --git a/vendor/fakerphp/faker/src/Faker/Core/Color.php b/vendor/fakerphp/faker/src/Faker/Core/Color.php index bd948190..c6cac0d3 100644 --- a/vendor/fakerphp/faker/src/Faker/Core/Color.php +++ b/vendor/fakerphp/faker/src/Faker/Core/Color.php @@ -54,7 +54,7 @@ final class Color implements Extension\ColorExtension 'Turquoise', 'Violet', 'Wheat', 'White', 'WhiteSmoke', 'Yellow', 'YellowGreen', ]; - public function __construct(Extension\NumberExtension $numberExtension = null) + public function __construct(?Extension\NumberExtension $numberExtension = null) { $this->numberExtension = $numberExtension ?: new Number(); } diff --git a/vendor/fakerphp/faker/src/Faker/Core/Coordinates.php b/vendor/fakerphp/faker/src/Faker/Core/Coordinates.php index 15b5492e..bc0678f6 100644 --- a/vendor/fakerphp/faker/src/Faker/Core/Coordinates.php +++ b/vendor/fakerphp/faker/src/Faker/Core/Coordinates.php @@ -13,7 +13,7 @@ final class Coordinates implements Extension\Extension { private Extension\NumberExtension $numberExtension; - public function __construct(Extension\NumberExtension $numberExtension = null) + public function __construct(?Extension\NumberExtension $numberExtension = null) { $this->numberExtension = $numberExtension ?: new Number(); } diff --git a/vendor/fakerphp/faker/src/Faker/Core/DateTime.php b/vendor/fakerphp/faker/src/Faker/Core/DateTime.php index 6ef40a96..6e02c667 100644 --- a/vendor/fakerphp/faker/src/Faker/Core/DateTime.php +++ b/vendor/fakerphp/faker/src/Faker/Core/DateTime.php @@ -72,7 +72,7 @@ private function setTimezone(\DateTime $dateTime, ?string $timezone): \DateTime return $dateTime->setTimezone(new \DateTimeZone($timezone)); } - public function dateTime($until = 'now', string $timezone = null): \DateTime + public function dateTime($until = 'now', ?string $timezone = null): \DateTime { return $this->setTimezone( $this->getTimestampDateTime($this->unixTime($until)), @@ -80,7 +80,7 @@ public function dateTime($until = 'now', string $timezone = null): \DateTime ); } - public function dateTimeAD($until = 'now', string $timezone = null): \DateTime + public function dateTimeAD($until = 'now', ?string $timezone = null): \DateTime { $min = (PHP_INT_SIZE > 4) ? -62135597361 : -PHP_INT_MAX; @@ -90,7 +90,7 @@ public function dateTimeAD($until = 'now', string $timezone = null): \DateTime ); } - public function dateTimeBetween($from = '-30 years', $until = 'now', string $timezone = null): \DateTime + public function dateTimeBetween($from = '-30 years', $until = 'now', ?string $timezone = null): \DateTime { $start = $this->getTimestamp($from); $end = $this->getTimestamp($until); @@ -107,7 +107,7 @@ public function dateTimeBetween($from = '-30 years', $until = 'now', string $tim ); } - public function dateTimeInInterval($from = '-30 years', string $interval = '+5 days', string $timezone = null): \DateTime + public function dateTimeInInterval($from = '-30 years', string $interval = '+5 days', ?string $timezone = null): \DateTime { $intervalObject = \DateInterval::createFromDateString($interval); $datetime = $from instanceof \DateTime ? $from : new \DateTime($from); @@ -120,29 +120,29 @@ public function dateTimeInInterval($from = '-30 years', string $interval = '+5 d return $this->dateTimeBetween($begin, $end, $timezone); } - public function dateTimeThisWeek($until = 'sunday this week', string $timezone = null): \DateTime + public function dateTimeThisWeek($until = 'sunday this week', ?string $timezone = null): \DateTime { return $this->dateTimeBetween('monday this week', $until, $timezone); } - public function dateTimeThisMonth($until = 'last day of this month', string $timezone = null): \DateTime + public function dateTimeThisMonth($until = 'last day of this month', ?string $timezone = null): \DateTime { return $this->dateTimeBetween('first day of this month', $until, $timezone); } - public function dateTimeThisYear($until = 'last day of december', string $timezone = null): \DateTime + public function dateTimeThisYear($until = 'last day of december', ?string $timezone = null): \DateTime { return $this->dateTimeBetween('first day of january', $until, $timezone); } - public function dateTimeThisDecade($until = 'now', string $timezone = null): \DateTime + public function dateTimeThisDecade($until = 'now', ?string $timezone = null): \DateTime { $year = floor(date('Y') / 10) * 10; return $this->dateTimeBetween("first day of january $year", $until, $timezone); } - public function dateTimeThisCentury($until = 'now', string $timezone = null): \DateTime + public function dateTimeThisCentury($until = 'now', ?string $timezone = null): \DateTime { $year = floor(date('Y') / 100) * 100; @@ -204,7 +204,7 @@ public function century(): string return Helper::randomElement($this->centuries); } - public function timezone(string $countryCode = null): string + public function timezone(?string $countryCode = null): string { if ($countryCode) { $timezones = \DateTimeZone::listIdentifiers(\DateTimeZone::PER_COUNTRY, $countryCode); diff --git a/vendor/fakerphp/faker/src/Faker/Core/Number.php b/vendor/fakerphp/faker/src/Faker/Core/Number.php index a16920c9..4334dcfa 100644 --- a/vendor/fakerphp/faker/src/Faker/Core/Number.php +++ b/vendor/fakerphp/faker/src/Faker/Core/Number.php @@ -63,7 +63,7 @@ public function randomFloat(?int $nbMaxDecimals = null, float $min = 0, ?float $ return round($min + $this->numberBetween() / mt_getrandmax() * ($max - $min), $nbMaxDecimals); } - public function randomNumber(int $nbDigits = null, bool $strict = false): int + public function randomNumber(?int $nbDigits = null, bool $strict = false): int { if (null === $nbDigits) { $nbDigits = $this->randomDigitNotZero(); diff --git a/vendor/fakerphp/faker/src/Faker/Core/Uuid.php b/vendor/fakerphp/faker/src/Faker/Core/Uuid.php index d1db1b22..45804604 100644 --- a/vendor/fakerphp/faker/src/Faker/Core/Uuid.php +++ b/vendor/fakerphp/faker/src/Faker/Core/Uuid.php @@ -11,7 +11,7 @@ final class Uuid implements Extension\UuidExtension { private Extension\NumberExtension $numberExtension; - public function __construct(Extension\NumberExtension $numberExtension = null) + public function __construct(?Extension\NumberExtension $numberExtension = null) { $this->numberExtension = $numberExtension ?: new Number(); diff --git a/vendor/fakerphp/faker/src/Faker/Core/Version.php b/vendor/fakerphp/faker/src/Faker/Core/Version.php index 8863c480..7c321e00 100644 --- a/vendor/fakerphp/faker/src/Faker/Core/Version.php +++ b/vendor/fakerphp/faker/src/Faker/Core/Version.php @@ -18,7 +18,7 @@ final class Version implements Extension\VersionExtension */ private array $semverCommonPreReleaseIdentifiers = ['alpha', 'beta', 'rc']; - public function __construct(Extension\NumberExtension $numberExtension = null) + public function __construct(?Extension\NumberExtension $numberExtension = null) { $this->numberExtension = $numberExtension ?: new Number(); diff --git a/vendor/fakerphp/faker/src/Faker/Extension/DateTimeExtension.php b/vendor/fakerphp/faker/src/Faker/Extension/DateTimeExtension.php index 9a27cce0..b7c76ba4 100644 --- a/vendor/fakerphp/faker/src/Faker/Extension/DateTimeExtension.php +++ b/vendor/fakerphp/faker/src/Faker/Extension/DateTimeExtension.php @@ -25,7 +25,7 @@ interface DateTimeExtension * * @example DateTime('2005-08-16 20:39:21') */ - public function dateTime($until = 'now', string $timezone = null): \DateTime; + public function dateTime($until = 'now', ?string $timezone = null): \DateTime; /** * Get a DateTime object for a date between January 1, 0001, and now. @@ -38,7 +38,7 @@ public function dateTime($until = 'now', string $timezone = null): \DateTime; * @see http://php.net/manual/en/timezones.php * @see http://php.net/manual/en/function.date-default-timezone-get.php */ - public function dateTimeAD($until = 'now', string $timezone = null): \DateTime; + public function dateTimeAD($until = 'now', ?string $timezone = null): \DateTime; /** * Get a DateTime object a random date between `$from` and `$until`. @@ -52,7 +52,7 @@ public function dateTimeAD($until = 'now', string $timezone = null): \DateTime; * @see http://php.net/manual/en/timezones.php * @see http://php.net/manual/en/function.date-default-timezone-get.php */ - public function dateTimeBetween($from = '-30 years', $until = 'now', string $timezone = null): \DateTime; + public function dateTimeBetween($from = '-30 years', $until = 'now', ?string $timezone = null): \DateTime; /** * Get a DateTime object based on a random date between `$from` and an interval. @@ -66,7 +66,7 @@ public function dateTimeBetween($from = '-30 years', $until = 'now', string $tim * @see http://php.net/manual/en/timezones.php * @see http://php.net/manual/en/function.date-default-timezone-get.php */ - public function dateTimeInInterval($from = '-30 years', string $interval = '+5 days', string $timezone = null): \DateTime; + public function dateTimeInInterval($from = '-30 years', string $interval = '+5 days', ?string $timezone = null): \DateTime; /** * Get a date time object somewhere inside the current week. @@ -78,7 +78,7 @@ public function dateTimeInInterval($from = '-30 years', string $interval = '+5 d * @see http://php.net/manual/en/timezones.php * @see http://php.net/manual/en/function.date-default-timezone-get.php */ - public function dateTimeThisWeek($until = 'now', string $timezone = null): \DateTime; + public function dateTimeThisWeek($until = 'now', ?string $timezone = null): \DateTime; /** * Get a date time object somewhere inside the current month. @@ -90,7 +90,7 @@ public function dateTimeThisWeek($until = 'now', string $timezone = null): \Date * @see http://php.net/manual/en/timezones.php * @see http://php.net/manual/en/function.date-default-timezone-get.php */ - public function dateTimeThisMonth($until = 'now', string $timezone = null): \DateTime; + public function dateTimeThisMonth($until = 'now', ?string $timezone = null): \DateTime; /** * Get a date time object somewhere inside the current year. @@ -102,7 +102,7 @@ public function dateTimeThisMonth($until = 'now', string $timezone = null): \Dat * @see http://php.net/manual/en/timezones.php * @see http://php.net/manual/en/function.date-default-timezone-get.php */ - public function dateTimeThisYear($until = 'now', string $timezone = null): \DateTime; + public function dateTimeThisYear($until = 'now', ?string $timezone = null): \DateTime; /** * Get a date time object somewhere inside the current decade. @@ -114,7 +114,7 @@ public function dateTimeThisYear($until = 'now', string $timezone = null): \Date * @see http://php.net/manual/en/timezones.php * @see http://php.net/manual/en/function.date-default-timezone-get.php */ - public function dateTimeThisDecade($until = 'now', string $timezone = null): \DateTime; + public function dateTimeThisDecade($until = 'now', ?string $timezone = null): \DateTime; /** * Get a date time object somewhere inside the current century. @@ -126,7 +126,7 @@ public function dateTimeThisDecade($until = 'now', string $timezone = null): \Da * @see http://php.net/manual/en/timezones.php * @see http://php.net/manual/en/function.date-default-timezone-get.php */ - public function dateTimeThisCentury($until = 'now', string $timezone = null): \DateTime; + public function dateTimeThisCentury($until = 'now', ?string $timezone = null): \DateTime; /** * Get a date string between January 1, 1970, and `$until`. @@ -238,5 +238,5 @@ public function century(): string; * * @example 'Europe/Rome' */ - public function timezone(string $countryCode = null): string; + public function timezone(?string $countryCode = null): string; } diff --git a/vendor/fakerphp/faker/src/Faker/Generator.php b/vendor/fakerphp/faker/src/Faker/Generator.php index 0b994e4c..d1320312 100644 --- a/vendor/fakerphp/faker/src/Faker/Generator.php +++ b/vendor/fakerphp/faker/src/Faker/Generator.php @@ -565,7 +565,7 @@ class Generator */ private $uniqueGenerator; - public function __construct(ContainerInterface $container = null) + public function __construct(?ContainerInterface $container = null) { $this->container = $container ?: Container\ContainerBuilder::withDefaultExtensions()->build(); } diff --git a/vendor/fakerphp/faker/src/Faker/Guesser/Name.php b/vendor/fakerphp/faker/src/Faker/Guesser/Name.php index ddb048bc..1f98c4f8 100644 --- a/vendor/fakerphp/faker/src/Faker/Guesser/Name.php +++ b/vendor/fakerphp/faker/src/Faker/Guesser/Name.php @@ -26,37 +26,37 @@ public function guessFormat($name, $size = null) if (preg_match('/^is[_A-Z]/', $name)) { return static function () use ($generator) { - return $generator->boolean; + return $generator->boolean(); }; } if (preg_match('/(_a|A)t$/', $name)) { return static function () use ($generator) { - return $generator->dateTime; + return $generator->dateTime(); }; } switch (str_replace('_', '', $name)) { case 'firstname': return static function () use ($generator) { - return $generator->firstName; + return $generator->firstName(); }; case 'lastname': return static function () use ($generator) { - return $generator->lastName; + return $generator->lastName(); }; case 'username': case 'login': return static function () use ($generator) { - return $generator->userName; + return $generator->userName(); }; case 'email': case 'emailaddress': return static function () use ($generator) { - return $generator->email; + return $generator->email(); }; case 'phonenumber': @@ -64,68 +64,68 @@ public function guessFormat($name, $size = null) case 'telephone': case 'telnumber': return static function () use ($generator) { - return $generator->phoneNumber; + return $generator->phoneNumber(); }; case 'address': return static function () use ($generator) { - return $generator->address; + return $generator->address(); }; case 'city': case 'town': return static function () use ($generator) { - return $generator->city; + return $generator->city(); }; case 'streetaddress': return static function () use ($generator) { - return $generator->streetAddress; + return $generator->streetAddress(); }; case 'postcode': case 'zipcode': return static function () use ($generator) { - return $generator->postcode; + return $generator->postcode(); }; case 'state': return static function () use ($generator) { - return $generator->state; + return $generator->state(); }; case 'county': if ($this->generator->locale == 'en_US') { return static function () use ($generator) { - return sprintf('%s County', $generator->city); + return sprintf('%s County', $generator->city()); }; } return static function () use ($generator) { - return $generator->state; + return $generator->state(); }; case 'country': switch ($size) { case 2: return static function () use ($generator) { - return $generator->countryCode; + return $generator->countryCode(); }; case 3: return static function () use ($generator) { - return $generator->countryISOAlpha3; + return $generator->countryISOAlpha3(); }; case 5: case 6: return static function () use ($generator) { - return $generator->locale; + return $generator->locale(); }; default: return static function () use ($generator) { - return $generator->country; + return $generator->country(); }; } @@ -133,37 +133,37 @@ public function guessFormat($name, $size = null) case 'locale': return static function () use ($generator) { - return $generator->locale; + return $generator->locale(); }; case 'currency': case 'currencycode': return static function () use ($generator) { - return $generator->currencyCode; + return $generator->currencyCode(); }; case 'url': case 'website': return static function () use ($generator) { - return $generator->url; + return $generator->url(); }; case 'company': case 'companyname': case 'employer': return static function () use ($generator) { - return $generator->company; + return $generator->company(); }; case 'title': if ($size !== null && $size <= 10) { return static function () use ($generator) { - return $generator->title; + return $generator->title(); }; } return static function () use ($generator) { - return $generator->sentence; + return $generator->sentence(); }; case 'body': @@ -171,7 +171,7 @@ public function guessFormat($name, $size = null) case 'article': case 'description': return static function () use ($generator) { - return $generator->text; + return $generator->text(); }; } diff --git a/vendor/fakerphp/faker/src/Faker/ORM/Doctrine/ColumnTypeGuesser.php b/vendor/fakerphp/faker/src/Faker/ORM/Doctrine/ColumnTypeGuesser.php index 3267fe46..024d8a9d 100644 --- a/vendor/fakerphp/faker/src/Faker/ORM/Doctrine/ColumnTypeGuesser.php +++ b/vendor/fakerphp/faker/src/Faker/ORM/Doctrine/ColumnTypeGuesser.php @@ -27,7 +27,7 @@ public function guessFormat($fieldName, ClassMetadata $class) switch ($type) { case 'boolean': return static function () use ($generator) { - return $generator->boolean; + return $generator->boolean(); }; case 'decimal': @@ -66,14 +66,14 @@ public function guessFormat($fieldName, ClassMetadata $class) case 'text': return static function () use ($generator) { - return $generator->text; + return $generator->text(); }; case 'datetime': case 'date': case 'time': return static function () use ($generator) { - return $generator->datetime; + return $generator->datetime(); }; case 'datetime_immutable': diff --git a/vendor/fakerphp/faker/src/Faker/ORM/Doctrine/Populator.php b/vendor/fakerphp/faker/src/Faker/ORM/Doctrine/Populator.php index 1bce6ab4..61d4171e 100644 --- a/vendor/fakerphp/faker/src/Faker/ORM/Doctrine/Populator.php +++ b/vendor/fakerphp/faker/src/Faker/ORM/Doctrine/Populator.php @@ -48,7 +48,7 @@ class Populator * * @param int $batchSize */ - public function __construct(Generator $generator, ObjectManager $manager = null, $batchSize = 1000) + public function __construct(Generator $generator, ?ObjectManager $manager = null, $batchSize = 1000) { $this->generator = $generator; $this->manager = $manager; diff --git a/vendor/fakerphp/faker/src/Faker/ORM/Spot/Populator.php b/vendor/fakerphp/faker/src/Faker/ORM/Spot/Populator.php index b321f5c5..9ad3bfb6 100644 --- a/vendor/fakerphp/faker/src/Faker/ORM/Spot/Populator.php +++ b/vendor/fakerphp/faker/src/Faker/ORM/Spot/Populator.php @@ -17,7 +17,7 @@ class Populator /** * Populator constructor. */ - public function __construct(\Faker\Generator $generator, Locator $locator = null) + public function __construct(\Faker\Generator $generator, ?Locator $locator = null) { $this->generator = $generator; $this->locator = $locator; diff --git a/vendor/fakerphp/faker/src/Faker/Provider/DateTime.php b/vendor/fakerphp/faker/src/Faker/Provider/DateTime.php index 25df1c99..a8a19925 100644 --- a/vendor/fakerphp/faker/src/Faker/Provider/DateTime.php +++ b/vendor/fakerphp/faker/src/Faker/Provider/DateTime.php @@ -334,7 +334,7 @@ public static function century() * * @example 'Europe/Paris' */ - public static function timezone(string $countryCode = null) + public static function timezone(?string $countryCode = null) { if ($countryCode) { $timezones = \DateTimeZone::listIdentifiers(\DateTimeZone::PER_COUNTRY, $countryCode); diff --git a/vendor/fakerphp/faker/src/Faker/Provider/de_AT/Person.php b/vendor/fakerphp/faker/src/Faker/Provider/de_AT/Person.php index 964b8b7d..248952ff 100644 --- a/vendor/fakerphp/faker/src/Faker/Provider/de_AT/Person.php +++ b/vendor/fakerphp/faker/src/Faker/Provider/de_AT/Person.php @@ -127,7 +127,7 @@ public static function suffix() * * @return string */ - public static function ssn(\DateTime $birthdate = null) + public static function ssn(?\DateTime $birthdate = null) { $birthdate = $birthdate ?? DateTime::dateTimeThisCentury(); diff --git a/vendor/fakerphp/faker/src/Faker/Provider/en_AU/Internet.php b/vendor/fakerphp/faker/src/Faker/Provider/en_AU/Internet.php index e1185f18..39e65064 100644 --- a/vendor/fakerphp/faker/src/Faker/Provider/en_AU/Internet.php +++ b/vendor/fakerphp/faker/src/Faker/Provider/en_AU/Internet.php @@ -4,6 +4,6 @@ class Internet extends \Faker\Provider\Internet { - protected static $freeEmailDomain = ['gmail.com', 'yahoo.com', 'hotmail.com', 'gmail.com.au', 'yahoo.com.au', 'hotmail.com.au']; + protected static $freeEmailDomain = ['gmail.com', 'yahoo.com', 'hotmail.com', 'yahoo.com.au', 'hotmail.com.au']; protected static $tld = ['com', 'com.au', 'org', 'org.au', 'net', 'net.au', 'biz', 'info', 'edu', 'edu.au']; } diff --git a/vendor/fakerphp/faker/src/Faker/Provider/en_GB/Company.php b/vendor/fakerphp/faker/src/Faker/Provider/en_GB/Company.php index 17fe07da..b0c3ccc7 100644 --- a/vendor/fakerphp/faker/src/Faker/Provider/en_GB/Company.php +++ b/vendor/fakerphp/faker/src/Faker/Provider/en_GB/Company.php @@ -18,7 +18,7 @@ class Company extends \Faker\Provider\Company * * @see https://en.wikipedia.org/wiki/VAT_identification_number#VAT_numbers_by_country */ - public static function vat(string $type = null): string + public static function vat(?string $type = null): string { switch ($type) { case static::VAT_TYPE_BRANCH: diff --git a/vendor/fakerphp/faker/src/Faker/Provider/en_ZA/Person.php b/vendor/fakerphp/faker/src/Faker/Provider/en_ZA/Person.php index 2d2b525e..2433ac17 100644 --- a/vendor/fakerphp/faker/src/Faker/Provider/en_ZA/Person.php +++ b/vendor/fakerphp/faker/src/Faker/Provider/en_ZA/Person.php @@ -140,7 +140,7 @@ class Person extends \Faker\Provider\Person * * @return string */ - public function idNumber(\DateTime $birthdate = null, $citizen = true, $gender = null) + public function idNumber(?\DateTime $birthdate = null, $citizen = true, $gender = null) { if (!$birthdate) { $birthdate = $this->generator->dateTimeThisCentury(); diff --git a/vendor/fakerphp/faker/src/Faker/Provider/fi_FI/Person.php b/vendor/fakerphp/faker/src/Faker/Provider/fi_FI/Person.php index bb1c24c0..2dc65209 100644 --- a/vendor/fakerphp/faker/src/Faker/Provider/fi_FI/Person.php +++ b/vendor/fakerphp/faker/src/Faker/Provider/fi_FI/Person.php @@ -95,7 +95,7 @@ class Person extends \Faker\Provider\Person * * @return string on format DDMMYYCZZZQ, where DDMMYY is the date of birth, C the century sign, ZZZ the individual number and Q the control character (checksum) */ - public function personalIdentityNumber(\DateTime $birthdate = null, $gender = null) + public function personalIdentityNumber(?\DateTime $birthdate = null, $gender = null) { $checksumCharacters = '0123456789ABCDEFHJKLMNPRSTUVWXY'; diff --git a/vendor/fakerphp/faker/src/Faker/Provider/fr_FR/PhoneNumber.php b/vendor/fakerphp/faker/src/Faker/Provider/fr_FR/PhoneNumber.php index 69c681d9..22f518d6 100644 --- a/vendor/fakerphp/faker/src/Faker/Provider/fr_FR/PhoneNumber.php +++ b/vendor/fakerphp/faker/src/Faker/Provider/fr_FR/PhoneNumber.php @@ -13,7 +13,7 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber '+33 (0)3 ## ## ## ##', '+33 (0)4 ## ## ## ##', '+33 (0)5 ## ## ## ##', - '+33 (0)6 ## ## ## ##', + '+33 (0)6 {{phoneNumber06WithSeparator}}', '+33 (0)7 {{phoneNumber07WithSeparator}}', '+33 (0)8 {{phoneNumber08WithSeparator}}', '+33 (0)9 ## ## ## ##', @@ -23,7 +23,7 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber '+33 3 ## ## ## ##', '+33 4 ## ## ## ##', '+33 5 ## ## ## ##', - '+33 6 ## ## ## ##', + '+33 6 {{phoneNumber06WithSeparator}}', '+33 7 {{phoneNumber07WithSeparator}}', '+33 8 {{phoneNumber08WithSeparator}}', '+33 9 ## ## ## ##', @@ -33,7 +33,7 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber '03########', '04########', '05########', - '06########', + '06{{phoneNumber06}}', '07{{phoneNumber07}}', '08{{phoneNumber08}}', '09########', @@ -43,7 +43,7 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber '03 ## ## ## ##', '04 ## ## ## ##', '05 ## ## ## ##', - '06 ## ## ## ##', + '06 {{phoneNumber06WithSeparator}}', '07 {{phoneNumber07WithSeparator}}', '08 {{phoneNumber08WithSeparator}}', '09 ## ## ## ##', @@ -52,13 +52,13 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber // Mobile phone numbers start by 06 and 07 // 06 is the most common prefix protected static $mobileFormats = [ - '+33 (0)6 ## ## ## ##', - '+33 6 ## ## ## ##', + '+33 (0)6 {{phoneNumber06WithSeparator}}', + '+33 6 {{phoneNumber06WithSeparator}}', '+33 (0)7 {{phoneNumber07WithSeparator}}', '+33 7 {{phoneNumber07WithSeparator}}', - '06########', + '06{{phoneNumber06}}', '07{{phoneNumber07}}', - '06 ## ## ## ##', + '06 {{phoneNumber06WithSeparator}}', '07 {{phoneNumber07WithSeparator}}', ]; @@ -73,6 +73,26 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber '+33#########', ]; + public function phoneNumber06() + { + $phoneNumber = $this->phoneNumber06WithSeparator(); + + return str_replace(' ', '', $phoneNumber); + } + + /** + * Only 0601 to 0638, 0640 to 0689, 0695 and 0698 to 0699 are acceptable prefixes with 06 + * + * @see https://www.arcep.fr/la-regulation/grands-dossiers-thematiques-transverses/la-numerotation.html#c8961 + * @see https://www.itu.int/itu-t/nnp/#/numbering-plans?country=France%C2%A0&code=33 + */ + public function phoneNumber06WithSeparator() + { + $regex = '([0-24-8]\d|3[0-8]|9[589])( \d{2}){3}'; + + return static::regexify($regex); + } + public function phoneNumber07() { $phoneNumber = $this->phoneNumber07WithSeparator(); @@ -81,16 +101,16 @@ public function phoneNumber07() } /** - * Only 073 to 079 are acceptable prefixes with 07 + * Only 0730 to 0789 are acceptable prefixes with 07 * - * @see http://www.arcep.fr/index.php?id=8146 + * @see https://www.arcep.fr/la-regulation/grands-dossiers-thematiques-transverses/la-numerotation.html#c8961 + * @see https://www.itu.int/itu-t/nnp/#/numbering-plans?country=France%C2%A0&code=33 */ public function phoneNumber07WithSeparator() { - $phoneNumber = $this->generator->numberBetween(3, 9); - $phoneNumber .= $this->numerify('# ## ## ##'); + $regex = '([3-8]\d)( \d{2}){3}'; - return $phoneNumber; + return static::regexify($regex); } public function phoneNumber08() @@ -121,9 +141,9 @@ public function phoneNumber08() */ public function phoneNumber08WithSeparator() { - $regex = '([012]{1}\d{1}|(9[1-357-9])( \d{2}){3}'; + $regex = '([012]\d|(9[1-357-9])( \d{2}){3}'; - return $this->regexify($regex); + return static::regexify($regex); } /** diff --git a/vendor/fakerphp/faker/src/Faker/Provider/kk_KZ/Company.php b/vendor/fakerphp/faker/src/Faker/Provider/kk_KZ/Company.php index 75efebf8..2ba58b94 100644 --- a/vendor/fakerphp/faker/src/Faker/Provider/kk_KZ/Company.php +++ b/vendor/fakerphp/faker/src/Faker/Provider/kk_KZ/Company.php @@ -56,7 +56,7 @@ public static function companyNameSuffix() * * @return string 12 digits, like 150140000019 */ - public static function businessIdentificationNumber(\DateTime $registrationDate = null) + public static function businessIdentificationNumber(?\DateTime $registrationDate = null) { if (!$registrationDate) { $registrationDate = \Faker\Provider\DateTime::dateTimeThisYear(); diff --git a/vendor/fakerphp/faker/src/Faker/Provider/kk_KZ/Person.php b/vendor/fakerphp/faker/src/Faker/Provider/kk_KZ/Person.php index 353dfae4..454ca1e5 100644 --- a/vendor/fakerphp/faker/src/Faker/Provider/kk_KZ/Person.php +++ b/vendor/fakerphp/faker/src/Faker/Provider/kk_KZ/Person.php @@ -211,7 +211,7 @@ private static function getCenturyByYear($year) * * @return string 12 digits, like 780322300455 */ - public static function individualIdentificationNumber(\DateTime $birthDate = null, $gender = self::GENDER_MALE) + public static function individualIdentificationNumber(?\DateTime $birthDate = null, $gender = self::GENDER_MALE) { if (!$birthDate) { $birthDate = DateTime::dateTimeBetween(); diff --git a/vendor/fakerphp/faker/src/Faker/Provider/lt_LT/Person.php b/vendor/fakerphp/faker/src/Faker/Provider/lt_LT/Person.php index 570eecfb..0908f808 100644 --- a/vendor/fakerphp/faker/src/Faker/Provider/lt_LT/Person.php +++ b/vendor/fakerphp/faker/src/Faker/Provider/lt_LT/Person.php @@ -330,7 +330,7 @@ public function passportNumber() * * @return string on format XXXXXXXXXXX */ - public function personalIdentityNumber($gender = 'male', \DateTime $birthdate = null, $randomNumber = '') + public function personalIdentityNumber($gender = 'male', ?\DateTime $birthdate = null, $randomNumber = '') { if (!$birthdate) { $birthdate = \Faker\Provider\DateTime::dateTimeThisCentury(); diff --git a/vendor/fakerphp/faker/src/Faker/Provider/lv_LV/Person.php b/vendor/fakerphp/faker/src/Faker/Provider/lv_LV/Person.php index 21396717..f05b4507 100644 --- a/vendor/fakerphp/faker/src/Faker/Provider/lv_LV/Person.php +++ b/vendor/fakerphp/faker/src/Faker/Provider/lv_LV/Person.php @@ -136,7 +136,7 @@ public function passportNumber() * * @return string on format XXXXXX-XXXXX */ - public function personalIdentityNumber(\DateTime $birthdate = null) + public function personalIdentityNumber(?\DateTime $birthdate = null) { if (!$birthdate) { $birthdate = DateTime::dateTimeThisCentury(); diff --git a/vendor/fakerphp/faker/src/Faker/Provider/nb_NO/Person.php b/vendor/fakerphp/faker/src/Faker/Provider/nb_NO/Person.php index 8ee85cac..e3378417 100644 --- a/vendor/fakerphp/faker/src/Faker/Provider/nb_NO/Person.php +++ b/vendor/fakerphp/faker/src/Faker/Provider/nb_NO/Person.php @@ -292,7 +292,7 @@ class Person extends \Faker\Provider\Person * * @return string on format DDMMYY##### */ - public function personalIdentityNumber(\DateTime $birthdate = null, $gender = null) + public function personalIdentityNumber(?\DateTime $birthdate = null, $gender = null) { if (!$birthdate) { $birthdate = \Faker\Provider\DateTime::dateTimeThisCentury(); diff --git a/vendor/fakerphp/faker/src/Faker/Provider/sv_SE/Person.php b/vendor/fakerphp/faker/src/Faker/Provider/sv_SE/Person.php index 1142a1f6..7c42f6bd 100644 --- a/vendor/fakerphp/faker/src/Faker/Provider/sv_SE/Person.php +++ b/vendor/fakerphp/faker/src/Faker/Provider/sv_SE/Person.php @@ -125,7 +125,7 @@ class Person extends \Faker\Provider\Person * * @return string on format XXXXXX-XXXX */ - public function personalIdentityNumber(\DateTime $birthdate = null, $gender = null) + public function personalIdentityNumber(?\DateTime $birthdate = null, $gender = null) { if (!$birthdate) { $birthdate = \Faker\Provider\DateTime::dateTimeThisCentury(); diff --git a/vendor/filp/whoops/CHANGELOG.md b/vendor/filp/whoops/CHANGELOG.md index 0542cc42..bbd16fcc 100644 --- a/vendor/filp/whoops/CHANGELOG.md +++ b/vendor/filp/whoops/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +## v2.16.0 + +* Support PHP `8.4`. +* Drop support for PHP older than `7.1`. + ## v2.15.4 * Improve link color in comments. diff --git a/vendor/filp/whoops/composer.json b/vendor/filp/whoops/composer.json index 06b5c756..c72fab00 100644 --- a/vendor/filp/whoops/composer.json +++ b/vendor/filp/whoops/composer.json @@ -15,13 +15,13 @@ "test": "phpunit --testdox tests" }, "require": { - "php": "^5.5.9 || ^7.0 || ^8.0", + "php": "^7.1 || ^8.0", "psr/log": "^1.0.1 || ^2.0 || ^3.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3", - "mockery/mockery": "^0.9 || ^1.0", - "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0" + "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.3", + "mockery/mockery": "^1.0", + "symfony/var-dumper": "^4.0 || ^5.0" }, "suggest": { "symfony/var-dumper": "Pretty print complex values better with var-dumper available", diff --git a/vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php b/vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php index 167407e8..b739ac06 100644 --- a/vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php +++ b/vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php @@ -383,7 +383,7 @@ public function addDataTableCallback($label, /* callable */ $callback) throw new InvalidArgumentException('Expecting callback argument to be callable'); } - $this->extraTables[$label] = function (\Whoops\Inspector\InspectorInterface $inspector = null) use ($callback) { + $this->extraTables[$label] = function (?\Whoops\Inspector\InspectorInterface $inspector = null) use ($callback) { try { $result = call_user_func($callback, $inspector); diff --git a/vendor/filp/whoops/src/Whoops/Run.php b/vendor/filp/whoops/src/Whoops/Run.php index 08627680..7be63aff 100644 --- a/vendor/filp/whoops/src/Whoops/Run.php +++ b/vendor/filp/whoops/src/Whoops/Run.php @@ -81,7 +81,7 @@ final class Run implements RunInterface */ private $frameFilters = []; - public function __construct(SystemFacade $system = null) + public function __construct(?SystemFacade $system = null) { $this->system = $system ?: new SystemFacade; $this->inspectorFactory = new InspectorFactory(); diff --git a/vendor/filp/whoops/src/Whoops/Util/TemplateHelper.php b/vendor/filp/whoops/src/Whoops/Util/TemplateHelper.php index 8e4df328..5612c0b7 100644 --- a/vendor/filp/whoops/src/Whoops/Util/TemplateHelper.php +++ b/vendor/filp/whoops/src/Whoops/Util/TemplateHelper.php @@ -233,7 +233,7 @@ public function slug($original) * * @param string $template */ - public function render($template, array $additionalVariables = null) + public function render($template, ?array $additionalVariables = null) { $variables = $this->getVariables(); diff --git a/vendor/graham-campbell/result-type/LICENSE b/vendor/graham-campbell/result-type/LICENSE index bbd75d13..8e7c8988 100644 --- a/vendor/graham-campbell/result-type/LICENSE +++ b/vendor/graham-campbell/result-type/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2020-2023 Graham Campbell +Copyright (c) 2020-2024 Graham Campbell Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/graham-campbell/result-type/composer.json b/vendor/graham-campbell/result-type/composer.json index b1ba15ab..32bfc81e 100644 --- a/vendor/graham-campbell/result-type/composer.json +++ b/vendor/graham-campbell/result-type/composer.json @@ -12,10 +12,10 @@ ], "require": { "php": "^7.2.5 || ^8.0", - "phpoption/phpoption": "^1.9.2" + "phpoption/phpoption": "^1.9.3" }, "require-dev": { - "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28" }, "autoload": { "psr-4": { diff --git a/vendor/illuminate/bus/DatabaseBatchRepository.php b/vendor/illuminate/bus/DatabaseBatchRepository.php index 4333c515..5a7aadde 100644 --- a/vendor/illuminate/bus/DatabaseBatchRepository.php +++ b/vendor/illuminate/bus/DatabaseBatchRepository.php @@ -6,10 +6,10 @@ use Closure; use DateTimeInterface; use Illuminate\Database\Connection; -use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Database\PostgresConnection; use Illuminate\Database\Query\Expression; use Illuminate\Support\Str; +use Throwable; class DatabaseBatchRepository implements PrunableBatchRepository { @@ -352,7 +352,7 @@ protected function unserialize($serialized) try { return unserialize($serialized); - } catch (ModelNotFoundException) { + } catch (Throwable) { return []; } } diff --git a/vendor/illuminate/bus/Queueable.php b/vendor/illuminate/bus/Queueable.php index 3d3bbb9b..1c8951ec 100644 --- a/vendor/illuminate/bus/Queueable.php +++ b/vendor/illuminate/bus/Queueable.php @@ -199,6 +199,11 @@ public function chain($chain) */ public function prependToChain($job) { + $job = match (true) { + $job instanceof PendingBatch => new ChainedBatch($job), + default => $job, + }; + $this->chained = Arr::prepend($this->chained, $this->serializeJob($job)); return $this; @@ -212,6 +217,11 @@ public function prependToChain($job) */ public function appendToChain($job) { + $job = match (true) { + $job instanceof PendingBatch => new ChainedBatch($job), + default => $job, + }; + $this->chained = array_merge($this->chained, [$this->serializeJob($job)]); return $this; diff --git a/vendor/illuminate/cache/DatabaseStore.php b/vendor/illuminate/cache/DatabaseStore.php index e5b72107..b8026e3e 100644 --- a/vendor/illuminate/cache/DatabaseStore.php +++ b/vendor/illuminate/cache/DatabaseStore.php @@ -158,9 +158,7 @@ public function add($key, $value, $seconds) $value = $this->serialize($value); $expiration = $this->getTime() + $seconds; - $doesntSupportInsertOrIgnore = [SqlServerConnection::class]; - - if (! in_array(get_class($this->getConnection()), $doesntSupportInsertOrIgnore)) { + if (! $this->getConnection() instanceof SqlServerConnection) { return $this->table()->insertOrIgnore(compact('key', 'value', 'expiration')) > 0; } diff --git a/vendor/illuminate/console/Application.php b/vendor/illuminate/console/Application.php index 98536ce4..d880f8df 100644 --- a/vendor/illuminate/console/Application.php +++ b/vendor/illuminate/console/Application.php @@ -237,7 +237,9 @@ protected function addToParent(SymfonyCommand $command) public function resolve($command) { if (is_subclass_of($command, SymfonyCommand::class) && ($commandName = $command::getDefaultName())) { - $this->commandMap[$commandName] = $command; + foreach (explode('|', $commandName) as $name) { + $this->commandMap[$name] = $command; + } return null; } diff --git a/vendor/illuminate/console/Command.php b/vendor/illuminate/console/Command.php index 7e1b3a1f..1c6d949f 100644 --- a/vendor/illuminate/console/Command.php +++ b/vendor/illuminate/console/Command.php @@ -236,11 +236,13 @@ protected function commandIsolationMutex() */ protected function resolveCommand($command) { - if (! class_exists($command)) { - return $this->getApplication()->find($command); - } + if (is_string($command)) { + if (! class_exists($command)) { + return $this->getApplication()->find($command); + } - $command = $this->laravel->make($command); + $command = $this->laravel->make($command); + } if ($command instanceof SymfonyCommand) { $command->setApplication($this->getApplication()); diff --git a/vendor/illuminate/support/ValidatedInput.php b/vendor/illuminate/support/ValidatedInput.php index 87e47b55..70bc6c3d 100644 --- a/vendor/illuminate/support/ValidatedInput.php +++ b/vendor/illuminate/support/ValidatedInput.php @@ -4,7 +4,9 @@ use ArrayIterator; use Illuminate\Contracts\Support\ValidatedData; +use Illuminate\Support\Facades\Date; use stdClass; +use Symfony\Component\VarDumper\VarDumper; use Traversable; class ValidatedInput implements ValidatedData @@ -38,7 +40,7 @@ public function has($keys) $keys = is_array($keys) ? $keys : func_get_args(); foreach ($keys as $key) { - if (! Arr::has($this->input, $key)) { + if (! Arr::has($this->all(), $key)) { return false; } } @@ -67,7 +69,7 @@ public function only($keys) { $results = []; - $input = $this->input; + $input = $this->all(); $placeholder = new stdClass; @@ -92,7 +94,7 @@ public function except($keys) { $keys = is_array($keys) ? $keys : func_get_args(); - $results = $this->input; + $results = $this->all(); Arr::forget($results, $keys); @@ -107,17 +109,18 @@ public function except($keys) */ public function merge(array $items) { - return new static(array_merge($this->input, $items)); + return new static(array_merge($this->all(), $items)); } /** * Get the input as a collection. * + * @param array|string|null $key * @return \Illuminate\Support\Collection */ - public function collect() + public function collect($key = null) { - return new Collection($this->input); + return collect(is_array($key) ? $this->only($key) : $this->input($key)); } /** @@ -148,7 +151,7 @@ public function toArray() */ public function __get($name) { - return $this->input[$name]; + return $this->input($name); } /** @@ -170,7 +173,7 @@ public function __set($name, $value) */ public function __isset($name) { - return isset($this->input[$name]); + return $this->exists($name); } /** @@ -192,7 +195,7 @@ public function __unset($name) */ public function offsetExists($key): bool { - return isset($this->input[$key]); + return $this->exists($key); } /** @@ -203,7 +206,7 @@ public function offsetExists($key): bool */ public function offsetGet($key): mixed { - return $this->input[$key]; + return $this->input($key); } /** @@ -242,4 +245,320 @@ public function getIterator(): Traversable { return new ArrayIterator($this->input); } + + /** + * Determine if the validated inputs contains a given input item key. + * + * @param string|array $key + * @return bool + */ + public function exists($key) + { + return $this->has($key); + } + + /** + * Determine if the validated inputs contains any of the given inputs. + * + * @param string|array $keys + * @return bool + */ + public function hasAny($keys) + { + $keys = is_array($keys) ? $keys : func_get_args(); + + $input = $this->all(); + + return Arr::hasAny($input, $keys); + } + + /** + * Apply the callback if the validated inputs contains the given input item key. + * + * @param string $key + * @param callable $callback + * @param callable|null $default + * @return $this|mixed + */ + public function whenHas($key, callable $callback, callable $default = null) + { + if ($this->has($key)) { + return $callback(data_get($this->all(), $key)) ?: $this; + } + + if ($default) { + return $default(); + } + + return $this; + } + + /** + * Determine if the validated inputs contains a non-empty value for an input item. + * + * @param string|array $key + * @return bool + */ + public function filled($key) + { + $keys = is_array($key) ? $key : func_get_args(); + + foreach ($keys as $value) { + if ($this->isEmptyString($value)) { + return false; + } + } + + return true; + } + + /** + * Determine if the validated inputs contains an empty value for an input item. + * + * @param string|array $key + * @return bool + */ + public function isNotFilled($key) + { + $keys = is_array($key) ? $key : func_get_args(); + + foreach ($keys as $value) { + if (! $this->isEmptyString($value)) { + return false; + } + } + + return true; + } + + /** + * Determine if the validated inputs contains a non-empty value for any of the given inputs. + * + * @param string|array $keys + * @return bool + */ + public function anyFilled($keys) + { + $keys = is_array($keys) ? $keys : func_get_args(); + + foreach ($keys as $key) { + if ($this->filled($key)) { + return true; + } + } + + return false; + } + + /** + * Apply the callback if the validated inputs contains a non-empty value for the given input item key. + * + * @param string $key + * @param callable $callback + * @param callable|null $default + * @return $this|mixed + */ + public function whenFilled($key, callable $callback, callable $default = null) + { + if ($this->filled($key)) { + return $callback(data_get($this->all(), $key)) ?: $this; + } + + if ($default) { + return $default(); + } + + return $this; + } + + /** + * Apply the callback if the validated inputs is missing the given input item key. + * + * @param string $key + * @param callable $callback + * @param callable|null $default + * @return $this|mixed + */ + public function whenMissing($key, callable $callback, callable $default = null) + { + if ($this->missing($key)) { + return $callback(data_get($this->all(), $key)) ?: $this; + } + + if ($default) { + return $default(); + } + + return $this; + } + + /** + * Determine if the given input key is an empty string for "filled". + * + * @param string $key + * @return bool + */ + protected function isEmptyString($key) + { + $value = $this->input($key); + + return ! is_bool($value) && ! is_array($value) && trim((string) $value) === ''; + } + + /** + * Get the keys for all of the input. + * + * @return array + */ + public function keys() + { + return array_keys($this->input()); + } + + /** + * Retrieve an input item from the validated inputs. + * + * @param string|null $key + * @param mixed $default + * @return mixed + */ + public function input($key = null, $default = null) + { + return data_get( + $this->all(), $key, $default + ); + } + + /** + * Retrieve input from the validated inputs as a Stringable instance. + * + * @param string $key + * @param mixed $default + * @return \Illuminate\Support\Stringable + */ + public function str($key, $default = null) + { + return $this->string($key, $default); + } + + /** + * Retrieve input from the validated inputs as a Stringable instance. + * + * @param string $key + * @param mixed $default + * @return \Illuminate\Support\Stringable + */ + public function string($key, $default = null) + { + return str($this->input($key, $default)); + } + + /** + * Retrieve input as a boolean value. + * + * Returns true when value is "1", "true", "on", and "yes". Otherwise, returns false. + * + * @param string|null $key + * @param bool $default + * @return bool + */ + public function boolean($key = null, $default = false) + { + return filter_var($this->input($key, $default), FILTER_VALIDATE_BOOLEAN); + } + + /** + * Retrieve input as an integer value. + * + * @param string $key + * @param int $default + * @return int + */ + public function integer($key, $default = 0) + { + return intval($this->input($key, $default)); + } + + /** + * Retrieve input as a float value. + * + * @param string $key + * @param float $default + * @return float + */ + public function float($key, $default = 0.0) + { + return floatval($this->input($key, $default)); + } + + /** + * Retrieve input from the validated inputs as a Carbon instance. + * + * @param string $key + * @param string|null $format + * @param string|null $tz + * @return \Illuminate\Support\Carbon|null + * + * @throws \Carbon\Exceptions\InvalidFormatException + */ + public function date($key, $format = null, $tz = null) + { + if ($this->isNotFilled($key)) { + return null; + } + + if (is_null($format)) { + return Date::parse($this->input($key), $tz); + } + + return Date::createFromFormat($format, $this->input($key), $tz); + } + + /** + * Retrieve input from the validated inputs as an enum. + * + * @template TEnum + * + * @param string $key + * @param class-string $enumClass + * @return TEnum|null + */ + public function enum($key, $enumClass) + { + if ($this->isNotFilled($key) || + ! enum_exists($enumClass) || + ! method_exists($enumClass, 'tryFrom')) { + return null; + } + + return $enumClass::tryFrom($this->input($key)); + } + + /** + * Dump the validated inputs items and end the script. + * + * @param mixed ...$keys + * @return never + */ + public function dd(...$keys) + { + $this->dump(...$keys); + + exit(1); + } + + /** + * Dump the items. + * + * @param mixed $keys + * @return $this + */ + public function dump($keys = []) + { + $keys = is_array($keys) ? $keys : func_get_args(); + + VarDumper::dump(count($keys) > 0 ? $this->only($keys) : $this->all()); + + return $this; + } } diff --git a/vendor/illuminate/testing/TestResponse.php b/vendor/illuminate/testing/TestResponse.php index ebf06a7d..6a583f13 100644 --- a/vendor/illuminate/testing/TestResponse.php +++ b/vendor/illuminate/testing/TestResponse.php @@ -310,7 +310,7 @@ public function assertHeaderMissing($headerName) public function assertLocation($uri) { PHPUnit::assertEquals( - app('url')->to($uri), app('url')->to($this->headers->get('Location')) + app('url')->to($uri), app('url')->to($this->headers->get('Location', '')) ); return $this; @@ -324,7 +324,7 @@ public function assertLocation($uri) */ public function assertDownload($filename = null) { - $contentDisposition = explode(';', $this->headers->get('content-disposition')); + $contentDisposition = explode(';', $this->headers->get('content-disposition', '')); if (trim($contentDisposition[0]) !== 'attachment') { PHPUnit::fail( diff --git a/vendor/illuminate/view/ViewServiceProvider.php b/vendor/illuminate/view/ViewServiceProvider.php index c40c3b9f..41cd8b93 100644 --- a/vendor/illuminate/view/ViewServiceProvider.php +++ b/vendor/illuminate/view/ViewServiceProvider.php @@ -2,6 +2,7 @@ namespace Illuminate\View; +use Illuminate\Container\Container; use Illuminate\Support\ServiceProvider; use Illuminate\View\Compilers\BladeCompiler; use Illuminate\View\Engines\CompilerEngine; @@ -135,7 +136,7 @@ public function registerEngineResolver() public function registerFileEngine($resolver) { $resolver->register('file', function () { - return new FileEngine($this->app['files']); + return new FileEngine(Container::getInstance()->make('files')); }); } @@ -148,7 +149,7 @@ public function registerFileEngine($resolver) public function registerPhpEngine($resolver) { $resolver->register('php', function () { - return new PhpEngine($this->app['files']); + return new PhpEngine(Container::getInstance()->make('files')); }); } @@ -161,9 +162,14 @@ public function registerPhpEngine($resolver) public function registerBladeEngine($resolver) { $resolver->register('blade', function () { - $compiler = new CompilerEngine($this->app['blade.compiler'], $this->app['files']); + $app = Container::getInstance(); - $this->app->terminating(static function () use ($compiler) { + $compiler = new CompilerEngine( + $app->make('blade.compiler'), + $app->make('files'), + ); + + $app->terminating(static function () use ($compiler) { $compiler->forgetCompiledOrNotExpired(); }); diff --git a/vendor/jean85/pretty-package-versions/composer.json b/vendor/jean85/pretty-package-versions/composer.json index 862cabc4..7bf70376 100644 --- a/vendor/jean85/pretty-package-versions/composer.json +++ b/vendor/jean85/pretty-package-versions/composer.json @@ -3,15 +3,15 @@ "description": "A library to get pretty versions strings of installed dependencies", "type": "library", "require": { - "php": "^7.1|^8.0", - "composer-runtime-api": "^2.0.0" + "php": "^7.4|^8.0", + "composer-runtime-api": "^2.1.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.2", "jean85/composer-provided-replaced-stub-package": "^1.0", "phpstan/phpstan": "^1.4", - "phpunit/phpunit": "^7.5|^8.5|^9.4", - "vimeo/psalm": "^4.3" + "phpunit/phpunit": "^7.5|^8.5|^9.6", + "vimeo/psalm": "^4.3 || ^5.0" }, "license": "MIT", "authors": [ diff --git a/vendor/jean85/pretty-package-versions/src/PrettyVersions.php b/vendor/jean85/pretty-package-versions/src/PrettyVersions.php index 2155d9ef..17b33b82 100644 --- a/vendor/jean85/pretty-package-versions/src/PrettyVersions.php +++ b/vendor/jean85/pretty-package-versions/src/PrettyVersions.php @@ -43,14 +43,6 @@ public static function getRootPackageVersion(): Version protected static function checkProvidedPackages(string $packageName): void { - if (! method_exists(InstalledVersions::class, 'getAllRawData')) { - if (isset(InstalledVersions::getRawData()['versions'][$packageName]['provided'])) { - throw ProvidedPackageException::create($packageName); - } - - return; - } - foreach (InstalledVersions::getAllRawData() as $installed) { if (isset($installed['versions'][$packageName]['provided'])) { throw ProvidedPackageException::create($packageName); @@ -60,14 +52,6 @@ protected static function checkProvidedPackages(string $packageName): void protected static function checkReplacedPackages(string $packageName): void { - if (! method_exists(InstalledVersions::class, 'getAllRawData')) { - if (isset(InstalledVersions::getRawData()['versions'][$packageName]['replaced'])) { - throw ReplacedPackageException::create($packageName); - } - - return; - } - foreach (InstalledVersions::getAllRawData() as $installed) { if (isset($installed['versions'][$packageName]['replaced'])) { throw ReplacedPackageException::create($packageName); diff --git a/vendor/jolicode/jolinotif/CHANGELOG.md b/vendor/jolicode/jolinotif/CHANGELOG.md index f005f398..38ba4562 100644 --- a/vendor/jolicode/jolinotif/CHANGELOG.md +++ b/vendor/jolicode/jolinotif/CHANGELOG.md @@ -1,5 +1,32 @@ # Changes between versions +## Not released yet + +## 2.7.3 (2024-09-30) + +* Fixed SnoreToast and Notifu Windows drivers to be non blocking + +## 2.7.2 (2024-06-01) + +* Changed requirement on psr/log to allow all versions from 1.0 to 3.0 + +## 2.7.1 (2024-05-03) + +* Fixed phar for Windows drivers +* Fixed executable in verbose mode when no driver is available +* Fixed executable to better handle option passed several times + +## 2.7.0 (2024-05-03) + +* Added a new NotifierInterface and DefaultNotifier as the main public API of this package +* Added wsl-notify-send notifier for Windows Subsystem for Linux +* Added libnotify based notifier for Linux through FFI +* Changed TerminalNotifier to use contentImage option for icon instead of appIcon +* Fixed phar missing some dependencies +* Marked most of the classes as internal +* Deprecated all the notifiers classes in favor of the new internal DriverInterface implementations +* Deprecated the NotifierFactory in favor of the new DefaultNotifier class that hide driver implementation details + ## 2.6.0 (2023-12-03) * Deprecated Joli\JoliNotif\Util\OsHelper in favor of jolicode/php-os-helper package diff --git a/vendor/jolicode/jolinotif/CONTRIBUTING.md b/vendor/jolicode/jolinotif/CONTRIBUTING.md index 61480435..b88b1660 100644 --- a/vendor/jolicode/jolinotif/CONTRIBUTING.md +++ b/vendor/jolicode/jolinotif/CONTRIBUTING.md @@ -15,6 +15,16 @@ Here's some tips to make you the best contributor ever: * [Standard code](#standard-code) * [Keeping your fork up-to-date](#keeping-your-fork-up-to-date) +Also, you will need to install Castor to run the tests and fix CS violations. +See [Castor's documentation](https://castor.jolicode.com/getting-started/installation/) +for more information. + +To install all the dependencies and tools, run the following command: + +```shell +castor install +``` + ## Rules Here are a few rules to follow in order to ease code reviews, and discussions @@ -48,16 +58,23 @@ changes, improvements or alternatives may be given). Run the tests using the following script: ```shell -make test +castor phpunit ``` ## Standard code -Use [PHP CS fixer](http://cs.sensiolabs.org/) to make your code compliant with -JoliNotif's coding standards: +Use PHP-CS-Fixer to make your code compliant with JoliNotif's coding standards: + +```shell +castor cs +``` + +## Static analysis + +Use PHPStan to ensure the code is free of errors: ```shell -make cs +castor phpstan ``` ## Keeping your fork up-to-date diff --git a/vendor/jolicode/jolinotif/Makefile b/vendor/jolicode/jolinotif/Makefile deleted file mode 100644 index ca633af4..00000000 --- a/vendor/jolicode/jolinotif/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -cs: ## Fix CS violations - ./vendor/bin/php-cs-fixer fix --verbose - -cs_dry_run: ## Display CS violations without fixing it - ./vendor/bin/php-cs-fixer fix --verbose --dry-run - -test: ## Run test suite - ./vendor/bin/simple-phpunit - -.PHONY: help - -help: ## Display this help - @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' - -.DEFAULT_GOAL := help diff --git a/vendor/jolicode/jolinotif/README.md b/vendor/jolicode/jolinotif/README.md index 8bdbe054..56e68cc8 100644 --- a/vendor/jolicode/jolinotif/README.md +++ b/vendor/jolicode/jolinotif/README.md @@ -11,10 +11,10 @@ # About JoliNotif JoliNotif is a cross-platform PHP library to display desktop notifications. -It works on Linux, Windows or MacOS. +It works on Linux, Windows or macOS. -Requires PHP >= 7.4 (support for PHP 5 was available in version 1.x, for PHP 7.0 -and 7.1 in version < 2.1.0, for PHP 7.2 and 7.3 in version < 2.4.0). +Requires PHP >= 8.1 (support for PHP 5 was available in version 1.x, for PHP 7.0 +and 7.1 in version < 2.1.0, for PHP 7.2 and 7.3 in version < 2.4.0, for PHP < 8.0 in version 2.6.0). > [!NOTE] > This library can not be used in a web context (FPM or equivalent). Use @@ -30,17 +30,13 @@ composer require "jolicode/jolinotif" ## Usage -Use the `NotifierFactory` to create the correct `Notifier` (adapted to your OS), -then use it to send your notification: - ```php include __DIR__.'/vendor/autoload.php'; use Joli\JoliNotif\Notification; -use Joli\JoliNotif\NotifierFactory; +use Joli\JoliNotif\DefaultNotifier; -// Create a Notifier -$notifier = NotifierFactory::create(); +$notifier = new DefaultNotifier(); // Create your notification $notification = @@ -48,8 +44,8 @@ $notification = ->setTitle('Notification title') ->setBody('This is the body of your notification') ->setIcon(__DIR__.'/path/to/your/icon.png') - ->addOption('subtitle', 'This is a subtitle') // Only works on macOS (AppleScriptNotifier) - ->addOption('sound', 'Frog') // Only works on macOS (AppleScriptNotifier) + ->addOption('subtitle', 'This is a subtitle') // Only works on macOS (AppleScriptDriver) + ->addOption('sound', 'Frog') // Only works on macOS (AppleScriptDriver) ; // Send it @@ -68,7 +64,7 @@ Discover more by reading the docs: * [Basic usage](doc/01-basic-usage.md) * [Notification](doc/02-notification.md) -* [Notifier](doc/03-notifier.md) +* [Drivers](doc/03-drivers.md) * [CRON usage](doc/04-cron-usage.md) * [CLI usage](doc/05-cli-usage.md) diff --git a/vendor/jolicode/jolinotif/composer.json b/vendor/jolicode/jolinotif/composer.json index 8945db0d..429ded04 100644 --- a/vendor/jolicode/jolinotif/composer.json +++ b/vendor/jolicode/jolinotif/composer.json @@ -23,13 +23,17 @@ "require": { "php": ">=8.1", "jolicode/php-os-helper": "^0.1.0", - "symfony/process": "^5.4 || ^6.0 || ^7.0" + "psr/log": "^1.0 || ^2.0 || ^3.0", + "symfony/process": "^5.4 || ^6.0 || ^7.0", + "symfony/deprecation-contracts": "^3" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.13", "symfony/finder": "^5.4 || ^6.0 || ^7.0", "symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0" }, + "suggest": { + "ext-ffi": "Needed to send notifications via libnotify on Linux" + }, "bin": [ "jolinotif" ], diff --git a/vendor/jolicode/jolinotif/doc/01-basic-usage.md b/vendor/jolicode/jolinotif/doc/01-basic-usage.md index 7dddf8b2..b722eb73 100644 --- a/vendor/jolicode/jolinotif/doc/01-basic-usage.md +++ b/vendor/jolicode/jolinotif/doc/01-basic-usage.md @@ -1,31 +1,38 @@ # Basic usage -## Create a notifier +## Create a notifier and sending a notification -JoliNotif provides a `NotifierFactory` which creates the best supported -notifier according to your platform. You don't have to care if you're running -on Linux, Windows or Mac OS: +JoliNotif provides a `DefaultNotifier` class which is the main entrypoint of +the library. It's main goal is to provide a simple way to send a desktop +notification without having to care about the platform you're running on. It +will work whether you're on Linux, Windows or macOS. ```php -use Joli\JoliNotif\NotifierFactory; +use Joli\JoliNotif\DefaultNotifier; +use Joli\JoliNotif\Notification; + +$notifier = new DefaultNotifier(); -$notifier = NotifierFactory::create(); +$notifier->send(new Notification()); ``` -The factory use the notifier's priority to determine the best notifier to use. -For example some notifier has a low priority because they don't support some -notification options. The best notifier will then be returned. +And you're done! + +Internally, the notifier will use each driver's priority to determine the +best one available on your system. +For example, some driver have a low priority because they don't support some +notification options. So if a better driver is available, it will be used. -> **Note** -> The factory now returns a NullNotifier instead of null when no notifier is -> available. You then no longer have to check for null value. +> [!NOTE] +> In case no driver is supported or if an error happens during notification +> sending, the send method will return false. -If you really need to ensure a Notifier is available, you can use the -`createOrThrowException` method. It will return the best notifier available or -throw a `Joli\JoliNotif\Exception\NoSupportedNotifierException` if no one is -available on the current system. +> [!TIP] +> If you want to log when an error happens or if no driver is supported, you +> can also pass an instance of `Psr\Log\LoggerInterface` as the first +> parameter of the `DefaultNotifier`'s constructor. -## Create your notification +## Create and configure your notification Create a notification is as simple as instantiating a `Notification` and setting the option you want to use: @@ -37,29 +44,18 @@ $notification = (new Notification()) ->setBody('The notification body') ->setTitle('The notification title') - ->addOption('subtitle', 'This is a subtitle') // Only works on macOS (AppleScriptNotifier) - ->addOption('sound', 'Frog') // Only works on macOS (AppleScriptNotifier) - ->addOption('url', 'https://google.com') // Only works on macOS (TerminalNotifierNotifier) + ->addOption('subtitle', 'This is a subtitle') // Only works on macOS (AppleScriptDriver) + ->addOption('sound', 'Frog') // Only works on macOS (AppleScriptDriver) + ->addOption('url', 'https://google.com') // Only works on macOS (TerminalNotifierDriver) ; ``` -As you can see, the notification provides a fluent API. - -## Sending the notification - -Now that you get your notification, just send it via the notifier: - -```php -$notifier->send($notification); -``` - -And you're done! - +As you can see, the notification class provides a fluent API. ## Next readings * [Notification](02-notification.md) -* [Notifier](03-notifier.md) +* [Drivers](03-drivers.md) * [CRON usage](04-cron-usage.md) * [CLI usage](05-cli-usage.md) diff --git a/vendor/jolicode/jolinotif/doc/02-notification.md b/vendor/jolicode/jolinotif/doc/02-notification.md index 10727fdb..f8741361 100644 --- a/vendor/jolicode/jolinotif/doc/02-notification.md +++ b/vendor/jolicode/jolinotif/doc/02-notification.md @@ -1,10 +1,10 @@ # Notification `Notification` is the main model of JoliNotif. It contains all the options -that should be applied - if possible - by the notifier. +that should be applied - if possible - by the driver. > **Note** -> Notifiers are designed to handle the options they support and discard not +> Drivers are designed to handle the options they support and discard not > supported ones gracefully without throwing any exception. Currently, only three options are supported but new ones could be added later. @@ -15,12 +15,12 @@ Each option can be set via a setter on the `Notification` class. The body is the main message of the notification that you want to display. > **Note** -> This is the only required option. Notifiers will throw an`InvalidNotificationException` +> This is the only required option. Drivers will throw an`InvalidNotificationException` > if the body is empty or null. ## Title -You can also optionally provide a title. Notifiers will certainly display the +You can also optionally provide a title. Drivers will certainly display the title above the body, in bold. ## Icon @@ -37,17 +37,17 @@ $notification->setIcon(__DIR__.'/Resources/icons/success.png'); > care to extract this icon in your system temp directory to make it accessible > from command line executable. -Not all notifiers support icon but again, you can safely add an icon to your -notification since the notifier will discard it if not supported. +Not all drivers support icon but again, you can safely add an icon to your +notification since the driver will simply discard it if not supported. ## Options with restricted support -Some options are available only on few notifiers. They can be configured +Some options are available only on few drivers. They can be configured through the `addOption` method. ### Subtitle -Only works with AppleScriptNotifier at the moment. +Only works with AppleScriptDriver at the moment. ```php $notification->addOption('subtitle', 'This is a subtitle'); @@ -55,7 +55,7 @@ $notification->addOption('subtitle', 'This is a subtitle'); ### Sound -Only works with AppleScriptNotifier at the moment. +Only works with AppleScriptDriver at the moment. Non-exhaustive list of sounds: Basso, Frog, Hero, Pop, Submarine, Blow, Funk, Morse, Purr, Tink, Bottle, Glass, Ping, Sosumi. @@ -66,7 +66,7 @@ $notification->addOption('sound', 'Frog'); ### Url -Only works with TerminalNotifierNotifier at the moment. +Only works with TerminalNotifierDriver at the moment. ```php $notification->addOption('url', 'https://google.com'); @@ -74,7 +74,7 @@ $notification->addOption('url', 'https://google.com'); ## Next readings -* [Notifier](03-notifier.md) +* [Drivers](03-drivers.md) * [CRON usage](04-cron-usage.md) * [CLI usage](05-cli-usage.md) diff --git a/vendor/jolicode/jolinotif/doc/03-notifier.md b/vendor/jolicode/jolinotif/doc/03-notifier.md deleted file mode 100644 index 486c7f4e..00000000 --- a/vendor/jolicode/jolinotif/doc/03-notifier.md +++ /dev/null @@ -1,126 +0,0 @@ -# Notifier - -## Interface - -All notifiers implement the `Joli\JoliNotif\Notifier` interface. The main -method you will use is `Notifier#send()`: - -```php -interface Notifier -{ - /** - * Send the given notification. - * - * @param Notification $notification - * - * @throws Exception\InvalidNotificationException if the notification is invalid - * - * @return bool - */ - public function send(Notification $notification); -} -``` - -`Notifier#send()` will return true if the command was successfully executed, -false otherwise. - -## Supported notifiers - -Currently, JoliNotif only provides notifiers that use an executable available -on your system. But nothing prevents to add network based notifiers later! :) - -Here is the full list of supported notifiers, grouped by platform: - -### Linux - -#### KDialogNotifier - -This notifier uses the executable `kdialog` (part of the standard KDE 5 Plasma -Desktop installation) which should be installed by default on most Linux -distributions which use the KDE 5 Plasma Desktop such as KUbuntu. - -kdialog can display notifications with a body and a title. It does not support -icons. A default timeout of 5 seconds is hard-coded for the notification as it -needs to be part of the command line. - -#### NotifySendNotifier - -This notifier uses the executable `notify-send` (available in the -`libnotify-bin` package) which should be installed by default on most Linux -distributions. - -notify-send can display notification with a body, a title and an icon. - -### Mac OS - -#### GrowlNotifyNotifier - -This notifier uses the `growlnotify` executable. It can be used when available -alongside growl, which can be installed on Mac OS X. - -growl can display notification with a body, a title and an icon. - -#### TerminalNotifierNotifier - -This notifier uses the `terminal-notifier` executable and works on Mac OS X -10.8 and higher. - -terminal-notifier can display notification with a body and a title. An icon -can only be displayed on Mac OS X 10.9 and higher. - -#### AppleScriptNotifier - -This notifier is based on AppleScript and uses the `osascript` binary. -AppleScript can display notification since Mac OS X 10.9, so this notifier -requires this version or higher. - -AppleScript can display notification with only a body and a title. AppleScript -don't support to set an icon and will always use instead the icon of the -application sending the notification, in our case, the terminal. - -### Windows - -#### SnoreToastNotifier - -This notifier uses the Windows application called SnoreToastNotifier. It works on Windows -8 and higher. Because SnoreToastNotifier is probably not installed on your system, -JoliNotif embed the binaries inside the [bin/snoreToast](bin/snoreToast) directory. - -When you use JoliNotif inside a phar archive, we take care to extract those -binaries in the system temp directory to be able to execute them. - -SnoreToastNotifier can display notification with a body, a title and an icon. - -#### ToasterNotifier - -This notifier uses the Windows application called Toaster. It works on Windows -8 and higher. Because Toaster is probably not installed on your system, -JoliNotif embed the binaries inside the [bin/toaster](bin/toaster) directory. - -When you use JoliNotif inside a phar archive, we take care to extract those -binaries in the system temp directory to be able to execute them. - -Toaster can display notification with a body, a title and an icon. - -#### NotifuNotifier - -This notifier uses the Windows application called Notifu. It works on Windows -7. Because Notifu is probably not installed on your system, JoliNotif embed the -binary inside the [bin/notifu](bin/notifu) directory. - -When you use JoliNotif inside a phar archive, we take care to extract this -binary in the system temp directory to be able to execute it. - -Notifu can display notification with a body, a title and an icon. Sadly, Notifu -can only display icon with the .ico format. - -## Next readings - -* [CRON usage](04-cron-usage.md) -* [CLI usage](05-cli-usage.md) - -Previous pages: - -* [Notification](02-notification.md) -* [Basic usage](01-basic-usage.md) -* [README](../README.md) diff --git a/vendor/jolicode/jolinotif/doc/04-cron-usage.md b/vendor/jolicode/jolinotif/doc/04-cron-usage.md index 9c368995..d21a4663 100644 --- a/vendor/jolicode/jolinotif/doc/04-cron-usage.md +++ b/vendor/jolicode/jolinotif/doc/04-cron-usage.md @@ -2,7 +2,7 @@ ## Configuration for CRON -Cronjobs are usually CLI scripts. But JoliNotif's Unix/Linux notifiers are GUI +Cronjobs are usually CLI scripts. But JoliNotif's Unix/Linux drivers are GUI applications. This means you need to specify the display where the notification will be sent. @@ -24,7 +24,7 @@ cronjob: Previous pages: -* [Notifier](03-notifier.md) +* [Drivers](03-drivers.md) * [Notification](02-notification.md) * [Basic usage](01-basic-usage.md) * [README](../README.md) diff --git a/vendor/jolicode/jolinotif/doc/05-cli-usage.md b/vendor/jolicode/jolinotif/doc/05-cli-usage.md index 79912d8d..19cabf09 100644 --- a/vendor/jolicode/jolinotif/doc/05-cli-usage.md +++ b/vendor/jolicode/jolinotif/doc/05-cli-usage.md @@ -42,6 +42,12 @@ To get help just run: jolinotif --help ``` +To output debug information, add the `--verbose` flag: + +```bash +jolinotif --title "..." --body "..." --verbose +``` + In case of troubles use following format for passing the param: `--param="value"`. For required params (title, body) equality sign and quotes can be omitted. @@ -50,7 +56,7 @@ For required params (title, body) equality sign and quotes can be omitted. Previous pages: * [CRON usage](04-cron-usage.md) -* [Notifier](03-notifier.md) +* [Drivers](03-drivers.md) * [Notification](02-notification.md) * [Basic usage](01-basic-usage.md) * [README](../README.md) diff --git a/vendor/jolicode/jolinotif/example/index.php b/vendor/jolicode/jolinotif/example/index.php index 51ef031d..1388b407 100644 --- a/vendor/jolicode/jolinotif/example/index.php +++ b/vendor/jolicode/jolinotif/example/index.php @@ -9,15 +9,14 @@ * file that was distributed with this source code. */ +use Joli\JoliNotif\DefaultNotifier; use Joli\JoliNotif\Notification; -use Joli\JoliNotif\Notifier\NullNotifier; -use Joli\JoliNotif\NotifierFactory; require __DIR__ . '/../vendor/autoload.php'; -$notifier = NotifierFactory::create(); +$notifier = new DefaultNotifier(); -if ($notifier instanceof NullNotifier) { +if (!$notifier->getDriver()) { echo 'No supported notifier', \PHP_EOL; exit(1); } @@ -31,4 +30,6 @@ $result = $notifier->send($notification); -echo 'Notification ', $result ? 'successfully sent' : 'failed', ' with ', $notifier::class, \PHP_EOL; +$driver = $notifier->getDriver(); + +echo 'Notification ', $result ? 'successfully sent' : 'failed', ' with ', str_replace('Joli\JoliNotif\Driver\\', '', $driver::class), \PHP_EOL; diff --git a/vendor/jolicode/jolinotif/jolinotif b/vendor/jolicode/jolinotif/jolinotif index d0c4df1c..63574435 100644 --- a/vendor/jolicode/jolinotif/jolinotif +++ b/vendor/jolicode/jolinotif/jolinotif @@ -1,8 +1,8 @@ #!/usr/bin/env php false, 'flag' => true, ], + 'verbose' => [ + 'name' => 'verbose', + 'info' => 'Output debug information.', + 'required' => false, + 'flag' => true, + ], ]; - private $arguments = []; - private $command = []; + /** @var array */ + private array $arguments = []; + + private readonly string $command; public function __construct() { $this->command = $_SERVER['argv'][0]; } - public function parse() + public function parse(): void { $options = ''; $longOptions = array_map(function ($rule) { @@ -75,17 +83,33 @@ final class Cli $this->arguments = getopt($options, $longOptions) ?: []; } - public function getOption(string $name) + public function getOption(string $name): mixed { return $this->arguments[$name] ?: false; } - public function hasOption(string $name) + public function getStringOption(string $name): string + { + $option = $this->getOption($name); + + if (is_array($option)) { + throw new Exception("Option --{$name} can be specified only once."); + } + + if (!is_string($option) && !is_numeric($option)) { + // Probably not possible to reach this point + throw new Exception("Invalid type given for option --{$name}."); + } + + return (string) $option; + } + + public function hasOption(string $name): bool { return isset($this->arguments[$name]); } - public function validate() + public function validate(): bool { $valid = true; @@ -94,12 +118,17 @@ final class Cli $this->log("Please specify notification {$rule['name']} with the option --{$rule['name']}"); $valid = false; } + + if ($this->hasOption($rule['name']) && is_array($this->getOption($rule['name']))) { + $this->log("Option --{$rule['name']} can be specified only once."); + $valid = false; + } } return $valid; } - public function showUsage() + public function showUsage(): void { $required = []; $optional = []; @@ -135,12 +164,13 @@ final class Cli } } - public function log(string $message) + public function log(string $message): void { echo $message . PHP_EOL; } - private function formatUsage($name, $rule) + /** @param array{name: string, info: string, required: bool, flag?: bool} $rule */ + private function formatUsage(string $name, array $rule): string { $example = $rule['required'] ? " {$name}" : "=\"{$name}\""; $value = isset($rule['flag']) && $rule['flag'] ? '' : $example; @@ -167,26 +197,37 @@ if (!$cli->validate()) { exit(1); } -$notifier = NotifierFactory::create(); +$notifier = new DefaultNotifier(); $notification = (new Notification()) - ->setTitle($cli->getOption('title')) - ->setBody($cli->getOption('body')); + ->setTitle($cli->getStringOption('title')) + ->setBody($cli->getStringOption('body')); if ($cli->hasOption('icon')) { - $notification->setIcon($cli->getOption('icon')); + $notification->setIcon($cli->getStringOption('icon')); } if ($cli->hasOption('subtitle')) { - $notification->addOption('subtitle', $cli->getOption('subtitle')); + $notification->addOption('subtitle', $cli->getStringOption('subtitle')); } if ($cli->hasOption('sound')) { - $notification->addOption('sound', $cli->getOption('sound')); + $notification->addOption('sound', $cli->getStringOption('sound')); } if ($cli->hasOption('url')) { - $notification->addOption('url', $cli->getOption('url')); + $notification->addOption('url', $cli->getStringOption('url')); +} + +$result = $notifier->send($notification); +$driver = $notifier->getDriver(); + +if ($cli->hasOption('verbose')) { + if (!$driver) { + $cli->log('No driver available to display a notification on your system.'); + } else { + $cli->log(sprintf('Notification %s with %s. ', $result ? 'successfully sent' : 'failed', str_replace('Joli\\JoliNotif\\Driver\\', '', $driver::class))); + } } -$notifier->send($notification); +exit($result ? 0 : 1); diff --git a/vendor/jolicode/jolinotif/phpunit.xml.dist b/vendor/jolicode/jolinotif/phpunit.xml.dist index 997f00a2..2babe71c 100644 --- a/vendor/jolicode/jolinotif/phpunit.xml.dist +++ b/vendor/jolicode/jolinotif/phpunit.xml.dist @@ -2,6 +2,7 @@ + diff --git a/vendor/jolicode/jolinotif/src/Exception/Exception.php b/vendor/jolicode/jolinotif/src/Exception/Exception.php index d3ea6b44..aaba09f6 100644 --- a/vendor/jolicode/jolinotif/src/Exception/Exception.php +++ b/vendor/jolicode/jolinotif/src/Exception/Exception.php @@ -11,4 +11,11 @@ namespace Joli\JoliNotif\Exception; -interface Exception {} +trigger_deprecation('jolicode/jolinotif', '2.7', 'The "%s" interface is deprecated and will be removed in 3.0.', Exception::class); + +/** + * @deprecated since 2.7, will be removed in 3.0 + */ +interface Exception +{ +} diff --git a/vendor/jolicode/jolinotif/src/Exception/InvalidNotificationException.php b/vendor/jolicode/jolinotif/src/Exception/InvalidNotificationException.php index 6c4313a3..d445d337 100644 --- a/vendor/jolicode/jolinotif/src/Exception/InvalidNotificationException.php +++ b/vendor/jolicode/jolinotif/src/Exception/InvalidNotificationException.php @@ -13,15 +13,15 @@ use Joli\JoliNotif\Notification; -class InvalidNotificationException extends \LogicException implements Exception +class InvalidNotificationException extends \LogicException implements ExceptionInterface { private Notification $notification; public function __construct( Notification $notification, - $message = '', - $code = 0, - Exception $previous = null + string $message = '', + int $code = 0, + ?\Throwable $previous = null, ) { $this->notification = $notification; diff --git a/vendor/jolicode/jolinotif/src/Exception/NoSupportedNotifierException.php b/vendor/jolicode/jolinotif/src/Exception/NoSupportedNotifierException.php index d3415625..80d6e9b9 100644 --- a/vendor/jolicode/jolinotif/src/Exception/NoSupportedNotifierException.php +++ b/vendor/jolicode/jolinotif/src/Exception/NoSupportedNotifierException.php @@ -11,12 +11,17 @@ namespace Joli\JoliNotif\Exception; +trigger_deprecation('jolicode/jolinotif', '2.7', 'The "%s" class is deprecated and will be removed in 3.0.', NoSupportedNotifierException::class); + +/** + * @deprecated since 2.7, will be removed in 3.0 + */ class NoSupportedNotifierException extends \RuntimeException implements Exception { public function __construct( - $message = 'No supported notifier', - $code = 0, - Exception $previous = null + string $message = 'No supported notifier', + int $code = 0, + ?\Throwable $previous = null, ) { parent::__construct($message, $code, $previous); } diff --git a/vendor/jolicode/jolinotif/src/Notification.php b/vendor/jolicode/jolinotif/src/Notification.php index 937ff1f1..b07156e9 100644 --- a/vendor/jolicode/jolinotif/src/Notification.php +++ b/vendor/jolicode/jolinotif/src/Notification.php @@ -19,6 +19,7 @@ class Notification private ?string $title = null; private ?string $body = null; private ?string $icon = null; + /** @var array */ private array $options = []; public function getTitle(): ?string @@ -62,17 +63,17 @@ public function setIcon(string $icon): self : realpath($icon); } - $this->icon = $icon; + $this->icon = \is_string($icon) ? $icon : null; return $this; } - public function getOption(string $key): ?string + public function getOption(string $key): string|int|null { return $this->options[$key] ?? null; } - public function addOption(string $key, string $option): self + public function addOption(string $key, string|int $option): self { $this->options[$key] = $option; diff --git a/vendor/jolicode/jolinotif/src/Notifier.php b/vendor/jolicode/jolinotif/src/Notifier.php index 2bc53ec3..5f274e61 100644 --- a/vendor/jolicode/jolinotif/src/Notifier.php +++ b/vendor/jolicode/jolinotif/src/Notifier.php @@ -11,27 +11,13 @@ namespace Joli\JoliNotif; -interface Notifier -{ - public const PRIORITY_LOW = 0; - public const PRIORITY_MEDIUM = 50; - public const PRIORITY_HIGH = 100; - - /** - * This method is called to check whether the notifier can be used on the - * current system or not. - */ - public function isSupported(): bool; +use Joli\JoliNotif\Driver\DriverInterface; - /** - * The supported notifier with the higher priority will be preferred. - */ - public function getPriority(): int; +trigger_deprecation('jolicode/jolinotif', '2.7', 'The "%s" interface is deprecated and will be removed in 3.0. Use "%s" instead.', Notifier::class, NotifierInterface::class); - /** - * Send the given notification. - * - * @throws Exception\InvalidNotificationException if the notification is invalid - */ - public function send(Notification $notification): bool; +/** + * @deprecated since 2.7, use NotifierInterface instead + */ +interface Notifier extends NotifierInterface, DriverInterface +{ } diff --git a/vendor/jolicode/jolinotif/src/Notifier/AppleScriptNotifier.php b/vendor/jolicode/jolinotif/src/Notifier/AppleScriptNotifier.php index fe4bb3b0..379b81b0 100644 --- a/vendor/jolicode/jolinotif/src/Notifier/AppleScriptNotifier.php +++ b/vendor/jolicode/jolinotif/src/Notifier/AppleScriptNotifier.php @@ -11,52 +11,16 @@ namespace Joli\JoliNotif\Notifier; -use Joli\JoliNotif\Notification; -use JoliCode\PhpOsHelper\OsHelper; +use Joli\JoliNotif\Driver\AppleScriptDriver; +use Joli\JoliNotif\Notifier; + +trigger_deprecation('jolicode/jolinotif', '2.7', 'The "%s" class is deprecated and will be removed in 3.0.', AppleScriptNotifier::class); /** * This notifier can be used on Mac OS X 10.9+. + * + * @deprecated since 2.7, will be removed in 3.0 */ -class AppleScriptNotifier extends CliBasedNotifier +class AppleScriptNotifier extends AppleScriptDriver implements Notifier { - public function isSupported(): bool - { - if (OsHelper::isMacOS() && version_compare(OsHelper::getMacOSVersion(), '10.9.0', '>=')) { - return parent::isSupported(); - } - - return false; - } - - public function getBinary(): string - { - return 'osascript'; - } - - public function getPriority(): int - { - return static::PRIORITY_LOW; - } - - protected function getCommandLineArguments(Notification $notification): array - { - $script = 'display notification "' . str_replace('"', '\\"', $notification->getBody()) . '"'; - - if ($notification->getTitle()) { - $script .= ' with title "' . str_replace('"', '\\"', $notification->getTitle()) . '"'; - } - - if ($notification->getOption('subtitle')) { - $script .= ' subtitle "' . str_replace('"', '\\"', $notification->getOption('subtitle')) . '"'; - } - - if ($notification->getOption('sound')) { - $script .= ' sound name "' . str_replace('"', '\\"', $notification->getOption('sound')) . '"'; - } - - return [ - '-e', - $script, - ]; - } } diff --git a/vendor/jolicode/jolinotif/src/Notifier/BinaryProvider.php b/vendor/jolicode/jolinotif/src/Notifier/BinaryProvider.php index 1c97b39b..190c7d74 100644 --- a/vendor/jolicode/jolinotif/src/Notifier/BinaryProvider.php +++ b/vendor/jolicode/jolinotif/src/Notifier/BinaryProvider.php @@ -11,9 +11,13 @@ namespace Joli\JoliNotif\Notifier; +trigger_deprecation('jolicode/jolinotif', '2.7', 'The "%s" interface is deprecated and will be removed in 3.0.', BinaryProvider::class); + /** * Interface implemented by notifiers when they provide their own binaries in * case the executable is not natively supported. + * + * @deprecated since 2.7, will be removed in 3.0 */ interface BinaryProvider { @@ -39,6 +43,8 @@ public function getEmbeddedBinary(): string; * used inside a phar archive. * * All paths should be relative to the directory pointed by getRootDir(). + * + * @return list */ public function getExtraFiles(): array; } diff --git a/vendor/jolicode/jolinotif/src/Notifier/CliBasedNotifier.php b/vendor/jolicode/jolinotif/src/Notifier/CliBasedNotifier.php index 12e2bde0..26deb6f7 100644 --- a/vendor/jolicode/jolinotif/src/Notifier/CliBasedNotifier.php +++ b/vendor/jolicode/jolinotif/src/Notifier/CliBasedNotifier.php @@ -11,121 +11,14 @@ namespace Joli\JoliNotif\Notifier; -use Joli\JoliNotif\Exception\InvalidNotificationException; -use Joli\JoliNotif\Notification; +use Joli\JoliNotif\Driver\AbstractCliBasedDriver; use Joli\JoliNotif\Notifier; -use Joli\JoliNotif\Util\PharExtractor; -use JoliCode\PhpOsHelper\OsHelper; -use Symfony\Component\Process\Process; -abstract class CliBasedNotifier implements Notifier -{ - public const SUPPORT_NONE = -1; - public const SUPPORT_UNKNOWN = 0; - public const SUPPORT_NATIVE = 1; - public const SUPPORT_BINARY_PROVIDED = 2; - - /** - * @var int One of the SUPPORT_XXX constants - */ - private int $support = self::SUPPORT_UNKNOWN; - - public function isSupported(): bool - { - if (self::SUPPORT_UNKNOWN !== $this->support) { - return self::SUPPORT_NONE !== $this->support; - } - - if ($this->isBinaryAvailable()) { - $this->support = self::SUPPORT_NATIVE; - - return true; - } - - if ($this instanceof BinaryProvider && $this->canBeUsed()) { - $this->support = self::SUPPORT_BINARY_PROVIDED; - - return true; - } - - $this->support = self::SUPPORT_NONE; - - return false; - } - - public function send(Notification $notification): bool - { - if (!$notification->getBody()) { - throw new InvalidNotificationException($notification, 'Notification body can not be empty'); - } - - $arguments = $this->getCommandLineArguments($notification); - - if (self::SUPPORT_BINARY_PROVIDED === $this->support && $this instanceof BinaryProvider) { - $dir = rtrim($this->getRootDir(), '/') . '/'; - $embeddedBinary = $dir . $this->getEmbeddedBinary(); +trigger_deprecation('jolicode/jolinotif', '2.7', 'The "%s" class is deprecated and will be removed in 3.0.', CliBasedNotifier::class); - if (PharExtractor::isLocatedInsideAPhar($embeddedBinary)) { - $embeddedBinary = PharExtractor::extractFile($embeddedBinary); - - foreach ($this->getExtraFiles() as $file) { - PharExtractor::extractFile($dir . $file); - } - } - - $binary = $embeddedBinary; - } else { - $binary = $this->getBinary(); - } - - $process = new Process(array_merge([$binary], $arguments)); - $process->run(); - - return $this->handleExitCode($process); - } - - /** - * Configure the process to run in order to send the notification. - */ - abstract protected function getCommandLineArguments(Notification $notification): array; - - /** - * Get the binary to check existence. - */ - abstract protected function getBinary(): string; - - /** - * Check whether a binary is available. - */ - protected function isBinaryAvailable(): bool - { - if (OsHelper::isUnix()) { - // Do not use the 'which' program to check if a binary exists. - // See also http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script - $process = new Process([ - 'sh', - '-c', - 'command -v $0', - $this->getBinary(), - ]); - } else { - // 'where' is available on Windows since Server 2003 - $process = new Process([ - 'where', - $this->getBinary(), - ]); - } - - $process->run(); - - return $process->isSuccessful(); - } - - /** - * Return whether the process executed successfully. - */ - protected function handleExitCode(Process $process): bool - { - return 0 === $process->getExitCode(); - } +/** + * @deprecated since 2.7, will be removed in 3.0 + */ +abstract class CliBasedNotifier extends AbstractCliBasedDriver implements Notifier +{ } diff --git a/vendor/jolicode/jolinotif/src/Notifier/GrowlNotifyNotifier.php b/vendor/jolicode/jolinotif/src/Notifier/GrowlNotifyNotifier.php index 56fd362e..94fd5c77 100644 --- a/vendor/jolicode/jolinotif/src/Notifier/GrowlNotifyNotifier.php +++ b/vendor/jolicode/jolinotif/src/Notifier/GrowlNotifyNotifier.php @@ -11,40 +11,16 @@ namespace Joli\JoliNotif\Notifier; -use Joli\JoliNotif\Notification; +use Joli\JoliNotif\Driver\GrowlNotifyDriver; +use Joli\JoliNotif\Notifier; + +trigger_deprecation('jolicode/jolinotif', '2.7', 'The "%s" class is deprecated and will be removed in 3.0.', GrowlNotifyNotifier::class); /** * This notifier can be used on Mac OS X when growlnotify command is available. + * + * @deprecated since 2.7, will be removed in 3.0 */ -class GrowlNotifyNotifier extends CliBasedNotifier +class GrowlNotifyNotifier extends GrowlNotifyDriver implements Notifier { - public function getBinary(): string - { - return 'growlnotify'; - } - - public function getPriority(): int - { - return static::PRIORITY_HIGH; - } - - protected function getCommandLineArguments(Notification $notification): array - { - $arguments = [ - '--message', - $notification->getBody(), - ]; - - if ($notification->getTitle()) { - $arguments[] = '--title'; - $arguments[] = $notification->getTitle(); - } - - if ($notification->getIcon()) { - $arguments[] = '--image'; - $arguments[] = $notification->getIcon(); - } - - return $arguments; - } } diff --git a/vendor/jolicode/jolinotif/src/Notifier/KDialogNotifier.php b/vendor/jolicode/jolinotif/src/Notifier/KDialogNotifier.php index 1ac658d6..afe661d9 100644 --- a/vendor/jolicode/jolinotif/src/Notifier/KDialogNotifier.php +++ b/vendor/jolicode/jolinotif/src/Notifier/KDialogNotifier.php @@ -11,39 +11,17 @@ namespace Joli\JoliNotif\Notifier; -use Joli\JoliNotif\Notification; +use Joli\JoliNotif\Driver\KDialogDriver; +use Joli\JoliNotif\Notifier; + +trigger_deprecation('jolicode/jolinotif', '2.7', 'The "%s" class is deprecated and will be removed in 3.0.', KDialogNotifier::class); /** * This notifier can be used on Linux distributions running KDE, using the command kdialog. * This command is shipped by default with KDE. + * + * @deprecated since 2.7, will be removed in 3.0 */ -class KDialogNotifier extends CliBasedNotifier +class KDialogNotifier extends KDialogDriver implements Notifier { - public function getBinary(): string - { - return 'kdialog'; - } - - public function getPriority(): int - { - return static::PRIORITY_HIGH; - } - - protected function getCommandLineArguments(Notification $notification): array - { - $arguments = []; - - if ($notification->getTitle()) { - $arguments[] = '--title'; - $arguments[] = $notification->getTitle(); - } - - $arguments[] = '--passivepopup'; - $arguments[] = $notification->getBody(); - - // Timeout, in seconds - $arguments[] = 5; - - return $arguments; - } } diff --git a/vendor/jolicode/jolinotif/src/Notifier/NotifuNotifier.php b/vendor/jolicode/jolinotif/src/Notifier/NotifuNotifier.php index 391c5afc..d2f86208 100644 --- a/vendor/jolicode/jolinotif/src/Notifier/NotifuNotifier.php +++ b/vendor/jolicode/jolinotif/src/Notifier/NotifuNotifier.php @@ -11,62 +11,17 @@ namespace Joli\JoliNotif\Notifier; -use Joli\JoliNotif\Notification; -use JoliCode\PhpOsHelper\OsHelper; +use Joli\JoliNotif\Driver\NotifuDriver; +use Joli\JoliNotif\Notifier; + +trigger_deprecation('jolicode/jolinotif', '2.7', 'The "%s" class is deprecated and will be removed in 3.0.', NotifuNotifier::class); /** * This notifier can be used on Windows Seven and provides its own binaries if * not natively available. + * + * @deprecated since 2.7, will be removed in 3.0 */ -class NotifuNotifier extends CliBasedNotifier implements BinaryProvider +class NotifuNotifier extends NotifuDriver implements Notifier { - public function getBinary(): string - { - return 'notifu'; - } - - public function getPriority(): int - { - return static::PRIORITY_LOW; - } - - public function canBeUsed(): bool - { - return OsHelper::isWindows() && OsHelper::isWindowsSeven(); - } - - public function getRootDir(): string - { - return \dirname(__DIR__, 2) . '/bin/notifu'; - } - - public function getEmbeddedBinary(): string - { - return 'notifu.exe'; - } - - public function getExtraFiles(): array - { - return []; - } - - protected function getCommandLineArguments(Notification $notification): array - { - $arguments = [ - '/m', - $notification->getBody(), - ]; - - if ($notification->getTitle()) { - $arguments[] = '/p'; - $arguments[] = $notification->getTitle(); - } - - if ($notification->getIcon()) { - $arguments[] = '/i'; - $arguments[] = $notification->getIcon(); - } - - return $arguments; - } } diff --git a/vendor/jolicode/jolinotif/src/Notifier/NotifySendNotifier.php b/vendor/jolicode/jolinotif/src/Notifier/NotifySendNotifier.php index 672853c3..9eed887b 100644 --- a/vendor/jolicode/jolinotif/src/Notifier/NotifySendNotifier.php +++ b/vendor/jolicode/jolinotif/src/Notifier/NotifySendNotifier.php @@ -11,39 +11,17 @@ namespace Joli\JoliNotif\Notifier; -use Joli\JoliNotif\Notification; +use Joli\JoliNotif\Driver\NotifySendDriver; +use Joli\JoliNotif\Notifier; + +trigger_deprecation('jolicode/jolinotif', '2.7', 'The "%s" class is deprecated and will be removed in 3.0.', NotifySendNotifier::class); /** * This notifier can be used on most Linux distributions, using the command notify-send. * This command is packaged in libnotify-bin. + * + * @deprecated since 2.7, will be removed in 3.0 */ -class NotifySendNotifier extends CliBasedNotifier +class NotifySendNotifier extends NotifySendDriver implements Notifier { - public function getBinary(): string - { - return 'notify-send'; - } - - public function getPriority(): int - { - return static::PRIORITY_MEDIUM; - } - - protected function getCommandLineArguments(Notification $notification): array - { - $arguments = []; - - if ($notification->getIcon()) { - $arguments[] = '--icon'; - $arguments[] = $notification->getIcon(); - } - - if ($notification->getTitle()) { - $arguments[] = $notification->getTitle(); - } - - $arguments[] = $notification->getBody(); - - return $arguments; - } } diff --git a/vendor/jolicode/jolinotif/src/Notifier/NullNotifier.php b/vendor/jolicode/jolinotif/src/Notifier/NullNotifier.php index 6b5a51cc..ba379d3f 100644 --- a/vendor/jolicode/jolinotif/src/Notifier/NullNotifier.php +++ b/vendor/jolicode/jolinotif/src/Notifier/NullNotifier.php @@ -14,6 +14,11 @@ use Joli\JoliNotif\Notification; use Joli\JoliNotif\Notifier; +trigger_deprecation('jolicode/jolinotif', '2.7', 'The "%s" class is deprecated and will be removed in 3.0.', NullNotifier::class); + +/** + * @deprecated since 2.7, will be removed in 3.0 + */ class NullNotifier implements Notifier { public function isSupported(): bool diff --git a/vendor/jolicode/jolinotif/src/Notifier/SnoreToastNotifier.php b/vendor/jolicode/jolinotif/src/Notifier/SnoreToastNotifier.php index 0c007086..f8e50c7d 100644 --- a/vendor/jolicode/jolinotif/src/Notifier/SnoreToastNotifier.php +++ b/vendor/jolicode/jolinotif/src/Notifier/SnoreToastNotifier.php @@ -11,70 +11,17 @@ namespace Joli\JoliNotif\Notifier; -use Joli\JoliNotif\Notification; -use JoliCode\PhpOsHelper\OsHelper; -use Symfony\Component\Process\Process; +use Joli\JoliNotif\Driver\SnoreToastDriver; +use Joli\JoliNotif\Notifier; + +trigger_deprecation('jolicode/jolinotif', '2.7', 'The "%s" class is deprecated and will be removed in 3.0.', SnoreToastNotifier::class); /** * This notifier can be used on Windows Eight and higher and provides its own * binaries if not natively available. + * + * @deprecated since 2.7, will be removed in 3.0 */ -class SnoreToastNotifier extends CliBasedNotifier implements BinaryProvider +class SnoreToastNotifier extends SnoreToastDriver implements Notifier { - public function getBinary(): string - { - return 'snoretoast'; - } - - public function getPriority(): int - { - return static::PRIORITY_MEDIUM; - } - - public function canBeUsed(): bool - { - return - (OsHelper::isWindows() && OsHelper::isWindowsEightOrHigher()) - || OsHelper::isWindowsSubsystemForLinux(); - } - - public function getRootDir(): string - { - return \dirname(__DIR__, 2) . '/bin/snoreToast'; - } - - public function getEmbeddedBinary(): string - { - return 'snoretoast-x86.exe'; - } - - public function getExtraFiles(): array - { - return []; - } - - protected function getCommandLineArguments(Notification $notification): array - { - $arguments = [ - '-m', - $notification->getBody(), - ]; - - if ($notification->getTitle()) { - $arguments[] = '-t'; - $arguments[] = $notification->getTitle(); - } - - if ($notification->getIcon()) { - $arguments[] = '-p'; - $arguments[] = $notification->getIcon(); - } - - return $arguments; - } - - protected function handleExitCode(Process $process): bool - { - return 0 < $process->getExitCode(); - } } diff --git a/vendor/jolicode/jolinotif/src/Notifier/TerminalNotifierNotifier.php b/vendor/jolicode/jolinotif/src/Notifier/TerminalNotifierNotifier.php index 552d9380..d58e2359 100644 --- a/vendor/jolicode/jolinotif/src/Notifier/TerminalNotifierNotifier.php +++ b/vendor/jolicode/jolinotif/src/Notifier/TerminalNotifierNotifier.php @@ -11,47 +11,17 @@ namespace Joli\JoliNotif\Notifier; -use Joli\JoliNotif\Notification; -use JoliCode\PhpOsHelper\OsHelper; +use Joli\JoliNotif\Driver\TerminalNotifierDriver; +use Joli\JoliNotif\Notifier; + +trigger_deprecation('jolicode/jolinotif', '2.7', 'The "%s" class is deprecated and will be removed in 3.0.', TerminalNotifierNotifier::class); /** * This notifier can be used on Mac OS X 10.8, or higher, using the * terminal-notifier binary. + * + * @deprecated since 2.7, will be removed in 3.0 */ -class TerminalNotifierNotifier extends CliBasedNotifier +class TerminalNotifierNotifier extends TerminalNotifierDriver implements Notifier { - public function getBinary(): string - { - return 'terminal-notifier'; - } - - public function getPriority(): int - { - return static::PRIORITY_MEDIUM; - } - - protected function getCommandLineArguments(Notification $notification): array - { - $arguments = [ - '-message', - $notification->getBody(), - ]; - - if ($notification->getTitle()) { - $arguments[] = '-title'; - $arguments[] = $notification->getTitle(); - } - - if ($notification->getIcon() && version_compare(OsHelper::getMacOSVersion(), '10.9.0', '>=')) { - $arguments[] = '-appIcon'; - $arguments[] = $notification->getIcon(); - } - - if ($notification->getOption('url')) { - $arguments[] = '-open'; - $arguments[] = $notification->getOption('url'); - } - - return $arguments; - } } diff --git a/vendor/jolicode/jolinotif/src/Notifier/ToasterNotifier.php b/vendor/jolicode/jolinotif/src/Notifier/ToasterNotifier.php index 25cb8081..d1f936fb 100644 --- a/vendor/jolicode/jolinotif/src/Notifier/ToasterNotifier.php +++ b/vendor/jolicode/jolinotif/src/Notifier/ToasterNotifier.php @@ -12,13 +12,16 @@ namespace Joli\JoliNotif\Notifier; use Joli\JoliNotif\Notification; +use Joli\JoliNotif\Notifier; use JoliCode\PhpOsHelper\OsHelper; +trigger_deprecation('jolicode/jolinotif', '2.3', 'The "%s" class is deprecated and will be removed in 3.0.', ToasterNotifier::class); + /** * This notifier can be used on Windows Eight and higher and provides its own * binaries if not natively available. * - * @deprecated since 2.3, use SnoreToastNotifier instead + * @deprecated since 2.3, will be removed in 3.0 */ class ToasterNotifier extends CliBasedNotifier implements BinaryProvider { @@ -61,7 +64,7 @@ protected function getCommandLineArguments(Notification $notification): array { $arguments = [ '-m', - $notification->getBody(), + $notification->getBody() ?? '', ]; if ($notification->getTitle()) { diff --git a/vendor/jolicode/jolinotif/src/NotifierFactory.php b/vendor/jolicode/jolinotif/src/NotifierFactory.php index 558fc03d..02ff457d 100644 --- a/vendor/jolicode/jolinotif/src/NotifierFactory.php +++ b/vendor/jolicode/jolinotif/src/NotifierFactory.php @@ -15,13 +15,19 @@ use Joli\JoliNotif\Notifier\AppleScriptNotifier; use Joli\JoliNotif\Notifier\GrowlNotifyNotifier; use Joli\JoliNotif\Notifier\KDialogNotifier; +use Joli\JoliNotif\Notifier\LibNotifyNotifier; use Joli\JoliNotif\Notifier\NotifuNotifier; use Joli\JoliNotif\Notifier\NotifySendNotifier; -use Joli\JoliNotif\Notifier\NullNotifier; use Joli\JoliNotif\Notifier\SnoreToastNotifier; use Joli\JoliNotif\Notifier\TerminalNotifierNotifier; +use Joli\JoliNotif\Notifier\WslNotifySendNotifier; use JoliCode\PhpOsHelper\OsHelper; +trigger_deprecation('jolicode/jolinotif', '2.7', 'The "%s" class is deprecated and will be removed in 3.0. Use the %s class directly', NotifierFactory::class, DefaultNotifier::class); + +/** + * @deprecated since 2.7, will be removed in 3.0. Use the DefaultNotifier class directly. + */ class NotifierFactory { /** @@ -29,11 +35,7 @@ class NotifierFactory */ public static function create(array $notifiers = []): Notifier { - if (!$notifiers) { - $notifiers = static::getDefaultNotifiers(); - } - - return self::chooseBestNotifier($notifiers) ?: new NullNotifier(); + return new LegacyNotifier($notifiers); } /** @@ -41,17 +43,13 @@ public static function create(array $notifiers = []): Notifier */ public static function createOrThrowException(array $notifiers = []): Notifier { - if (empty($notifiers)) { - $notifiers = static::getDefaultNotifiers(); - } + $legacyNotifier = new LegacyNotifier($notifiers); - $bestNotifier = self::chooseBestNotifier($notifiers); - - if (!$bestNotifier) { + if (!$legacyNotifier->getDriver()) { throw new NoSupportedNotifierException(); } - return $bestNotifier; + return $legacyNotifier; } /** @@ -74,6 +72,7 @@ public static function getDefaultNotifiers(): array private static function getUnixNotifiers(): array { return [ + new LibNotifyNotifier(), new GrowlNotifyNotifier(), new TerminalNotifierNotifier(), new AppleScriptNotifier(), @@ -90,29 +89,7 @@ private static function getWindowsNotifiers(): array return [ new SnoreToastNotifier(), new NotifuNotifier(), + new WslNotifySendNotifier(), ]; } - - /** - * @param Notifier[] $notifiers - */ - private static function chooseBestNotifier(array $notifiers): ?Notifier - { - /** @var Notifier|null $bestNotifier */ - $bestNotifier = null; - - foreach ($notifiers as $notifier) { - if (!$notifier->isSupported()) { - continue; - } - - if (null !== $bestNotifier && $bestNotifier->getPriority() >= $notifier->getPriority()) { - continue; - } - - $bestNotifier = $notifier; - } - - return $bestNotifier; - } } diff --git a/vendor/jolicode/jolinotif/src/Util/OsHelper.php b/vendor/jolicode/jolinotif/src/Util/OsHelper.php index 471f4cec..4c54c23e 100644 --- a/vendor/jolicode/jolinotif/src/Util/OsHelper.php +++ b/vendor/jolicode/jolinotif/src/Util/OsHelper.php @@ -13,7 +13,11 @@ use JoliCode\PhpOsHelper\OsHelper as BaseOsHelper; +trigger_deprecation('jolicode/jolinotif', '2.6', 'The "%s" class is deprecated and will be removed in 3.0. Use "%s" from jolicode/php-os-helper instead.', OsHelper::class, BaseOsHelper::class); + /** * @deprecated since 2.6, use OsHelper from jolicode/php-os-helper instead */ -class OsHelper extends BaseOsHelper {} +class OsHelper extends BaseOsHelper +{ +} diff --git a/vendor/jolicode/jolinotif/src/Util/PharExtractor.php b/vendor/jolicode/jolinotif/src/Util/PharExtractor.php index 4e21581b..47cf6b98 100644 --- a/vendor/jolicode/jolinotif/src/Util/PharExtractor.php +++ b/vendor/jolicode/jolinotif/src/Util/PharExtractor.php @@ -11,6 +11,9 @@ namespace Joli\JoliNotif\Util; +/** + * @internal + */ class PharExtractor { /** diff --git a/vendor/jolicode/jolinotif/tests/Notifier/AppleScriptNotifierTest.php b/vendor/jolicode/jolinotif/tests/Notifier/AppleScriptNotifierTest.php index ce08f1e9..8a5db267 100644 --- a/vendor/jolicode/jolinotif/tests/Notifier/AppleScriptNotifierTest.php +++ b/vendor/jolicode/jolinotif/tests/Notifier/AppleScriptNotifierTest.php @@ -15,6 +15,9 @@ use Joli\JoliNotif\Notifier\AppleScriptNotifier; use Joli\JoliNotif\Util\OsHelper; +/** + * @group legacy + */ class AppleScriptNotifierTest extends NotifierTestCase { use CliBasedNotifierTestTrait; diff --git a/vendor/jolicode/jolinotif/tests/Notifier/CliBasedNotifierTestTrait.php b/vendor/jolicode/jolinotif/tests/Notifier/CliBasedNotifierTestTrait.php index f470832b..d17a646b 100644 --- a/vendor/jolicode/jolinotif/tests/Notifier/CliBasedNotifierTestTrait.php +++ b/vendor/jolicode/jolinotif/tests/Notifier/CliBasedNotifierTestTrait.php @@ -131,11 +131,6 @@ public function testSendThrowsExceptionWhenNotificationHasAnEmptyBody() } } - public function getIconDir(): string - { - return realpath(\dirname(__DIR__) . '/fixtures'); - } - abstract protected function getExpectedCommandLineForNotification(): string; abstract protected function getExpectedCommandLineForNotificationWithATitle(): string; diff --git a/vendor/jolicode/jolinotif/tests/Notifier/GrowlNotifyNotifierTest.php b/vendor/jolicode/jolinotif/tests/Notifier/GrowlNotifyNotifierTest.php index a76cc740..96597533 100644 --- a/vendor/jolicode/jolinotif/tests/Notifier/GrowlNotifyNotifierTest.php +++ b/vendor/jolicode/jolinotif/tests/Notifier/GrowlNotifyNotifierTest.php @@ -14,6 +14,9 @@ use Joli\JoliNotif\Notifier; use Joli\JoliNotif\Notifier\GrowlNotifyNotifier; +/** + * @group legacy + */ class GrowlNotifyNotifierTest extends NotifierTestCase { use CliBasedNotifierTestTrait; diff --git a/vendor/jolicode/jolinotif/tests/Notifier/KDialogNotifierTest.php b/vendor/jolicode/jolinotif/tests/Notifier/KDialogNotifierTest.php index 3903f3a1..2626c4dc 100644 --- a/vendor/jolicode/jolinotif/tests/Notifier/KDialogNotifierTest.php +++ b/vendor/jolicode/jolinotif/tests/Notifier/KDialogNotifierTest.php @@ -13,6 +13,9 @@ use Joli\JoliNotif\Notifier; +/** + * @group legacy + */ class KDialogNotifierTest extends NotifierTestCase { use CliBasedNotifierTestTrait; diff --git a/vendor/jolicode/jolinotif/tests/Notifier/NotifierTestCase.php b/vendor/jolicode/jolinotif/tests/Notifier/NotifierTestCase.php index 6b728761..b64471d4 100644 --- a/vendor/jolicode/jolinotif/tests/Notifier/NotifierTestCase.php +++ b/vendor/jolicode/jolinotif/tests/Notifier/NotifierTestCase.php @@ -14,10 +14,18 @@ use Joli\JoliNotif\Notifier; use PHPUnit\Framework\TestCase; +/** + * @group legacy + */ abstract class NotifierTestCase extends TestCase { abstract protected function getNotifier(): Notifier; + protected function getIconDir(): string + { + return realpath(\dirname(__DIR__) . '/fixtures'); + } + /** * Call protected/private method of a class. * diff --git a/vendor/jolicode/jolinotif/tests/Notifier/NotifuNotifierTest.php b/vendor/jolicode/jolinotif/tests/Notifier/NotifuNotifierTest.php index 828657b8..5266fb69 100644 --- a/vendor/jolicode/jolinotif/tests/Notifier/NotifuNotifierTest.php +++ b/vendor/jolicode/jolinotif/tests/Notifier/NotifuNotifierTest.php @@ -14,6 +14,9 @@ use Joli\JoliNotif\Notifier; use Joli\JoliNotif\Notifier\NotifuNotifier; +/** + * @group legacy + */ class NotifuNotifierTest extends NotifierTestCase { use BinaryProviderTestTrait; diff --git a/vendor/jolicode/jolinotif/tests/Notifier/NotifySendNotifierTest.php b/vendor/jolicode/jolinotif/tests/Notifier/NotifySendNotifierTest.php index 70ae1c65..fd91225e 100644 --- a/vendor/jolicode/jolinotif/tests/Notifier/NotifySendNotifierTest.php +++ b/vendor/jolicode/jolinotif/tests/Notifier/NotifySendNotifierTest.php @@ -14,6 +14,9 @@ use Joli\JoliNotif\Notifier; use Joli\JoliNotif\Notifier\NotifySendNotifier; +/** + * @group legacy + */ class NotifySendNotifierTest extends NotifierTestCase { use CliBasedNotifierTestTrait; diff --git a/vendor/jolicode/jolinotif/tests/Notifier/NullNotifierTest.php b/vendor/jolicode/jolinotif/tests/Notifier/NullNotifierTest.php index b59263bd..53700c57 100644 --- a/vendor/jolicode/jolinotif/tests/Notifier/NullNotifierTest.php +++ b/vendor/jolicode/jolinotif/tests/Notifier/NullNotifierTest.php @@ -15,6 +15,9 @@ use Joli\JoliNotif\Notifier; use Joli\JoliNotif\Notifier\NullNotifier; +/** + * @group legacy + */ class NullNotifierTest extends NotifierTestCase { public function testGetPriority() diff --git a/vendor/jolicode/jolinotif/tests/Notifier/SnoreToastNotifierTest.php b/vendor/jolicode/jolinotif/tests/Notifier/SnoreToastNotifierTest.php index 2451e29c..8e255d1a 100644 --- a/vendor/jolicode/jolinotif/tests/Notifier/SnoreToastNotifierTest.php +++ b/vendor/jolicode/jolinotif/tests/Notifier/SnoreToastNotifierTest.php @@ -14,6 +14,9 @@ use Joli\JoliNotif\Notifier; use Joli\JoliNotif\Notifier\SnoreToastNotifier; +/** + * @group legacy + */ class SnoreToastNotifierTest extends NotifierTestCase { use BinaryProviderTestTrait; diff --git a/vendor/jolicode/jolinotif/tests/Notifier/TerminalNotifierNotifierTest.php b/vendor/jolicode/jolinotif/tests/Notifier/TerminalNotifierNotifierTest.php index d5b7d86b..0731b01f 100644 --- a/vendor/jolicode/jolinotif/tests/Notifier/TerminalNotifierNotifierTest.php +++ b/vendor/jolicode/jolinotif/tests/Notifier/TerminalNotifierNotifierTest.php @@ -15,6 +15,9 @@ use Joli\JoliNotif\Notifier\TerminalNotifierNotifier; use Joli\JoliNotif\Util\OsHelper; +/** + * @group legacy + */ class TerminalNotifierNotifierTest extends NotifierTestCase { use CliBasedNotifierTestTrait; @@ -67,7 +70,7 @@ protected function getExpectedCommandLineForNotificationWithAnIcon(): string $iconDir = $this->getIconDir(); return <<getIconDir(); return <<markTestSkipped('This test needs that at least one notifier is supported'); - } - - $this->assertInstanceOf('Joli\\JoliNotif\\Notifier', $notifier); - if (OsHelper::isUnix()) { - $expectedNotifierClasses = [ - GrowlNotifyNotifier::class, - TerminalNotifierNotifier::class, - AppleScriptNotifier::class, - KDialogNotifier::class, - NotifySendNotifier::class, + $expectedDriverClasses = [ + LibNotifyDriver::class, + GrowlNotifyDriver::class, + TerminalNotifierDriver::class, + AppleScriptDriver::class, + KDialogDriver::class, + NotifySendDriver::class, ]; } else { - $expectedNotifierClasses = [ - SnoreToastNotifier::class, - NotifuNotifier::class, + $expectedDriverClasses = [ + SnoreToastDriver::class, + NotifuDriver::class, + WslNotifySendDriver::class, ]; } - $this->assertContains($notifier::class, $expectedNotifierClasses); + $this->assertInstanceOf(LegacyNotifier::class, $notifier); + + $driver = $notifier->getDriver(); + + $this->assertContains($driver::class, $expectedDriverClasses); } public function testCreateUsesGivenNotifiers() @@ -83,7 +99,11 @@ public function testCreateUsesGivenNotifiers() new ConfigurableNotifier(true), ]); - $this->assertInstanceOf('Joli\\JoliNotif\\tests\\fixtures\\ConfigurableNotifier', $notifier); + $this->assertInstanceOf(LegacyNotifier::class, $notifier); + + $driver = $notifier->getDriver(); + + $this->assertInstanceOf(ConfigurableNotifier::class, $driver); } public function testCreateWithNoSupportedNotifiersReturnsANullNotifier() @@ -93,7 +113,11 @@ public function testCreateWithNoSupportedNotifiersReturnsANullNotifier() new ConfigurableNotifier(false), ]); - $this->assertInstanceOf(NullNotifier::class, $notifier); + $this->assertInstanceOf(LegacyNotifier::class, $notifier); + + $driver = $notifier->getDriver(); + + $this->assertNull($driver); } public function testCreateUsesTheOnlySupportedNotifier() @@ -104,7 +128,11 @@ public function testCreateUsesTheOnlySupportedNotifier() $expectedNotifier, ]); - $this->assertSame($expectedNotifier, $notifier); + $this->assertInstanceOf(LegacyNotifier::class, $notifier); + + $driver = $notifier->getDriver(); + + $this->assertSame($expectedNotifier, $driver); } public function testCreateUsesTheFirstSupportedNotifierWhenNoPrioritiesAreGiven() @@ -121,7 +149,11 @@ public function testCreateUsesTheFirstSupportedNotifierWhenNoPrioritiesAreGiven( $notifier4, ]); - $this->assertSame($notifier2, $notifier); + $this->assertInstanceOf(LegacyNotifier::class, $notifier); + + $driver = $notifier->getDriver(); + + $this->assertSame($notifier2, $driver); } public function testCreateUsesTheBestSupportedNotifier() @@ -140,7 +172,11 @@ public function testCreateUsesTheBestSupportedNotifier() $notifier5, ]); - $this->assertSame($notifier3, $notifier); + $this->assertInstanceOf(LegacyNotifier::class, $notifier); + + $driver = $notifier->getDriver(); + + $this->assertSame($notifier3, $driver); } public function testCreateUsesTheFirstOfTheBestSupportedNotifiers() @@ -159,7 +195,11 @@ public function testCreateUsesTheFirstOfTheBestSupportedNotifiers() $notifier5, ]); - $this->assertSame($notifier3, $notifier); + $this->assertInstanceOf(LegacyNotifier::class, $notifier); + + $driver = $notifier->getDriver(); + + $this->assertSame($notifier3, $driver); } public function testCreateOrThrowExceptionWithNoSupportedNotifiersThrowsException() diff --git a/vendor/jolicode/jolinotif/tests/Util/OsHelperTest.php b/vendor/jolicode/jolinotif/tests/Util/OsHelperTest.php index 6c221964..02d72c3d 100644 --- a/vendor/jolicode/jolinotif/tests/Util/OsHelperTest.php +++ b/vendor/jolicode/jolinotif/tests/Util/OsHelperTest.php @@ -14,6 +14,9 @@ use Joli\JoliNotif\Util\OsHelper; use PHPUnit\Framework\TestCase; +/** + * @group legacy + */ class OsHelperTest extends TestCase { public function testIsUnix() diff --git a/vendor/jolicode/jolinotif/tests/fixtures/ConfigurableNotifier.php b/vendor/jolicode/jolinotif/tests/fixtures/ConfigurableNotifier.php index 82e381cb..f8a2a355 100644 --- a/vendor/jolicode/jolinotif/tests/fixtures/ConfigurableNotifier.php +++ b/vendor/jolicode/jolinotif/tests/fixtures/ConfigurableNotifier.php @@ -14,6 +14,9 @@ use Joli\JoliNotif\Notification; use Joli\JoliNotif\Notifier; +/** + * @deprecated since 2.7, will be removed in 3.0. Use ConfigurableDriver instead. + */ class ConfigurableNotifier implements Notifier { private bool $supported; diff --git a/vendor/jolicode/jolinotif/tools/phar/box.json b/vendor/jolicode/jolinotif/tools/phar/box.json index 74f2a55c..e6bdb688 100644 --- a/vendor/jolicode/jolinotif/tools/phar/box.json +++ b/vendor/jolicode/jolinotif/tools/phar/box.json @@ -1,25 +1,21 @@ { - "base-path": "../../", - "directories": [ - "bin", - "src" - ], - "files": [ - "LICENSE", - "vendor/autoload.php" - ], - "finder": [ - { - "name": "*.php", - "in": "vendor/composer" - }, - { - "name": "*.php", - "exclude": ["Tests"], - "in": "vendor/symfony/process" - } - ], - "git-version": "package_version", - "main": "jolinotif", - "output": "tools/phar/build/jolinotif.phar" + "base-path": "../../", + "directories": [ + "bin", + "src", + "vendor" + ], + "files": [ + "LICENSE", + "vendor/autoload.php" + ], + "compactors": [ + "KevinGH\\Box\\Compactor\\Php" + ], + "annotations": false, + "compression": "GZ", + "check-requirements": false, + "git-version": "package_version", + "main": "jolinotif", + "output": "tools/phar/build/jolinotif.phar" } diff --git a/vendor/jolicode/jolinotif/tools/phar/composer.json b/vendor/jolicode/jolinotif/tools/phar/composer.json index 8ada7a54..504c906e 100644 --- a/vendor/jolicode/jolinotif/tools/phar/composer.json +++ b/vendor/jolicode/jolinotif/tools/phar/composer.json @@ -1,21 +1,23 @@ { - "name": "jolicode/jolinotif-phar", - "description": "Tooling for building JoliNotif PHAR", + "name": "jolicode/castor-phar", + "description": "Tooling for building Castor phar", "type": "project", "license": "MIT", "authors": [ { - "name": "Loïck Piera", - "email": "pyrech@gmail.com" + "name": "Joel Wurtz", + "email": "jwurtz@jolicode.com" } ], "require": { - "humbug/box": "^4.3.8", - "humbug/php-scoper": "^0.18.3" + "humbug/box": ">=4.5.1" }, "config": { "optimize-autoloader": true, "preferred-install": "dist", - "sort-packages": true + "sort-packages": true, + "platform": { + "php": "8.1" + } } } diff --git a/vendor/jolicode/jolinotif/tools/phar/composer.lock b/vendor/jolicode/jolinotif/tools/phar/composer.lock index 39fa9032..a8982eb3 100644 --- a/vendor/jolicode/jolinotif/tools/phar/composer.lock +++ b/vendor/jolicode/jolinotif/tools/phar/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "81bc3c03a24fddd734cc28bf0ac21f37", + "content-hash": "2bb16fda82ca62f8463eb0d3fbbfcdce", "packages": [ { "name": "amphp/amp", - "version": "v2.6.2", + "version": "v2.6.4", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb" + "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "url": "https://api.github.com/repos/amphp/amp/zipball/ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", + "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", "shasum": "" }, "require": { @@ -29,8 +29,8 @@ "ext-json": "*", "jetbrains/phpstorm-stubs": "^2019.3", "phpunit/phpunit": "^7 | ^8 | ^9", - "psalm/phar": "^3.11@dev", - "react/promise": "^2" + "react/promise": "^2", + "vimeo/psalm": "^3.12" }, "type": "library", "extra": { @@ -85,7 +85,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.2" + "source": "https://github.com/amphp/amp/tree/v2.6.4" }, "funding": [ { @@ -93,7 +93,7 @@ "type": "github" } ], - "time": "2022-02-20T17:52:18+00:00" + "time": "2024-03-21T18:52:26+00:00" }, { "name": "amphp/byte-stream", @@ -306,16 +306,16 @@ }, { "name": "amphp/parser", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/amphp/parser.git", - "reference": "ff1de4144726c5dad5fab97f66692ebe8de3e151" + "reference": "3cf1f8b32a0171d4b1bed93d25617637a77cded7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/parser/zipball/ff1de4144726c5dad5fab97f66692ebe8de3e151", - "reference": "ff1de4144726c5dad5fab97f66692ebe8de3e151", + "url": "https://api.github.com/repos/amphp/parser/zipball/3cf1f8b32a0171d4b1bed93d25617637a77cded7", + "reference": "3cf1f8b32a0171d4b1bed93d25617637a77cded7", "shasum": "" }, "require": { @@ -356,7 +356,7 @@ ], "support": { "issues": "https://github.com/amphp/parser/issues", - "source": "https://github.com/amphp/parser/tree/v1.1.0" + "source": "https://github.com/amphp/parser/tree/v1.1.1" }, "funding": [ { @@ -364,26 +364,26 @@ "type": "github" } ], - "time": "2022-12-30T18:08:47+00:00" + "time": "2024-03-21T19:16:53+00:00" }, { "name": "amphp/process", - "version": "v1.1.4", + "version": "v1.1.6", "source": { "type": "git", "url": "https://github.com/amphp/process.git", - "reference": "76e9495fd6818b43a20167cb11d8a67f7744ee0f" + "reference": "2cd38052ddb200dcd73d34d8e06654dadb101e7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/process/zipball/76e9495fd6818b43a20167cb11d8a67f7744ee0f", - "reference": "76e9495fd6818b43a20167cb11d8a67f7744ee0f", + "url": "https://api.github.com/repos/amphp/process/zipball/2cd38052ddb200dcd73d34d8e06654dadb101e7c", + "reference": "2cd38052ddb200dcd73d34d8e06654dadb101e7c", "shasum": "" }, "require": { "amphp/amp": "^2", "amphp/byte-stream": "^1.4", - "php": ">=7" + "php": ">=7.1" }, "require-dev": { "amphp/php-cs-fixer-config": "dev-master", @@ -421,7 +421,7 @@ "homepage": "https://github.com/amphp/process", "support": { "issues": "https://github.com/amphp/process/issues", - "source": "https://github.com/amphp/process/tree/v1.1.4" + "source": "https://github.com/amphp/process/tree/v1.1.6" }, "funding": [ { @@ -429,7 +429,7 @@ "type": "github" } ], - "time": "2022-07-06T23:50:12+00:00" + "time": "2024-03-21T19:24:36+00:00" }, { "name": "amphp/serialization", @@ -559,16 +559,16 @@ }, { "name": "composer/pcre", - "version": "3.1.0", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" + "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", + "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", "shasum": "" }, "require": { @@ -610,7 +610,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.0" + "source": "https://github.com/composer/pcre/tree/3.1.3" }, "funding": [ { @@ -626,20 +626,20 @@ "type": "tidelift" } ], - "time": "2022-11-17T09:50:14+00:00" + "time": "2024-03-19T10:26:25+00:00" }, { "name": "composer/semver", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "shasum": "" }, "require": { @@ -689,9 +689,9 @@ "versioning" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.2" + "source": "https://github.com/composer/semver/tree/3.4.0" }, "funding": [ { @@ -707,20 +707,20 @@ "type": "tidelift" } ], - "time": "2022-04-01T19:23:25+00:00" + "time": "2023-08-31T09:50:34+00:00" }, { "name": "composer/xdebug-handler", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "ced299686f41dce890debac69273b47ffe98a40c" + "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", - "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255", + "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255", "shasum": "" }, "require": { @@ -731,7 +731,7 @@ "require-dev": { "phpstan/phpstan": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^6.0" + "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5" }, "type": "library", "autoload": { @@ -755,9 +755,9 @@ "performance" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.4" }, "funding": [ { @@ -773,29 +773,33 @@ "type": "tidelift" } ], - "time": "2022-02-25T21:32:43+00:00" + "time": "2024-03-26T18:29:49+00:00" }, { "name": "doctrine/deprecations", - "version": "v1.0.0", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", "shasum": "" }, "require": { - "php": "^7.1|^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^9", - "phpunit/phpunit": "^7.5|^8.5|^9.5", - "psr/log": "^1|^2|^3" + "phpstan/phpstan": "1.4.10 || 1.10.15", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "0.18.4", + "psr/log": "^1 || ^2 || ^3", + "vimeo/psalm": "4.30.0 || 5.12.0" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -814,9 +818,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" + "source": "https://github.com/doctrine/deprecations/tree/1.1.3" }, - "time": "2022-05-02T15:47:09+00:00" + "time": "2024-01-30T19:34:25+00:00" }, { "name": "fidry/console", @@ -902,18 +906,85 @@ ], "time": "2022-12-18T10:49:34+00:00" }, + { + "name": "fidry/filesystem", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/theofidry/filesystem.git", + "reference": "8303225d289da1c434f6009743fbe9aad852de0c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theofidry/filesystem/zipball/8303225d289da1c434f6009743fbe9aad852de0c", + "reference": "8303225d289da1c434f6009743fbe9aad852de0c", + "shasum": "" + }, + "require": { + "php": "^8.1", + "symfony/filesystem": "^6.4 || ^7.0", + "thecodingmachine/safe": "^2.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.4", + "ergebnis/composer-normalize": "^2.28", + "infection/infection": ">=0.26", + "phpunit/phpunit": "^10.3", + "symfony/finder": "^6.4 || ^7.0" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": false, + "forward-command": false + }, + "branch-alias": { + "dev-main": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Fidry\\FileSystem\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Théo Fidry", + "email": "theo.fidry@gmail.com" + } + ], + "description": "Symfony Filesystem with a few more utilities.", + "keywords": [ + "filesystem" + ], + "support": { + "issues": "https://github.com/theofidry/filesystem/issues", + "source": "https://github.com/theofidry/filesystem/tree/1.2.1" + }, + "funding": [ + { + "url": "https://github.com/theofidry", + "type": "github" + } + ], + "time": "2023-12-10T13:29:09+00:00" + }, { "name": "humbug/box", - "version": "4.3.8", + "version": "4.5.1", "source": { "type": "git", "url": "https://github.com/box-project/box.git", - "reference": "55344067891d8be61e6efa50f7c2e59114f32704" + "reference": "1e10a1e974a831b64dab801d09dffa6acd43bd7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/box-project/box/zipball/55344067891d8be61e6efa50f7c2e59114f32704", - "reference": "55344067891d8be61e6efa50f7c2e59114f32704", + "url": "https://api.github.com/repos/box-project/box/zipball/1e10a1e974a831b64dab801d09dffa6acd43bd7f", + "reference": "1e10a1e974a831b64dab801d09dffa6acd43bd7f", "shasum": "" }, "require": { @@ -921,10 +992,13 @@ "composer-plugin-api": "^2.2", "composer/semver": "^3.3.2", "composer/xdebug-handler": "^3.0.3", + "ext-iconv": "*", + "ext-mbstring": "*", "ext-phar": "*", "ext-sodium": "*", - "fidry/console": "^0.5.3", - "humbug/php-scoper": "^0.18.3", + "fidry/console": "^0.5.3 || ^0.6.0", + "fidry/filesystem": "^1.1", + "humbug/php-scoper": "^0.18.6", "justinrainbow/json-schema": "^5.2.12", "laravel/serializable-closure": "^1.2.2", "nikic/iter": "^2.2", @@ -932,11 +1006,15 @@ "paragonie/constant_time_encoding": "^2.6", "php": "^8.1", "phpdocumentor/reflection-docblock": "^5.3", + "phpdocumentor/type-resolver": "^1.7", "psr/log": "^3.0", + "sebastian/diff": "^4.0", "seld/jsonlint": "^1.9", "symfony/console": "^6.1.7", "symfony/filesystem": "^6.1.5", "symfony/finder": "^6.1.3", + "symfony/polyfill-iconv": "^1.28", + "symfony/polyfill-mbstring": "^1.28", "symfony/process": "^6.1.3", "symfony/var-dumper": "^6.1.6", "webmozart/assert": "^1.11" @@ -949,9 +1027,10 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "ergebnis/composer-normalize": "^2.29", - "fidry/makefile": "^0.2.1", + "fidry/makefile": "^1.0.1", "mikey179/vfsstream": "^1.6.11", - "phpspec/prophecy-phpunit": "^2.0.1", + "phpspec/prophecy": "^1.17", + "phpspec/prophecy-phpunit": "^2.0.2", "phpunit/phpunit": "^9.5.26", "symfony/phpunit-bridge": "^6.1.6", "symfony/yaml": "^6.2", @@ -975,7 +1054,6 @@ }, "autoload": { "files": [ - "src/FileSystem/file_system.php", "src/consts.php", "src/functions.php" ], @@ -1008,39 +1086,40 @@ ], "support": { "issues": "https://github.com/box-project/box/issues", - "source": "https://github.com/box-project/box/tree/4.3.8" + "source": "https://github.com/box-project/box/tree/4.5.1" }, - "time": "2023-03-17T08:30:03+00:00" + "time": "2023-11-04T17:51:11+00:00" }, { "name": "humbug/php-scoper", - "version": "0.18.3", + "version": "0.18.7", "source": { "type": "git", "url": "https://github.com/humbug/php-scoper.git", - "reference": "1a49b88b7961152daf534757137b8f86f67fde23" + "reference": "9386a0af946f175d7a1ebfb68851bc2bb8ad7858" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/humbug/php-scoper/zipball/1a49b88b7961152daf534757137b8f86f67fde23", - "reference": "1a49b88b7961152daf534757137b8f86f67fde23", + "url": "https://api.github.com/repos/humbug/php-scoper/zipball/9386a0af946f175d7a1ebfb68851bc2bb8ad7858", + "reference": "9386a0af946f175d7a1ebfb68851bc2bb8ad7858", "shasum": "" }, "require": { "fidry/console": "^0.5.0", + "fidry/filesystem": "^1.1", "jetbrains/phpstorm-stubs": "^v2022.2", "nikic/php-parser": "^4.12", "php": "^8.1", "symfony/console": "^5.2 || ^6.0", "symfony/filesystem": "^5.2 || ^6.0", "symfony/finder": "^5.2 || ^6.0", - "thecodingmachine/safe": "^1.3 || ^2.0" + "thecodingmachine/safe": "^2.0" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.1", "ergebnis/composer-normalize": "^2.28", - "fidry/makefile": "^0.2.1", - "humbug/box": "^4.0", + "fidry/makefile": "^1.0", + "humbug/box": "^4.5.1", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.0", "symfony/yaml": "^6.1" @@ -1090,9 +1169,9 @@ "description": "Prefixes all PHP namespaces in a file or directory.", "support": { "issues": "https://github.com/humbug/php-scoper/issues", - "source": "https://github.com/humbug/php-scoper/tree/0.18.3" + "source": "https://github.com/humbug/php-scoper/tree/0.18.7" }, - "time": "2023-03-16T22:49:19+00:00" + "time": "2023-11-04T18:01:12+00:00" }, { "name": "jetbrains/phpstorm-stubs", @@ -1144,16 +1223,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.2.12", + "version": "v5.2.13", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60" + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", "shasum": "" }, "require": { @@ -1208,22 +1287,22 @@ ], "support": { "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12" + "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" }, - "time": "2022-04-13T08:02:27+00:00" + "time": "2023-09-26T02:20:38+00:00" }, { "name": "laravel/serializable-closure", - "version": "v1.3.0", + "version": "v1.3.3", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37" + "reference": "3dbf8a8e914634c48d389c1234552666b3d43754" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f23fe9d4e95255dacee1bf3525e0810d1a1b0f37", - "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754", + "reference": "3dbf8a8e914634c48d389c1234552666b3d43754", "shasum": "" }, "require": { @@ -1270,27 +1349,29 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2023-01-30T18:31:20+00:00" + "time": "2023-11-08T14:08:06+00:00" }, { "name": "nikic/iter", - "version": "v2.2.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/nikic/iter.git", - "reference": "d1323929952ddcb0b06439991f93bde3816a39e9" + "reference": "09cd930fa9ff55747f34c7184532a5a1bd2385b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/iter/zipball/d1323929952ddcb0b06439991f93bde3816a39e9", - "reference": "d1323929952ddcb0b06439991f93bde3816a39e9", + "url": "https://api.github.com/repos/nikic/iter/zipball/09cd930fa9ff55747f34c7184532a5a1bd2385b1", + "reference": "09cd930fa9ff55747f34c7184532a5a1bd2385b1", "shasum": "" }, "require": { "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpstan/phpstan": "^1.4", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "vimeo/psalm": "^4.18 || ^5.13" }, "type": "library", "autoload": { @@ -1318,27 +1399,27 @@ ], "support": { "issues": "https://github.com/nikic/iter/issues", - "source": "https://github.com/nikic/iter/tree/v2.2.0" + "source": "https://github.com/nikic/iter/tree/v2.4.0" }, - "time": "2021-08-02T15:04:32+00:00" + "time": "2023-12-10T20:43:19+00:00" }, { "name": "nikic/php-parser", - "version": "v4.15.5", + "version": "v4.19.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e" + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b", + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.1" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", @@ -1374,9 +1455,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1" }, - "time": "2023-05-19T20:20:00+00:00" + "time": "2024-03-17T08:10:35+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -1557,21 +1638,21 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.1", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "dfc078e8af9c99210337325ff5aa152872c98714" + "reference": "153ae662783729388a584b4361f2545e4d841e3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/dfc078e8af9c99210337325ff5aa152872c98714", - "reference": "dfc078e8af9c99210337325ff5aa152872c98714", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", + "reference": "153ae662783729388a584b4361f2545e4d841e3c", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", - "php": "^7.4 || ^8.0", + "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", "phpstan/phpdoc-parser": "^1.13" }, @@ -1609,28 +1690,29 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.1" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" }, - "time": "2023-03-27T19:02:04+00:00" + "time": "2024-02-23T11:10:43+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.21.0", + "version": "1.27.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "6df62b08faef4f899772bc7c3bbabb93d2b7a21c" + "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6df62b08faef4f899772bc7c3bbabb93d2b7a21c", - "reference": "6df62b08faef4f899772bc7c3bbabb93d2b7a21c", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/86e4d5a4b036f8f0be1464522f4c6b584c452757", + "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { + "doctrine/annotations": "^2.0", "nikic/php-parser": "^4.15", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", @@ -1655,9 +1737,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.21.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.27.0" }, - "time": "2023-05-17T13:13:44+00:00" + "time": "2024-03-21T13:14:53+00:00" }, { "name": "psr/container", @@ -1812,18 +1894,84 @@ }, "time": "2021-07-14T16:46:02+00:00" }, + { + "name": "sebastian/diff", + "version": "4.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3", + "symfony/process": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-02T06:30:58+00:00" + }, { "name": "seld/jsonlint", - "version": "1.10.0", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1" + "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/594fd6462aad8ecee0b45ca5045acea4776667f1", - "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9bb7db07b5d66d90f6ebf542f09fc67d800e5259", + "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259", "shasum": "" }, "require": { @@ -1850,7 +1998,7 @@ { "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "homepage": "https://seld.be" } ], "description": "JSON Linter", @@ -1862,7 +2010,7 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.10.0" + "source": "https://github.com/Seldaek/jsonlint/tree/1.10.2" }, "funding": [ { @@ -1874,28 +2022,28 @@ "type": "tidelift" } ], - "time": "2023-05-11T13:16:46+00:00" + "time": "2024-02-07T12:57:50+00:00" }, { "name": "symfony/console", - "version": "v6.2.10", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "12288d9f4500f84a4d02254d4aa968b15488476f" + "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/12288d9f4500f84a4d02254d4aa968b15488476f", - "reference": "12288d9f4500f84a4d02254d4aa968b15488476f", + "url": "https://api.github.com/repos/symfony/console/zipball/a2708a5da5c87d1d0d52937bdeac625df659e11f", + "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f", "shasum": "" }, "require": { "php": ">=8.1", - "symfony/deprecation-contracts": "^2.1|^3", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/service-contracts": "^1.1|^2|^3", - "symfony/string": "^5.4|^6.0" + "symfony/service-contracts": "^2.5|^3", + "symfony/string": "^5.4|^6.0|^7.0" }, "conflict": { "symfony/dependency-injection": "<5.4", @@ -1909,18 +2057,16 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/lock": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0", - "symfony/var-dumper": "^5.4|^6.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -1954,7 +2100,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.2.10" + "source": "https://github.com/symfony/console/tree/v6.4.6" }, "funding": [ { @@ -1970,20 +2116,20 @@ "type": "tidelift" } ], - "time": "2023-04-28T13:37:43+00:00" + "time": "2024-03-29T19:07:53+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.2.1", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e" + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e", - "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", "shasum": "" }, "require": { @@ -1992,7 +2138,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -2021,7 +2167,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" }, "funding": [ { @@ -2037,33 +2183,30 @@ "type": "tidelift" } ], - "time": "2023-03-01T10:25:55+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.2.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd" + "reference": "4e64b49bf370ade88e567de29465762e316e4224" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ad3b6f1e4e2da5690fefe075cd53a238646d8dd", - "reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/4e64b49bf370ade88e567de29465762e316e4224", + "reference": "4e64b49bf370ade88e567de29465762e316e4224", "shasum": "" }, "require": { "php": ">=8.1", "psr/event-dispatcher": "^1" }, - "suggest": { - "symfony/event-dispatcher-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -2100,7 +2243,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.1" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.2" }, "funding": [ { @@ -2116,20 +2259,20 @@ "type": "tidelift" } ], - "time": "2023-03-01T10:32:47+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/filesystem", - "version": "v6.2.10", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "fd588debf7d1bc16a2c84b4b3b71145d9946b894" + "reference": "9919b5509ada52cc7f66f9a35c86a4a29955c9d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/fd588debf7d1bc16a2c84b4b3b71145d9946b894", - "reference": "fd588debf7d1bc16a2c84b4b3b71145d9946b894", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/9919b5509ada52cc7f66f9a35c86a4a29955c9d3", + "reference": "9919b5509ada52cc7f66f9a35c86a4a29955c9d3", "shasum": "" }, "require": { @@ -2163,7 +2306,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.2.10" + "source": "https://github.com/symfony/filesystem/tree/v6.4.6" }, "funding": [ { @@ -2179,27 +2322,27 @@ "type": "tidelift" } ], - "time": "2023-04-18T13:46:08+00:00" + "time": "2024-03-21T19:36:20+00:00" }, { "name": "symfony/finder", - "version": "v6.2.7", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "20808dc6631aecafbe67c186af5dcb370be3a0eb" + "reference": "11d736e97f116ac375a81f96e662911a34cd50ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/20808dc6631aecafbe67c186af5dcb370be3a0eb", - "reference": "20808dc6631aecafbe67c186af5dcb370be3a0eb", + "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce", + "reference": "11d736e97f116ac375a81f96e662911a34cd50ce", "shasum": "" }, "require": { "php": ">=8.1" }, "require-dev": { - "symfony/filesystem": "^6.0" + "symfony/filesystem": "^6.0|^7.0" }, "type": "library", "autoload": { @@ -2227,7 +2370,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.2.7" + "source": "https://github.com/symfony/finder/tree/v6.4.0" }, "funding": [ { @@ -2243,20 +2386,20 @@ "type": "tidelift" } ], - "time": "2023-02-16T09:57:23+00:00" + "time": "2023-10-31T17:30:12+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { @@ -2270,9 +2413,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -2309,7 +2449,87 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-iconv", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-iconv.git", + "reference": "cd4226d140ecd3d0f13d32ed0a4a095ffe871d2f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/cd4226d140ecd3d0f13d32ed0a4a095ffe871d2f", + "reference": "cd4226d140ecd3d0f13d32ed0a4a095ffe871d2f", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-iconv": "*" + }, + "suggest": { + "ext-iconv": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Iconv\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Iconv extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "iconv", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.29.0" }, "funding": [ { @@ -2325,20 +2545,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", "shasum": "" }, "require": { @@ -2349,9 +2569,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -2390,7 +2607,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" }, "funding": [ { @@ -2406,20 +2623,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", "shasum": "" }, "require": { @@ -2430,9 +2647,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -2474,7 +2688,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" }, "funding": [ { @@ -2490,20 +2704,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -2517,9 +2731,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -2557,7 +2768,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -2573,20 +2784,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/process", - "version": "v6.2.10", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "b34cdbc9c5e75d45a3703e63a48ad07aafa8bf2e" + "reference": "710e27879e9be3395de2b98da3f52a946039f297" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/b34cdbc9c5e75d45a3703e63a48ad07aafa8bf2e", - "reference": "b34cdbc9c5e75d45a3703e63a48ad07aafa8bf2e", + "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297", + "reference": "710e27879e9be3395de2b98da3f52a946039f297", "shasum": "" }, "require": { @@ -2618,7 +2829,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.2.10" + "source": "https://github.com/symfony/process/tree/v6.4.4" }, "funding": [ { @@ -2634,36 +2845,33 @@ "type": "tidelift" } ], - "time": "2023-04-18T13:56:57+00:00" + "time": "2024-02-20T12:31:00+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.2.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "a8c9cedf55f314f3a186041d19537303766df09a" + "reference": "11bbf19a0fb7b36345861e85c5768844c552906e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/a8c9cedf55f314f3a186041d19537303766df09a", - "reference": "a8c9cedf55f314f3a186041d19537303766df09a", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/11bbf19a0fb7b36345861e85c5768844c552906e", + "reference": "11bbf19a0fb7b36345861e85c5768844c552906e", "shasum": "" }, "require": { "php": ">=8.1", - "psr/container": "^2.0" + "psr/container": "^1.1|^2.0" }, "conflict": { "ext-psr": "<1.1|>=2" }, - "suggest": { - "symfony/service-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -2703,7 +2911,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.2.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.2" }, "funding": [ { @@ -2719,20 +2927,20 @@ "type": "tidelift" } ], - "time": "2023-03-01T10:32:47+00:00" + "time": "2023-12-19T21:51:00+00:00" }, { "name": "symfony/string", - "version": "v6.2.8", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef" + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/193e83bbd6617d6b2151c37fff10fa7168ebddef", - "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef", + "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", "shasum": "" }, "require": { @@ -2743,14 +2951,14 @@ "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/translation-contracts": "<2.0" + "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/intl": "^6.2", - "symfony/translation-contracts": "^2.0|^3.0", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/intl": "^6.2|^7.0", + "symfony/translation-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -2789,7 +2997,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.2.8" + "source": "https://github.com/symfony/string/tree/v6.4.4" }, "funding": [ { @@ -2805,42 +3013,39 @@ "type": "tidelift" } ], - "time": "2023-03-20T16:06:02+00:00" + "time": "2024-02-01T13:16:41+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.2.10", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "41a750a23412ca76fdbbf5096943b4134272c1ab" + "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/41a750a23412ca76fdbbf5096943b4134272c1ab", - "reference": "41a750a23412ca76fdbbf5096943b4134272c1ab", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/95bd2706a97fb875185b51ecaa6112ec184233d4", + "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4", "shasum": "" }, "require": { "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "phpunit/phpunit": "<5.4.3", "symfony/console": "<5.4" }, "require-dev": { "ext-iconv": "*", - "symfony/console": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0", - "symfony/uid": "^5.4|^6.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^6.3|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/uid": "^5.4|^6.0|^7.0", "twig/twig": "^2.13|^3.0.4" }, - "suggest": { - "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", - "ext-intl": "To show region name in time zone dump", - "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script" - }, "bin": [ "Resources/bin/var-dump-server" ], @@ -2877,7 +3082,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.2.10" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.6" }, "funding": [ { @@ -2893,7 +3098,7 @@ "type": "tidelift" } ], - "time": "2023-04-18T13:46:08+00:00" + "time": "2024-03-19T11:56:30+00:00" }, { "name": "thecodingmachine/safe", @@ -3101,5 +3306,8 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.3.0" + "platform-overrides": { + "php": "8.1" + }, + "plugin-api-version": "2.6.0" } diff --git a/vendor/laravel-zero/foundation/src/Illuminate/Foundation/Application.php b/vendor/laravel-zero/foundation/src/Illuminate/Foundation/Application.php index a11bfe41..bb440bb0 100644 --- a/vendor/laravel-zero/foundation/src/Illuminate/Foundation/Application.php +++ b/vendor/laravel-zero/foundation/src/Illuminate/Foundation/Application.php @@ -39,7 +39,7 @@ class Application extends Container implements ApplicationContract, CachesConfig * * @var string */ - const VERSION = '10.48.4'; + const VERSION = '10.48.8'; /** * Copied from HttpKernelInterface, which this class no longer extends. diff --git a/vendor/laravel-zero/framework/composer.json b/vendor/laravel-zero/framework/composer.json index c61a4749..569e682e 100644 --- a/vendor/laravel-zero/framework/composer.json +++ b/vendor/laravel-zero/framework/composer.json @@ -33,24 +33,24 @@ "illuminate/process": "^10.28", "illuminate/support": "^10.28", "illuminate/testing": "^10.28", - "laravel-zero/foundation": "^10.28", - "league/flysystem": "^3.15.1", - "nunomaduro/collision": "^6.4.0|^7.8.1", - "nunomaduro/laravel-console-summary": "^1.10.0", - "nunomaduro/laravel-console-task": "^1.8", - "nunomaduro/laravel-desktop-notifier": "^2.7", + "laravel-zero/foundation": "^10.48.8", + "league/flysystem": "^3.27.0", + "nunomaduro/collision": "^6.4.0|^7.10.0", + "nunomaduro/laravel-console-summary": "^1.11.1", + "nunomaduro/laravel-console-task": "^1.9", + "nunomaduro/laravel-desktop-notifier": "^2.8.1", "psr/log": "^1.1|^2.0|^3.0", - "ramsey/uuid": "^4.7.4", - "symfony/console": "^6.3.2", - "symfony/error-handler": "^6.3.2", - "symfony/event-dispatcher": "^6.3.2", - "symfony/finder": "^6.3.3", - "symfony/process": "^6.3.2", - "symfony/var-dumper": "^6.3.3", - "vlucas/phpdotenv": "^5.5" + "ramsey/uuid": "^4.7.5", + "symfony/console": "^6.4.6", + "symfony/error-handler": "^6.4.6", + "symfony/event-dispatcher": "^6.4.3", + "symfony/finder": "^6.4.0", + "symfony/process": "^6.4.4", + "symfony/var-dumper": "^6.4.6", + "vlucas/phpdotenv": "^5.6" }, "require-dev": { - "guzzlehttp/guzzle": "^7.7", + "guzzlehttp/guzzle": "^7.8.1", "illuminate/bus": "^10.28", "illuminate/database": "^10.28", "illuminate/http": "^10.28", @@ -58,15 +58,15 @@ "illuminate/queue": "^10.28", "illuminate/redis": "^10.28", "illuminate/view": "^10.28", - "laminas/laminas-text": "^2.10", + "laminas/laminas-text": "^2.11", "laravel-zero/phar-updater": "^1.4", - "laravel/pint": "^1.13.3", - "nunomaduro/laravel-console-dusk": "^1.11", - "nunomaduro/laravel-console-menu": "^3.4", + "laravel/pint": "^1.15.1", + "nunomaduro/laravel-console-dusk": "^1.12", + "nunomaduro/laravel-console-menu": "^3.5", "nunomaduro/termwind": "^1.15.1", - "pestphp/pest": "^2.22.1", - "pestphp/pest-plugin-laravel": "^2.2", - "phpstan/phpstan": "^1.10.38" + "pestphp/pest": "^2.34.7", + "pestphp/pest-plugin-laravel": "^2.3", + "phpstan/phpstan": "^1.10.67" }, "autoload": { "psr-4": { diff --git a/vendor/laravel-zero/framework/src/Application.php b/vendor/laravel-zero/framework/src/Application.php index 17c61ef0..d096a484 100644 --- a/vendor/laravel-zero/framework/src/Application.php +++ b/vendor/laravel-zero/framework/src/Application.php @@ -111,7 +111,7 @@ public function registerConfiguredProviders(): void } /** - * Throw an Console Exception with the given data unless the given condition is true. + * Throw a Console Exception with the given data unless the given condition is true. */ public function abort($code, $message = '', array $headers = []): void { diff --git a/vendor/laravel-zero/framework/src/Bootstrap/BuildLoadEnvironmentVariables.php b/vendor/laravel-zero/framework/src/Bootstrap/BuildLoadEnvironmentVariables.php index 8b7116c4..3a0c45e0 100644 --- a/vendor/laravel-zero/framework/src/Bootstrap/BuildLoadEnvironmentVariables.php +++ b/vendor/laravel-zero/framework/src/Bootstrap/BuildLoadEnvironmentVariables.php @@ -15,13 +15,13 @@ use Dotenv\Dotenv; use LaravelZero\Framework\Application; -use LaravelZero\Framework\Contracts\BoostrapperContract; +use LaravelZero\Framework\Contracts\BootstrapperContract; use LaravelZero\Framework\Providers\Build\Build; /** * @internal */ -final class BuildLoadEnvironmentVariables implements BoostrapperContract +final class BuildLoadEnvironmentVariables implements BootstrapperContract { /** * @var \LaravelZero\Framework\Providers\Build\Build @@ -42,7 +42,7 @@ public function __construct(Build $build) public function bootstrap(Application $app): void { /* - * Override environment variables with the environment file along side the Phar file. + * Override environment variables with the environment file alongside the Phar file. */ if ($this->build->shouldUseEnvironmentFile()) { Dotenv::createMutable($this->build->getDirectoryPath(), $this->build->environmentFile())->load(); diff --git a/vendor/laravel-zero/framework/src/Bootstrap/CoreBindings.php b/vendor/laravel-zero/framework/src/Bootstrap/CoreBindings.php index fda40922..9ed0fdf1 100644 --- a/vendor/laravel-zero/framework/src/Bootstrap/CoreBindings.php +++ b/vendor/laravel-zero/framework/src/Bootstrap/CoreBindings.php @@ -14,13 +14,13 @@ namespace LaravelZero\Framework\Bootstrap; use LaravelZero\Framework\Application; -use LaravelZero\Framework\Contracts\BoostrapperContract; +use LaravelZero\Framework\Contracts\BootstrapperContract; use LaravelZero\Framework\Providers\GitVersion\GitVersionServiceProvider; /** * @internal */ -final class CoreBindings implements BoostrapperContract +final class CoreBindings implements BootstrapperContract { /** * {@inheritdoc} diff --git a/vendor/laravel-zero/framework/src/Bootstrap/LoadConfiguration.php b/vendor/laravel-zero/framework/src/Bootstrap/LoadConfiguration.php index d69c455f..c34fe6a4 100644 --- a/vendor/laravel-zero/framework/src/Bootstrap/LoadConfiguration.php +++ b/vendor/laravel-zero/framework/src/Bootstrap/LoadConfiguration.php @@ -15,12 +15,12 @@ use Illuminate\Console\Application as Artisan; use LaravelZero\Framework\Application; -use LaravelZero\Framework\Contracts\BoostrapperContract; +use LaravelZero\Framework\Contracts\BootstrapperContract; /** * @internal */ -final class LoadConfiguration implements BoostrapperContract +final class LoadConfiguration implements BootstrapperContract { /** * {@inheritdoc} diff --git a/vendor/laravel-zero/framework/src/Bootstrap/LoadEnvironmentVariables.php b/vendor/laravel-zero/framework/src/Bootstrap/LoadEnvironmentVariables.php index 5fd29aab..089c5d9b 100644 --- a/vendor/laravel-zero/framework/src/Bootstrap/LoadEnvironmentVariables.php +++ b/vendor/laravel-zero/framework/src/Bootstrap/LoadEnvironmentVariables.php @@ -16,14 +16,14 @@ use Dotenv\Dotenv; use Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables as BaseLoadEnvironmentVariables; use LaravelZero\Framework\Application; -use LaravelZero\Framework\Contracts\BoostrapperContract; +use LaravelZero\Framework\Contracts\BootstrapperContract; use function class_exists; /** * @internal */ -final class LoadEnvironmentVariables implements BoostrapperContract +final class LoadEnvironmentVariables implements BootstrapperContract { /** * {@inheritdoc} diff --git a/vendor/laravel-zero/framework/src/Bootstrap/RegisterFacades.php b/vendor/laravel-zero/framework/src/Bootstrap/RegisterFacades.php index 02f28707..5a30ef25 100644 --- a/vendor/laravel-zero/framework/src/Bootstrap/RegisterFacades.php +++ b/vendor/laravel-zero/framework/src/Bootstrap/RegisterFacades.php @@ -15,12 +15,12 @@ use Illuminate\Foundation\Bootstrap\RegisterFacades as BaseRegisterFacades; use LaravelZero\Framework\Application; -use LaravelZero\Framework\Contracts\BoostrapperContract; +use LaravelZero\Framework\Contracts\BootstrapperContract; /** * @internal */ -final class RegisterFacades implements BoostrapperContract +final class RegisterFacades implements BootstrapperContract { private $aliases = [ 'App' => \Illuminate\Support\Facades\App::class, diff --git a/vendor/laravel-zero/framework/src/Bootstrap/RegisterProviders.php b/vendor/laravel-zero/framework/src/Bootstrap/RegisterProviders.php index 88e940bb..9fb51159 100644 --- a/vendor/laravel-zero/framework/src/Bootstrap/RegisterProviders.php +++ b/vendor/laravel-zero/framework/src/Bootstrap/RegisterProviders.php @@ -16,7 +16,7 @@ use Illuminate\Foundation\Bootstrap\RegisterProviders as BaseRegisterProviders; use LaravelZero\Framework\Application; use LaravelZero\Framework\Components; -use LaravelZero\Framework\Contracts\BoostrapperContract; +use LaravelZero\Framework\Contracts\BootstrapperContract; use LaravelZero\Framework\Providers; use LaravelZero\Framework\Providers\Collision\CollisionServiceProvider; use LaravelZero\Framework\Providers\CommandRecorder\CommandRecorderServiceProvider; @@ -30,7 +30,7 @@ /** * @internal */ -final class RegisterProviders implements BoostrapperContract +final class RegisterProviders implements BootstrapperContract { /** * Core providers. diff --git a/vendor/laravel-zero/framework/src/Commands/BuildCommand.php b/vendor/laravel-zero/framework/src/Commands/BuildCommand.php index 7443367c..9a1c1151 100644 --- a/vendor/laravel-zero/framework/src/Commands/BuildCommand.php +++ b/vendor/laravel-zero/framework/src/Commands/BuildCommand.php @@ -15,6 +15,7 @@ use Illuminate\Console\Application as Artisan; use Illuminate\Support\Facades\File; +use RuntimeException; use Symfony\Component\Console\Command\SignalableCommandInterface; use Symfony\Component\Console\Helper\ProgressBar; use Symfony\Component\Console\Input\InputInterface; @@ -162,7 +163,13 @@ private function compile(string $name): BuildCommand $this->output->newLine(); - File::move($this->app->basePath($this->getBinary()).'.phar', $this->app->buildsPath($name)); + $pharPath = $this->app->basePath($this->getBinary()).'.phar'; + + if (! File::exists($pharPath)) { + throw new RuntimeException('Failed to compile the application.'); + } + + File::move($pharPath, $this->app->buildsPath($name)); return $this; } diff --git a/vendor/laravel-zero/framework/src/Commands/stubs/console.stub b/vendor/laravel-zero/framework/src/Commands/stubs/console.stub index 78602023..cc40e5af 100644 --- a/vendor/laravel-zero/framework/src/Commands/stubs/console.stub +++ b/vendor/laravel-zero/framework/src/Commands/stubs/console.stub @@ -1,6 +1,6 @@ - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace LaravelZero\Framework\Contracts; - -use LaravelZero\Framework\Application; - -/** - * @internal - */ -interface BoostrapperContract -{ - /** - * Performs a core task that needs to be performed on - * early stages of the framework. - */ - public function bootstrap(Application $app): void; -} diff --git a/vendor/laravel-zero/framework/src/Exceptions/ConsoleException.php b/vendor/laravel-zero/framework/src/Exceptions/ConsoleException.php index 6d0f1aae..647e847e 100644 --- a/vendor/laravel-zero/framework/src/Exceptions/ConsoleException.php +++ b/vendor/laravel-zero/framework/src/Exceptions/ConsoleException.php @@ -40,9 +40,9 @@ final class ConsoleException extends Exception implements ConsoleExceptionContra */ public function __construct( int $exitCode, - string $message = null, + ?string $message = null, array $headers = [], - Exception $previous = null, + ?Exception $previous = null, ?int $code = 0 ) { $this->exitCode = $exitCode; diff --git a/vendor/laravel-zero/framework/src/Providers/CommandRecorder/CommandRecorderRepository.php b/vendor/laravel-zero/framework/src/Providers/CommandRecorder/CommandRecorderRepository.php index f3f09cbf..194f5c01 100644 --- a/vendor/laravel-zero/framework/src/Providers/CommandRecorder/CommandRecorderRepository.php +++ b/vendor/laravel-zero/framework/src/Providers/CommandRecorder/CommandRecorderRepository.php @@ -29,7 +29,7 @@ final class CommandRecorderRepository /** * CommandRecorderRepository constructor. */ - public function __construct(Collection $storage = null) + public function __construct(?Collection $storage = null) { $this->storage = $storage ?? collect(); } diff --git a/vendor/laravel-zero/framework/src/Providers/Composer/Composer.php b/vendor/laravel-zero/framework/src/Providers/Composer/Composer.php index b641c958..8f224ccd 100644 --- a/vendor/laravel-zero/framework/src/Providers/Composer/Composer.php +++ b/vendor/laravel-zero/framework/src/Providers/Composer/Composer.php @@ -72,7 +72,7 @@ public function createProject(string $skeleton, string $projectName, array $opti /** * Runs the provided command on the provided folder. */ - private function run(string $cmd, string $cwd = null): bool + private function run(string $cmd, ?string $cwd = null): bool { $process = Process::fromShellCommandline($cmd, $cwd); diff --git a/vendor/laravel/prompts/composer.json b/vendor/laravel/prompts/composer.json index 97353c9b..9c8fac87 100644 --- a/vendor/laravel/prompts/composer.json +++ b/vendor/laravel/prompts/composer.json @@ -1,6 +1,7 @@ { "name": "laravel/prompts", "type": "library", + "description": "Add beautiful and user-friendly forms to your command-line applications.", "license": "MIT", "autoload": { "psr-4": { diff --git a/vendor/laravel/prompts/src/Concerns/Cursor.php b/vendor/laravel/prompts/src/Concerns/Cursor.php index 1a2f1e17..a4d8d1e2 100644 --- a/vendor/laravel/prompts/src/Concerns/Cursor.php +++ b/vendor/laravel/prompts/src/Concerns/Cursor.php @@ -60,4 +60,20 @@ public function moveCursor(int $x, int $y = 0): void static::writeDirectly($sequence); } + + /** + * Move the cursor to the given column. + */ + public function moveCursorToColumn(int $column): void + { + static::writeDirectly("\e[{$column}G"); + } + + /** + * Move the cursor up by the given number of lines. + */ + public function moveCursorUp(int $lines): void + { + static::writeDirectly("\e[{$lines}A"); + } } diff --git a/vendor/laravel/prompts/src/Concerns/FakesInputOutput.php b/vendor/laravel/prompts/src/Concerns/FakesInputOutput.php index 2df265f1..5bbf53fa 100644 --- a/vendor/laravel/prompts/src/Concerns/FakesInputOutput.php +++ b/vendor/laravel/prompts/src/Concerns/FakesInputOutput.php @@ -27,6 +27,7 @@ public static function fake(array $keys = []): void $mock->shouldReceive('restoreTty')->byDefault(); $mock->shouldReceive('cols')->byDefault()->andReturn(80); $mock->shouldReceive('lines')->byDefault()->andReturn(24); + $mock->shouldReceive('initDimensions')->byDefault(); foreach ($keys as $key) { $mock->shouldReceive('read')->once()->andReturn($key); @@ -34,7 +35,7 @@ public static function fake(array $keys = []): void static::$terminal = $mock; - self::setOutput(new BufferedConsoleOutput()); + self::setOutput(new BufferedConsoleOutput); } /** diff --git a/vendor/laravel/prompts/src/Concerns/Scrolling.php b/vendor/laravel/prompts/src/Concerns/Scrolling.php index f62be7c4..181a825e 100644 --- a/vendor/laravel/prompts/src/Concerns/Scrolling.php +++ b/vendor/laravel/prompts/src/Concerns/Scrolling.php @@ -38,7 +38,7 @@ protected function reduceScrollingToFitTerminal(): void { $reservedLines = ($renderer = $this->getRenderer()) instanceof ScrollingRenderer ? $renderer->reservedLines() : 0; - $this->scroll = min($this->scroll, $this->terminal()->lines() - $reservedLines); + $this->scroll = max(1, min($this->scroll, $this->terminal()->lines() - $reservedLines)); } /** diff --git a/vendor/laravel/prompts/src/Concerns/Termwind.php b/vendor/laravel/prompts/src/Concerns/Termwind.php index 798348c6..301776b1 100644 --- a/vendor/laravel/prompts/src/Concerns/Termwind.php +++ b/vendor/laravel/prompts/src/Concerns/Termwind.php @@ -11,7 +11,7 @@ trait Termwind { protected function termwind(string $html) { - renderUsing($output = new BufferedConsoleOutput()); + renderUsing($output = new BufferedConsoleOutput); render($html); diff --git a/vendor/laravel/prompts/src/Concerns/Themes.php b/vendor/laravel/prompts/src/Concerns/Themes.php index f2fe3b57..bc8afd88 100644 --- a/vendor/laravel/prompts/src/Concerns/Themes.php +++ b/vendor/laravel/prompts/src/Concerns/Themes.php @@ -15,6 +15,7 @@ use Laravel\Prompts\Spinner; use Laravel\Prompts\SuggestPrompt; use Laravel\Prompts\Table; +use Laravel\Prompts\TextareaPrompt; use Laravel\Prompts\TextPrompt; use Laravel\Prompts\Themes\Default\ConfirmPromptRenderer; use Laravel\Prompts\Themes\Default\MultiSearchPromptRenderer; @@ -28,6 +29,7 @@ use Laravel\Prompts\Themes\Default\SpinnerRenderer; use Laravel\Prompts\Themes\Default\SuggestPromptRenderer; use Laravel\Prompts\Themes\Default\TableRenderer; +use Laravel\Prompts\Themes\Default\TextareaPromptRenderer; use Laravel\Prompts\Themes\Default\TextPromptRenderer; trait Themes @@ -45,6 +47,7 @@ trait Themes protected static array $themes = [ 'default' => [ TextPrompt::class => TextPromptRenderer::class, + TextareaPrompt::class => TextareaPromptRenderer::class, PasswordPrompt::class => PasswordPromptRenderer::class, SelectPrompt::class => SelectPromptRenderer::class, MultiSelectPrompt::class => MultiSelectPromptRenderer::class, diff --git a/vendor/laravel/prompts/src/Concerns/Truncation.php b/vendor/laravel/prompts/src/Concerns/Truncation.php index ec40a02b..84cf60e7 100644 --- a/vendor/laravel/prompts/src/Concerns/Truncation.php +++ b/vendor/laravel/prompts/src/Concerns/Truncation.php @@ -17,4 +17,90 @@ protected function truncate(string $string, int $width): string return mb_strwidth($string) <= $width ? $string : (mb_strimwidth($string, 0, $width - 1).'…'); } + + /** + * Multi-byte version of wordwrap. + * + * @param non-empty-string $break + */ + protected function mbWordwrap( + string $string, + int $width = 75, + string $break = "\n", + bool $cut_long_words = false + ): string { + $lines = explode($break, $string); + $result = []; + + foreach ($lines as $originalLine) { + if (mb_strwidth($originalLine) <= $width) { + $result[] = $originalLine; + + continue; + } + + $words = explode(' ', $originalLine); + $line = null; + $lineWidth = 0; + + if ($cut_long_words) { + foreach ($words as $index => $word) { + $characters = mb_str_split($word); + $strings = []; + $str = ''; + + foreach ($characters as $character) { + $tmp = $str.$character; + + if (mb_strwidth($tmp) > $width) { + $strings[] = $str; + $str = $character; + } else { + $str = $tmp; + } + } + + if ($str !== '') { + $strings[] = $str; + } + + $words[$index] = implode(' ', $strings); + } + + $words = explode(' ', implode(' ', $words)); + } + + foreach ($words as $word) { + $tmp = ($line === null) ? $word : $line.' '.$word; + + // Look for zero-width joiner characters (combined emojis) + preg_match('/\p{Cf}/u', $word, $joinerMatches); + + $wordWidth = count($joinerMatches) > 0 ? 2 : mb_strwidth($word); + + $lineWidth += $wordWidth; + + if ($line !== null) { + // Space between words + $lineWidth += 1; + } + + if ($lineWidth <= $width) { + $line = $tmp; + } else { + $result[] = $line; + $line = $word; + $lineWidth = $wordWidth; + } + } + + if ($line !== '') { + $result[] = $line; + } + + $line = null; + } + + return implode($break, $result); + } } diff --git a/vendor/laravel/prompts/src/Concerns/TypedValue.php b/vendor/laravel/prompts/src/Concerns/TypedValue.php index 343e77b8..56d356ad 100644 --- a/vendor/laravel/prompts/src/Concerns/TypedValue.php +++ b/vendor/laravel/prompts/src/Concerns/TypedValue.php @@ -19,7 +19,7 @@ trait TypedValue /** * Track the value as the user types. */ - protected function trackTypedValue(string $default = '', bool $submit = true, ?callable $ignore = null): void + protected function trackTypedValue(string $default = '', bool $submit = true, ?callable $ignore = null, bool $allowNewLine = false): void { $this->typedValue = $default; @@ -27,7 +27,7 @@ protected function trackTypedValue(string $default = '', bool $submit = true, ?c $this->cursorPosition = mb_strlen($this->typedValue); } - $this->on('key', function ($key) use ($submit, $ignore) { + $this->on('key', function ($key) use ($submit, $ignore, $allowNewLine) { if ($key[0] === "\e" || in_array($key, [Key::CTRL_B, Key::CTRL_F, Key::CTRL_A, Key::CTRL_E])) { if ($ignore !== null && $ignore($key)) { return; @@ -51,10 +51,17 @@ protected function trackTypedValue(string $default = '', bool $submit = true, ?c return; } - if ($key === Key::ENTER && $submit) { - $this->submit(); + if ($key === Key::ENTER) { + if ($submit) { + $this->submit(); - return; + return; + } + + if ($allowNewLine) { + $this->typedValue = mb_substr($this->typedValue, 0, $this->cursorPosition).PHP_EOL.mb_substr($this->typedValue, $this->cursorPosition); + $this->cursorPosition++; + } } elseif ($key === Key::BACKSPACE || $key === Key::CTRL_H) { if ($this->cursorPosition === 0) { return; @@ -81,20 +88,20 @@ public function value(): string /** * Add a virtual cursor to the value and truncate if necessary. */ - protected function addCursor(string $value, int $cursorPosition, int $maxWidth): string + protected function addCursor(string $value, int $cursorPosition, ?int $maxWidth = null): string { $before = mb_substr($value, 0, $cursorPosition); $current = mb_substr($value, $cursorPosition, 1); $after = mb_substr($value, $cursorPosition + 1); - $cursor = mb_strlen($current) ? $current : ' '; + $cursor = mb_strlen($current) && $current !== PHP_EOL ? $current : ' '; - $spaceBefore = $maxWidth - mb_strwidth($cursor) - (mb_strwidth($after) > 0 ? 1 : 0); + $spaceBefore = $maxWidth < 0 || $maxWidth === null ? mb_strwidth($before) : $maxWidth - mb_strwidth($cursor) - (mb_strwidth($after) > 0 ? 1 : 0); [$truncatedBefore, $wasTruncatedBefore] = mb_strwidth($before) > $spaceBefore ? [$this->trimWidthBackwards($before, 0, $spaceBefore - 1), true] : [$before, false]; - $spaceAfter = $maxWidth - ($wasTruncatedBefore ? 1 : 0) - mb_strwidth($truncatedBefore) - mb_strwidth($cursor); + $spaceAfter = $maxWidth < 0 || $maxWidth === null ? mb_strwidth($after) : $maxWidth - ($wasTruncatedBefore ? 1 : 0) - mb_strwidth($truncatedBefore) - mb_strwidth($cursor); [$truncatedAfter, $wasTruncatedAfter] = mb_strwidth($after) > $spaceAfter ? [mb_strimwidth($after, 0, $spaceAfter - 1), true] : [$after, false]; @@ -102,6 +109,7 @@ protected function addCursor(string $value, int $cursorPosition, int $maxWidth): return ($wasTruncatedBefore ? $this->dim('…') : '') .$truncatedBefore .$this->inverse($cursor) + .($current === PHP_EOL ? PHP_EOL : '') .$truncatedAfter .($wasTruncatedAfter ? $this->dim('…') : ''); } diff --git a/vendor/laravel/prompts/src/ConfirmPrompt.php b/vendor/laravel/prompts/src/ConfirmPrompt.php index 23b8a97f..3abccf07 100644 --- a/vendor/laravel/prompts/src/ConfirmPrompt.php +++ b/vendor/laravel/prompts/src/ConfirmPrompt.php @@ -2,6 +2,8 @@ namespace Laravel\Prompts; +use Closure; + class ConfirmPrompt extends Prompt { /** @@ -20,6 +22,7 @@ public function __construct( public bool|string $required = false, public mixed $validate = null, public string $hint = '', + public ?Closure $transform = null, ) { $this->confirmed = $default; diff --git a/vendor/laravel/prompts/src/Key.php b/vendor/laravel/prompts/src/Key.php index bfbe2c9a..28d0ddc0 100644 --- a/vendor/laravel/prompts/src/Key.php +++ b/vendor/laravel/prompts/src/Key.php @@ -6,8 +6,12 @@ class Key { const UP = "\e[A"; + const SHIFT_UP = "\e[1;2A"; + const DOWN = "\e[B"; + const SHIFT_DOWN = "\e[1;2B"; + const RIGHT = "\e[C"; const LEFT = "\e[D"; @@ -20,6 +24,8 @@ class Key const LEFT_ARROW = "\eOD"; + const ESCAPE = "\e"; + const DELETE = "\e[3~"; const BACKSPACE = "\177"; @@ -71,11 +77,21 @@ class Key */ const CTRL_A = "\x01"; + /** + * EOF + */ + const CTRL_D = "\x04"; + /** * End */ const CTRL_E = "\x05"; + /** + * Negative affirmation + */ + const CTRL_U = "\x15"; + /** * Checks for the constant values for the given match and returns the match * diff --git a/vendor/laravel/prompts/src/MultiSearchPrompt.php b/vendor/laravel/prompts/src/MultiSearchPrompt.php index 4ba87ce9..083f56b9 100644 --- a/vendor/laravel/prompts/src/MultiSearchPrompt.php +++ b/vendor/laravel/prompts/src/MultiSearchPrompt.php @@ -17,6 +17,11 @@ class MultiSearchPrompt extends Prompt */ protected ?array $matches = null; + /** + * Whether the matches are initially a list. + */ + protected bool $isList; + /** * The selected values. * @@ -37,6 +42,7 @@ public function __construct( public bool|string $required = false, public mixed $validate = null, public string $hint = '', + public ?Closure $transform = null, ) { $this->trackTypedValue(submit: false, ignore: fn ($key) => Key::oneOf([Key::SPACE, Key::HOME, Key::END, Key::CTRL_A, Key::CTRL_E], $key) && $this->highlighted !== null); @@ -45,9 +51,11 @@ public function __construct( $this->on('key', fn ($key) => match ($key) { Key::UP, Key::UP_ARROW, Key::SHIFT_TAB => $this->highlightPrevious(count($this->matches), true), Key::DOWN, Key::DOWN_ARROW, Key::TAB => $this->highlightNext(count($this->matches), true), - Key::oneOf([Key::HOME, Key::CTRL_A], $key) => $this->highlighted !== null ? $this->highlight(0) : null, - Key::oneOf([Key::END, Key::CTRL_E], $key) => $this->highlighted !== null ? $this->highlight(count($this->matches()) - 1) : null, + Key::oneOf(Key::HOME, $key) => $this->highlighted !== null ? $this->highlight(0) : null, + Key::oneOf(Key::END, $key) => $this->highlighted !== null ? $this->highlight(count($this->matches()) - 1) : null, Key::SPACE => $this->highlighted !== null ? $this->toggleHighlighted() : null, + Key::CTRL_A => $this->highlighted !== null ? $this->toggleAll() : null, + Key::CTRL_E => null, Key::ENTER => $this->submit(), Key::LEFT, Key::LEFT_ARROW, Key::RIGHT, Key::RIGHT_ARROW => $this->highlighted = null, default => $this->search(), @@ -96,16 +104,25 @@ public function matches(): array return $this->matches; } - if (strlen($this->typedValue) === 0) { - $matches = ($this->options)($this->typedValue); + $matches = ($this->options)($this->typedValue); + + if (! isset($this->isList) && count($matches) > 0) { + // This needs to be captured the first time we receive matches so + // we know what we're dealing with later if matches is empty. + $this->isList = array_is_list($matches); + } + + if (! isset($this->isList)) { + return $this->matches = []; + } - return $this->matches = [ - ...array_diff($this->values, $matches), - ...$matches, - ]; + if (strlen($this->typedValue) > 0) { + return $this->matches = $matches; } - return $this->matches = ($this->options)($this->typedValue); + return $this->matches = $this->isList + ? [...array_diff(array_values($this->values), $matches), ...$matches] + : array_diff($this->values, $matches) + $matches; } /** @@ -118,12 +135,33 @@ public function visible(): array return array_slice($this->matches(), $this->firstVisible, $this->scroll, preserve_keys: true); } + /** + * Toggle all options. + */ + protected function toggleAll(): void + { + $allMatchesSelected = collect($this->matches)->every(fn ($label, $key) => $this->isList() + ? array_key_exists($label, $this->values) + : array_key_exists($key, $this->values)); + + if ($allMatchesSelected) { + $this->values = array_filter($this->values, fn ($value) => $this->isList() + ? ! in_array($value, $this->matches) + : ! array_key_exists(array_search($value, $this->matches), $this->matches) + ); + } else { + $this->values = $this->isList() + ? array_merge($this->values, array_combine(array_values($this->matches), array_values($this->matches))) + : array_merge($this->values, array_combine(array_keys($this->matches), array_values($this->matches))); + } + } + /** * Toggle the highlighted entry. */ protected function toggleHighlighted(): void { - if (array_is_list($this->matches)) { + if ($this->isList()) { $label = $this->matches[$this->highlighted]; $key = $label; } else { @@ -165,4 +203,12 @@ public function labels(): array { return array_values($this->values); } + + /** + * Whether the matches are initially a list. + */ + public function isList(): bool + { + return $this->isList; + } } diff --git a/vendor/laravel/prompts/src/MultiSelectPrompt.php b/vendor/laravel/prompts/src/MultiSelectPrompt.php index b2f0c704..c28bedf8 100644 --- a/vendor/laravel/prompts/src/MultiSelectPrompt.php +++ b/vendor/laravel/prompts/src/MultiSelectPrompt.php @@ -2,6 +2,7 @@ namespace Laravel\Prompts; +use Closure; use Illuminate\Support\Collection; class MultiSelectPrompt extends Prompt @@ -43,6 +44,7 @@ public function __construct( public bool|string $required = false, public mixed $validate = null, public string $hint = '', + public ?Closure $transform = null, ) { $this->options = $options instanceof Collection ? $options->all() : $options; $this->default = $default instanceof Collection ? $default->all() : $default; @@ -53,9 +55,10 @@ public function __construct( $this->on('key', fn ($key) => match ($key) { Key::UP, Key::UP_ARROW, Key::LEFT, Key::LEFT_ARROW, Key::SHIFT_TAB, Key::CTRL_P, Key::CTRL_B, 'k', 'h' => $this->highlightPrevious(count($this->options)), Key::DOWN, Key::DOWN_ARROW, Key::RIGHT, Key::RIGHT_ARROW, Key::TAB, Key::CTRL_N, Key::CTRL_F, 'j', 'l' => $this->highlightNext(count($this->options)), - Key::oneOf([Key::HOME, Key::CTRL_A], $key) => $this->highlight(0), - Key::oneOf([Key::END, Key::CTRL_E], $key) => $this->highlight(count($this->options) - 1), + Key::oneOf(Key::HOME, $key) => $this->highlight(0), + Key::oneOf(Key::END, $key) => $this->highlight(count($this->options) - 1), Key::SPACE => $this->toggleHighlighted(), + Key::CTRL_A => $this->toggleAll(), Key::ENTER => $this->submit(), default => null, }); @@ -115,6 +118,20 @@ public function isSelected(string $value): bool return in_array($value, $this->values); } + /** + * Toggle all options. + */ + protected function toggleAll(): void + { + if (count($this->values) === count($this->options)) { + $this->values = []; + } else { + $this->values = array_is_list($this->options) + ? array_values($this->options) + : array_keys($this->options); + } + } + /** * Toggle the highlighted entry. */ diff --git a/vendor/laravel/prompts/src/PasswordPrompt.php b/vendor/laravel/prompts/src/PasswordPrompt.php index 31802c1e..41b755a6 100644 --- a/vendor/laravel/prompts/src/PasswordPrompt.php +++ b/vendor/laravel/prompts/src/PasswordPrompt.php @@ -2,6 +2,8 @@ namespace Laravel\Prompts; +use Closure; + class PasswordPrompt extends Prompt { use Concerns\TypedValue; @@ -15,6 +17,7 @@ public function __construct( public bool|string $required = false, public mixed $validate = null, public string $hint = '', + public ?Closure $transform = null, ) { $this->trackTypedValue(); } diff --git a/vendor/laravel/prompts/src/Progress.php b/vendor/laravel/prompts/src/Progress.php index b713dffb..3d2a345f 100644 --- a/vendor/laravel/prompts/src/Progress.php +++ b/vendor/laravel/prompts/src/Progress.php @@ -138,6 +138,14 @@ public function finish(): void $this->resetSignals(); } + /** + * Force the progress bar to re-render. + */ + public function render(): void + { + parent::render(); + } + /** * Update the label. */ diff --git a/vendor/laravel/prompts/src/Prompt.php b/vendor/laravel/prompts/src/Prompt.php index 1f50b102..560bc154 100644 --- a/vendor/laravel/prompts/src/Prompt.php +++ b/vendor/laravel/prompts/src/Prompt.php @@ -3,6 +3,7 @@ namespace Laravel\Prompts; use Closure; +use Laravel\Prompts\Exceptions\FormRevertedException; use Laravel\Prompts\Output\ConsoleOutput; use RuntimeException; use Symfony\Component\Console\Output\OutputInterface; @@ -29,6 +30,11 @@ abstract class Prompt */ public string $error = ''; + /** + * The cancel message displayed when this prompt is cancelled. + */ + public string $cancelMessage = 'Cancelled.'; + /** * The previously rendered frame. */ @@ -44,6 +50,11 @@ abstract class Prompt */ public bool|string $required; + /** + * The transformation callback. + */ + public ?Closure $transform = null; + /** * The validator callback or rules. */ @@ -52,7 +63,7 @@ abstract class Prompt /** * The cancellation callback. */ - protected static Closure $cancelUsing; + protected static ?Closure $cancelUsing; /** * Indicates if the prompt has been validated. @@ -64,6 +75,11 @@ abstract class Prompt */ protected static ?Closure $validateUsing; + /** + * The revert handler from the StepBuilder. + */ + protected static ?Closure $revertUsing = null; + /** * The output instance. */ @@ -125,7 +141,11 @@ public function prompt(): mixed } } - return $this->value(); + if ($key === Key::CTRL_U && self::$revertUsing) { + throw new FormRevertedException; + } + + return $this->transformedValue(); } } } finally { @@ -136,7 +156,7 @@ public function prompt(): mixed /** * Register a callback to be invoked when a user cancels a prompt. */ - public static function cancelUsing(Closure $callback): void + public static function cancelUsing(?Closure $callback): void { static::$cancelUsing = $callback; } @@ -172,7 +192,7 @@ public static function setOutput(OutputInterface $output): void */ protected static function output(): OutputInterface { - return self::$output ??= new ConsoleOutput(); + return self::$output ??= new ConsoleOutput; } /** @@ -192,7 +212,7 @@ protected static function writeDirectly(string $message): void */ public static function terminal(): Terminal { - return static::$terminal ??= new Terminal(); + return static::$terminal ??= new Terminal; } /** @@ -203,11 +223,33 @@ public static function validateUsing(Closure $callback): void static::$validateUsing = $callback; } + /** + * Revert the prompt using the given callback. + * + * @internal + */ + public static function revertUsing(Closure $callback): void + { + static::$revertUsing = $callback; + } + + /** + * Clear any previous revert callback. + * + * @internal + */ + public static function preventReverting(): void + { + static::$revertUsing = null; + } + /** * Render the prompt. */ protected function render(): void { + $this->terminal()->initDimensions(); + $frame = $this->renderTheme(); if ($frame === $this->prevFrame) { @@ -223,35 +265,14 @@ protected function render(): void return; } - $this->resetCursorPosition(); - - // Ensure that the full frame is buffered so subsequent output can see how many trailing newlines were written. - if ($this->state === 'submit') { - $this->eraseDown(); - static::output()->write($frame); - - $this->prevFrame = ''; + $terminalHeight = $this->terminal()->lines(); + $previousFrameHeight = count(explode(PHP_EOL, $this->prevFrame)); + $renderableLines = array_slice(explode(PHP_EOL, $frame), abs(min(0, $terminalHeight - $previousFrameHeight))); - return; - } - - $diff = $this->diffLines($this->prevFrame, $frame); - - if (count($diff) === 1) { // Update the single line that changed. - $diffLine = $diff[0]; - $this->moveCursor(0, $diffLine); - $this->eraseLines(1); - $lines = explode(PHP_EOL, $frame); - static::output()->write($lines[$diffLine]); - $this->moveCursor(0, count($lines) - $diffLine - 1); - } elseif (count($diff) > 1) { // Re-render everything past the first change - $diffLine = $diff[0]; - $this->moveCursor(0, $diffLine); - $this->eraseDown(); - $lines = explode(PHP_EOL, $frame); - $newLines = array_slice($lines, $diffLine); - static::output()->write(implode(PHP_EOL, $newLines)); - } + $this->moveCursorToColumn(1); + $this->moveCursorUp(min($terminalHeight, $previousFrameHeight) - 1); + $this->eraseDown(); + $this->output()->write(implode(PHP_EOL, $renderableLines)); $this->prevFrame = $frame; } @@ -261,47 +282,13 @@ protected function render(): void */ protected function submit(): void { - $this->validate($this->value()); + $this->validate($this->transformedValue()); if ($this->state !== 'error') { $this->state = 'submit'; } } - /** - * Reset the cursor position to the beginning of the previous frame. - */ - private function resetCursorPosition(): void - { - $lines = count(explode(PHP_EOL, $this->prevFrame)) - 1; - - $this->moveCursor(-999, $lines * -1); - } - - /** - * Get the difference between two strings. - * - * @return array - */ - private function diffLines(string $a, string $b): array - { - if ($a === $b) { - return []; - } - - $aLines = explode(PHP_EOL, $a); - $bLines = explode(PHP_EOL, $b); - $diff = []; - - for ($i = 0; $i < max(count($aLines), count($bLines)); $i++) { - if (! isset($aLines[$i]) || ! isset($bLines[$i]) || $aLines[$i] !== $bLines[$i]) { - $diff[] = $i; - } - } - - return $diff; - } - /** * Handle a key press and determine whether to continue. */ @@ -317,6 +304,22 @@ private function handleKeyPress(string $key): bool return false; } + if ($key === Key::CTRL_U) { + if (! self::$revertUsing) { + $this->state = 'error'; + $this->error = 'This cannot be reverted.'; + + return true; + } + + $this->state = 'cancel'; + $this->cancelMessage = 'Reverted.'; + + call_user_func(self::$revertUsing); + + return false; + } + if ($key === Key::CTRL_C) { $this->state = 'cancel'; @@ -324,12 +327,32 @@ private function handleKeyPress(string $key): bool } if ($this->validated) { - $this->validate($this->value()); + $this->validate($this->transformedValue()); } return true; } + /** + * Transform the input. + */ + private function transform(mixed $value): mixed + { + if (is_null($this->transform)) { + return $value; + } + + return call_user_func($this->transform, $value); + } + + /** + * Get the transformed value of the prompt. + */ + protected function transformedValue(): mixed + { + return $this->transform($this->value()); + } + /** * Validate the input. */ diff --git a/vendor/laravel/prompts/src/SearchPrompt.php b/vendor/laravel/prompts/src/SearchPrompt.php index b9b820ce..259b4299 100644 --- a/vendor/laravel/prompts/src/SearchPrompt.php +++ b/vendor/laravel/prompts/src/SearchPrompt.php @@ -31,6 +31,7 @@ public function __construct( public mixed $validate = null, public string $hint = '', public bool|string $required = true, + public ?Closure $transform = null, ) { if ($this->required === false) { throw new InvalidArgumentException('Argument [required] must be true or a string.'); diff --git a/vendor/laravel/prompts/src/SelectPrompt.php b/vendor/laravel/prompts/src/SelectPrompt.php index 081f09c7..8d48a730 100644 --- a/vendor/laravel/prompts/src/SelectPrompt.php +++ b/vendor/laravel/prompts/src/SelectPrompt.php @@ -2,6 +2,7 @@ namespace Laravel\Prompts; +use Closure; use Illuminate\Support\Collection; use InvalidArgumentException; @@ -29,6 +30,7 @@ public function __construct( public mixed $validate = null, public string $hint = '', public bool|string $required = true, + public ?Closure $transform = null, ) { if ($this->required === false) { throw new InvalidArgumentException('Argument [required] must be true or a string.'); diff --git a/vendor/laravel/prompts/src/SuggestPrompt.php b/vendor/laravel/prompts/src/SuggestPrompt.php index 85f2bf7b..73efbdca 100644 --- a/vendor/laravel/prompts/src/SuggestPrompt.php +++ b/vendor/laravel/prompts/src/SuggestPrompt.php @@ -14,7 +14,7 @@ class SuggestPrompt extends Prompt /** * The options for the suggest prompt. * - * @var array|Closure(string): array + * @var array|Closure(string): (array|Collection) */ public array|Closure $options; @@ -28,7 +28,7 @@ class SuggestPrompt extends Prompt /** * Create a new SuggestPrompt instance. * - * @param array|Collection|Closure(string): array $options + * @param array|Collection|Closure(string): (array|Collection) $options */ public function __construct( public string $label, @@ -39,6 +39,7 @@ public function __construct( public bool|string $required = false, public mixed $validate = null, public string $hint = '', + public ?Closure $transform = null, ) { $this->options = $options instanceof Collection ? $options->all() : $options; @@ -91,7 +92,9 @@ public function matches(): array } if ($this->options instanceof Closure) { - return $this->matches = array_values(($this->options)($this->value())); + $matches = ($this->options)($this->value()); + + return $this->matches = array_values($matches instanceof Collection ? $matches->all() : $matches); } return $this->matches = array_values(array_filter($this->options, function ($option) { diff --git a/vendor/laravel/prompts/src/Terminal.php b/vendor/laravel/prompts/src/Terminal.php index 5cda9bb3..631b2a5a 100644 --- a/vendor/laravel/prompts/src/Terminal.php +++ b/vendor/laravel/prompts/src/Terminal.php @@ -2,6 +2,7 @@ namespace Laravel\Prompts; +use ReflectionClass; use RuntimeException; use Symfony\Component\Console\Terminal as SymfonyTerminal; @@ -13,14 +14,17 @@ class Terminal protected ?string $initialTtyMode; /** - * The number of columns in the terminal. + * The Symfony Terminal instance. */ - protected int $cols; + protected SymfonyTerminal $terminal; /** - * The number of lines in the terminal. + * Create a new Terminal instance. */ - protected int $lines; + public function __construct() + { + $this->terminal = new SymfonyTerminal; + } /** * Read a line from the terminal. @@ -59,7 +63,7 @@ public function restoreTty(): void */ public function cols(): int { - return $this->cols ??= (new SymfonyTerminal())->getWidth(); + return $this->terminal->getWidth(); } /** @@ -67,7 +71,17 @@ public function cols(): int */ public function lines(): int { - return $this->lines ??= (new SymfonyTerminal())->getHeight(); + return $this->terminal->getHeight(); + } + + /** + * (Re)initialize the terminal dimensions. + */ + public function initDimensions(): void + { + (new ReflectionClass($this->terminal)) + ->getMethod('initDimensions') + ->invoke($this->terminal); } /** diff --git a/vendor/laravel/prompts/src/TextPrompt.php b/vendor/laravel/prompts/src/TextPrompt.php index 74a41a5e..db63f81b 100644 --- a/vendor/laravel/prompts/src/TextPrompt.php +++ b/vendor/laravel/prompts/src/TextPrompt.php @@ -2,6 +2,8 @@ namespace Laravel\Prompts; +use Closure; + class TextPrompt extends Prompt { use Concerns\TypedValue; @@ -16,6 +18,7 @@ public function __construct( public bool|string $required = false, public mixed $validate = null, public string $hint = '', + public ?Closure $transform = null, ) { $this->trackTypedValue($default); } diff --git a/vendor/laravel/prompts/src/Themes/Default/Concerns/DrawsBoxes.php b/vendor/laravel/prompts/src/Themes/Default/Concerns/DrawsBoxes.php index 2b4567ac..0eaba8ce 100644 --- a/vendor/laravel/prompts/src/Themes/Default/Concerns/DrawsBoxes.php +++ b/vendor/laravel/prompts/src/Themes/Default/Concerns/DrawsBoxes.php @@ -6,6 +6,8 @@ trait DrawsBoxes { + use InteractsWithStrings; + protected int $minWidth = 60; /** @@ -55,44 +57,4 @@ protected function box( return $this; } - - /** - * Get the length of the longest line. - * - * @param array $lines - */ - protected function longest(array $lines, int $padding = 0): int - { - return max( - $this->minWidth, - collect($lines) - ->map(fn ($line) => mb_strwidth($this->stripEscapeSequences($line)) + $padding) - ->max() - ); - } - - /** - * Pad text ignoring ANSI escape sequences. - */ - protected function pad(string $text, int $length): string - { - $rightPadding = str_repeat(' ', max(0, $length - mb_strwidth($this->stripEscapeSequences($text)))); - - return "{$text}{$rightPadding}"; - } - - /** - * Strip ANSI escape sequences from the given text. - */ - protected function stripEscapeSequences(string $text): string - { - // Strip ANSI escape sequences. - $text = preg_replace("/\e[^m]*m/", '', $text); - - // Strip Symfony named style tags. - $text = preg_replace("/<(info|comment|question|error)>(.*?)<\/\\1>/", '$2', $text); - - // Strip Symfony inline style tags. - return preg_replace("/<(?:(?:[fb]g|options)=[a-z,;]+)+>(.*?)<\/>/i", '$1', $text); - } } diff --git a/vendor/laravel/prompts/src/Themes/Default/Concerns/DrawsScrollbars.php b/vendor/laravel/prompts/src/Themes/Default/Concerns/DrawsScrollbars.php index 13836994..bb32f00c 100644 --- a/vendor/laravel/prompts/src/Themes/Default/Concerns/DrawsScrollbars.php +++ b/vendor/laravel/prompts/src/Themes/Default/Concerns/DrawsScrollbars.php @@ -20,7 +20,7 @@ protected function scrollbar(Collection $visible, int $firstVisible, int $height $scrollPosition = $this->scrollPosition($firstVisible, $height, $total); - return $visible + return $visible // @phpstan-ignore return.type ->values() ->map(fn ($line) => $this->pad($line, $width)) ->map(fn ($line, $index) => match ($index) { diff --git a/vendor/laravel/prompts/src/Themes/Default/ConfirmPromptRenderer.php b/vendor/laravel/prompts/src/Themes/Default/ConfirmPromptRenderer.php index 906329c7..0fb7938f 100644 --- a/vendor/laravel/prompts/src/Themes/Default/ConfirmPromptRenderer.php +++ b/vendor/laravel/prompts/src/Themes/Default/ConfirmPromptRenderer.php @@ -26,7 +26,7 @@ public function __invoke(ConfirmPrompt $prompt): string $this->renderOptions($prompt), color: 'red' ) - ->error('Cancelled.'), + ->error($prompt->cancelMessage), 'error' => $this ->box( diff --git a/vendor/laravel/prompts/src/Themes/Default/MultiSearchPromptRenderer.php b/vendor/laravel/prompts/src/Themes/Default/MultiSearchPromptRenderer.php index 3eca3339..e3f71205 100644 --- a/vendor/laravel/prompts/src/Themes/Default/MultiSearchPromptRenderer.php +++ b/vendor/laravel/prompts/src/Themes/Default/MultiSearchPromptRenderer.php @@ -30,7 +30,7 @@ public function __invoke(MultiSearchPrompt $prompt): string $this->strikethrough($this->dim($this->truncate($prompt->searchValue() ?: $prompt->placeholder, $maxWidth))), color: 'red', ) - ->error('Cancelled'), + ->error($prompt->cancelMessage), 'error' => $this ->box( @@ -115,7 +115,7 @@ protected function renderOptions(MultiSearchPrompt $prompt): string ->map(function ($label, $key) use ($prompt) { $index = array_search($key, array_keys($prompt->matches())); $active = $index === $prompt->highlighted; - $selected = array_is_list($prompt->visible()) + $selected = $prompt->isList() ? in_array($label, $prompt->value()) : in_array($key, $prompt->value()); @@ -156,7 +156,7 @@ protected function getInfoText(MultiSearchPrompt $prompt): string $info = count($prompt->value()).' selected'; $hiddenCount = count($prompt->value()) - collect($prompt->matches()) - ->filter(fn ($label, $key) => in_array(array_is_list($prompt->matches()) ? $label : $key, $prompt->value())) + ->filter(fn ($label, $key) => in_array($prompt->isList() ? $label : $key, $prompt->value())) ->count(); if ($hiddenCount > 0) { diff --git a/vendor/laravel/prompts/src/Themes/Default/MultiSelectPromptRenderer.php b/vendor/laravel/prompts/src/Themes/Default/MultiSelectPromptRenderer.php index 6f560685..f24b5efc 100644 --- a/vendor/laravel/prompts/src/Themes/Default/MultiSelectPromptRenderer.php +++ b/vendor/laravel/prompts/src/Themes/Default/MultiSelectPromptRenderer.php @@ -28,7 +28,7 @@ public function __invoke(MultiSelectPrompt $prompt): string $this->renderOptions($prompt), color: 'red', ) - ->error('Cancelled.'), + ->error($prompt->cancelMessage), 'error' => $this ->box( diff --git a/vendor/laravel/prompts/src/Themes/Default/PasswordPromptRenderer.php b/vendor/laravel/prompts/src/Themes/Default/PasswordPromptRenderer.php index a7d801ac..512b93f5 100644 --- a/vendor/laravel/prompts/src/Themes/Default/PasswordPromptRenderer.php +++ b/vendor/laravel/prompts/src/Themes/Default/PasswordPromptRenderer.php @@ -28,7 +28,7 @@ public function __invoke(PasswordPrompt $prompt): string $this->strikethrough($this->dim($this->truncate($prompt->masked() ?: $prompt->placeholder, $maxWidth))), color: 'red', ) - ->error('Cancelled.'), + ->error($prompt->cancelMessage), 'error' => $this ->box( diff --git a/vendor/laravel/prompts/src/Themes/Default/ProgressRenderer.php b/vendor/laravel/prompts/src/Themes/Default/ProgressRenderer.php index c168a874..07fb3736 100644 --- a/vendor/laravel/prompts/src/Themes/Default/ProgressRenderer.php +++ b/vendor/laravel/prompts/src/Themes/Default/ProgressRenderer.php @@ -45,7 +45,7 @@ public function __invoke(Progress $progress): string color: 'red', info: $progress->progress.'/'.$progress->total, ) - ->error('Cancelled.'), + ->error($progress->cancelMessage), default => $this ->box( diff --git a/vendor/laravel/prompts/src/Themes/Default/Renderer.php b/vendor/laravel/prompts/src/Themes/Default/Renderer.php index 61f40afa..9356003c 100644 --- a/vendor/laravel/prompts/src/Themes/Default/Renderer.php +++ b/vendor/laravel/prompts/src/Themes/Default/Renderer.php @@ -5,7 +5,6 @@ use Laravel\Prompts\Concerns\Colors; use Laravel\Prompts\Concerns\Truncation; use Laravel\Prompts\Prompt; -use RuntimeException; abstract class Renderer { @@ -22,7 +21,7 @@ abstract class Renderer */ public function __construct(protected Prompt $prompt) { - $this->checkTerminalSize($prompt); + // } /** @@ -100,19 +99,4 @@ public function __toString() .$this->output .(in_array($this->prompt->state, ['submit', 'cancel']) ? PHP_EOL : ''); } - - /** - * Check that the terminal is large enough to render the prompt. - */ - private function checkTerminalSize(Prompt $prompt): void - { - $required = 8; - $actual = $prompt->terminal()->lines(); - - if ($actual < $required) { - throw new RuntimeException( - "The terminal height must be at least [$required] lines but is currently [$actual]. Please increase the height or reduce the font size." - ); - } - } } diff --git a/vendor/laravel/prompts/src/Themes/Default/SearchPromptRenderer.php b/vendor/laravel/prompts/src/Themes/Default/SearchPromptRenderer.php index f19450d9..7de4b634 100644 --- a/vendor/laravel/prompts/src/Themes/Default/SearchPromptRenderer.php +++ b/vendor/laravel/prompts/src/Themes/Default/SearchPromptRenderer.php @@ -30,7 +30,7 @@ public function __invoke(SearchPrompt $prompt): string $this->strikethrough($this->dim($this->truncate($prompt->searchValue() ?: $prompt->placeholder, $maxWidth))), color: 'red', ) - ->error('Cancelled'), + ->error($prompt->cancelMessage), 'error' => $this ->box( diff --git a/vendor/laravel/prompts/src/Themes/Default/SelectPromptRenderer.php b/vendor/laravel/prompts/src/Themes/Default/SelectPromptRenderer.php index 52c4824d..8337b934 100644 --- a/vendor/laravel/prompts/src/Themes/Default/SelectPromptRenderer.php +++ b/vendor/laravel/prompts/src/Themes/Default/SelectPromptRenderer.php @@ -30,7 +30,7 @@ public function __invoke(SelectPrompt $prompt): string $this->renderOptions($prompt), color: 'red', ) - ->error('Cancelled.'), + ->error($prompt->cancelMessage), 'error' => $this ->box( diff --git a/vendor/laravel/prompts/src/Themes/Default/SuggestPromptRenderer.php b/vendor/laravel/prompts/src/Themes/Default/SuggestPromptRenderer.php index 5e4a6f2c..5e08f174 100644 --- a/vendor/laravel/prompts/src/Themes/Default/SuggestPromptRenderer.php +++ b/vendor/laravel/prompts/src/Themes/Default/SuggestPromptRenderer.php @@ -30,7 +30,7 @@ public function __invoke(SuggestPrompt $prompt): string $this->strikethrough($this->dim($this->truncate($prompt->value() ?: $prompt->placeholder, $maxWidth))), color: 'red', ) - ->error('Cancelled'), + ->error($prompt->cancelMessage), 'error' => $this ->box( diff --git a/vendor/laravel/prompts/src/Themes/Default/TableRenderer.php b/vendor/laravel/prompts/src/Themes/Default/TableRenderer.php index 185f4500..c2d17bb9 100644 --- a/vendor/laravel/prompts/src/Themes/Default/TableRenderer.php +++ b/vendor/laravel/prompts/src/Themes/Default/TableRenderer.php @@ -14,7 +14,7 @@ class TableRenderer extends Renderer */ public function __invoke(Table $table): string { - $tableStyle = (new TableStyle()) + $tableStyle = (new TableStyle) ->setHorizontalBorderChars('─') ->setVerticalBorderChars('│', '│') ->setCellHeaderFormat($this->dim('%s')) @@ -26,7 +26,7 @@ public function __invoke(Table $table): string $tableStyle->setCrossingChars('┼', '┌', '┬', '┐', '┤', '┘', '┴', '└', '├'); } - $buffered = new BufferedConsoleOutput(); + $buffered = new BufferedConsoleOutput; (new SymfonyTable($buffered)) ->setHeaders($table->headers) diff --git a/vendor/laravel/prompts/src/Themes/Default/TextPromptRenderer.php b/vendor/laravel/prompts/src/Themes/Default/TextPromptRenderer.php index f293ec48..ef359295 100644 --- a/vendor/laravel/prompts/src/Themes/Default/TextPromptRenderer.php +++ b/vendor/laravel/prompts/src/Themes/Default/TextPromptRenderer.php @@ -28,7 +28,7 @@ public function __invoke(TextPrompt $prompt): string $this->strikethrough($this->dim($this->truncate($prompt->value() ?: $prompt->placeholder, $maxWidth))), color: 'red', ) - ->error('Cancelled.'), + ->error($prompt->cancelMessage), 'error' => $this ->box( diff --git a/vendor/laravel/prompts/src/helpers.php b/vendor/laravel/prompts/src/helpers.php index 8c05b784..65545e03 100644 --- a/vendor/laravel/prompts/src/helpers.php +++ b/vendor/laravel/prompts/src/helpers.php @@ -5,190 +5,245 @@ use Closure; use Illuminate\Support\Collection; -/** - * Prompt the user for text input. - */ -function text(string $label, string $placeholder = '', string $default = '', bool|string $required = false, mixed $validate = null, string $hint = ''): string -{ - return (new TextPrompt(...func_get_args()))->prompt(); -} - -/** - * Prompt the user for input, hiding the value. - */ -function password(string $label, string $placeholder = '', bool|string $required = false, mixed $validate = null, string $hint = ''): string -{ - return (new PasswordPrompt(...func_get_args()))->prompt(); -} - -/** - * Prompt the user to select an option. - * - * @param array|Collection $options - * @param true|string $required - */ -function select(string $label, array|Collection $options, int|string|null $default = null, int $scroll = 5, mixed $validate = null, string $hint = '', bool|string $required = true): int|string -{ - return (new SelectPrompt(...func_get_args()))->prompt(); -} - -/** - * Prompt the user to select multiple options. - * - * @param array|Collection $options - * @param array|Collection $default - * @return array - */ -function multiselect(string $label, array|Collection $options, array|Collection $default = [], int $scroll = 5, bool|string $required = false, mixed $validate = null, string $hint = 'Use the space bar to select options.'): array -{ - return (new MultiSelectPrompt(...func_get_args()))->prompt(); -} - -/** - * Prompt the user to confirm an action. - */ -function confirm(string $label, bool $default = true, string $yes = 'Yes', string $no = 'No', bool|string $required = false, mixed $validate = null, string $hint = ''): bool -{ - return (new ConfirmPrompt(...func_get_args()))->prompt(); -} - -/** - * Prompt the user to continue or cancel after pausing. - */ -function pause(string $message = 'Press enter to continue...'): bool -{ - return (new PausePrompt(...func_get_args()))->prompt(); -} - -/** - * Prompt the user for text input with auto-completion. - * - * @param array|Collection|Closure(string): array $options - */ -function suggest(string $label, array|Collection|Closure $options, string $placeholder = '', string $default = '', int $scroll = 5, bool|string $required = false, mixed $validate = null, string $hint = ''): string -{ - return (new SuggestPrompt(...func_get_args()))->prompt(); -} - -/** - * Allow the user to search for an option. - * - * @param Closure(string): array $options - * @param true|string $required - */ -function search(string $label, Closure $options, string $placeholder = '', int $scroll = 5, mixed $validate = null, string $hint = '', bool|string $required = true): int|string -{ - return (new SearchPrompt(...func_get_args()))->prompt(); -} - -/** - * Allow the user to search for multiple option. - * - * @param Closure(string): array $options - * @return array - */ -function multisearch(string $label, Closure $options, string $placeholder = '', int $scroll = 5, bool|string $required = false, mixed $validate = null, string $hint = 'Use the space bar to select options.'): array -{ - return (new MultiSearchPrompt(...func_get_args()))->prompt(); -} - -/** - * Render a spinner while the given callback is executing. - * - * @template TReturn of mixed - * - * @param \Closure(): TReturn $callback - * @return TReturn - */ -function spin(Closure $callback, string $message = ''): mixed -{ - return (new Spinner($message))->spin($callback); -} - -/** - * Display a note. - */ -function note(string $message, ?string $type = null): void -{ - (new Note($message, $type))->display(); -} - -/** - * Display an error. - */ -function error(string $message): void -{ - (new Note($message, 'error'))->display(); -} - -/** - * Display a warning. - */ -function warning(string $message): void -{ - (new Note($message, 'warning'))->display(); -} - -/** - * Display an alert. - */ -function alert(string $message): void -{ - (new Note($message, 'alert'))->display(); -} - -/** - * Display an informational message. - */ -function info(string $message): void -{ - (new Note($message, 'info'))->display(); -} - -/** - * Display an introduction. - */ -function intro(string $message): void -{ - (new Note($message, 'intro'))->display(); -} - -/** - * Display a closing message. - */ -function outro(string $message): void -{ - (new Note($message, 'outro'))->display(); -} - -/** - * Display a table. - * - * @param array>|Collection> $headers - * @param array>|Collection> $rows - */ -function table(array|Collection $headers = [], array|Collection|null $rows = null): void -{ - (new Table($headers, $rows))->display(); -} - -/** - * Display a progress bar. - * - * @template TSteps of iterable|int - * @template TReturn - * - * @param TSteps $steps - * @param ?Closure((TSteps is int ? int : value-of), Progress): TReturn $callback - * @return ($callback is null ? Progress : array) - */ -function progress(string $label, iterable|int $steps, ?Closure $callback = null, string $hint = ''): array|Progress -{ - $progress = new Progress($label, $steps, $hint); - - if ($callback !== null) { - return $progress->map($callback); - } - - return $progress; +if (! function_exists('\Laravel\Prompts\text')) { + /** + * Prompt the user for text input. + */ + function text(string $label, string $placeholder = '', string $default = '', bool|string $required = false, mixed $validate = null, string $hint = '', ?Closure $transform = null): string + { + return (new TextPrompt(...func_get_args()))->prompt(); + } +} + +if (! function_exists('\Laravel\Prompts\textarea')) { + /** + * Prompt the user for multiline text input. + */ + function textarea(string $label, string $placeholder = '', string $default = '', bool|string $required = false, mixed $validate = null, string $hint = '', int $rows = 5, ?Closure $transform = null): string + { + return (new TextareaPrompt(...func_get_args()))->prompt(); + } +} + +if (! function_exists('\Laravel\Prompts\password')) { + /** + * Prompt the user for input, hiding the value. + */ + function password(string $label, string $placeholder = '', bool|string $required = false, mixed $validate = null, string $hint = '', ?Closure $transform = null): string + { + return (new PasswordPrompt(...func_get_args()))->prompt(); + } +} + +if (! function_exists('\Laravel\Prompts\select')) { + /** + * Prompt the user to select an option. + * + * @param array|Collection $options + * @param true|string $required + */ + function select(string $label, array|Collection $options, int|string|null $default = null, int $scroll = 5, mixed $validate = null, string $hint = '', bool|string $required = true, ?Closure $transform = null): int|string + { + return (new SelectPrompt(...func_get_args()))->prompt(); + } +} + +if (! function_exists('\Laravel\Prompts\multiselect')) { + /** + * Prompt the user to select multiple options. + * + * @param array|Collection $options + * @param array|Collection $default + * @return array + */ + function multiselect(string $label, array|Collection $options, array|Collection $default = [], int $scroll = 5, bool|string $required = false, mixed $validate = null, string $hint = 'Use the space bar to select options.', ?Closure $transform = null): array + { + return (new MultiSelectPrompt(...func_get_args()))->prompt(); + } +} + +if (! function_exists('\Laravel\Prompts\confirm')) { + /** + * Prompt the user to confirm an action. + */ + function confirm(string $label, bool $default = true, string $yes = 'Yes', string $no = 'No', bool|string $required = false, mixed $validate = null, string $hint = '', ?Closure $transform = null): bool + { + return (new ConfirmPrompt(...func_get_args()))->prompt(); + } +} + +if (! function_exists('\Laravel\Prompts\pause')) { + /** + * Prompt the user to continue or cancel after pausing. + */ + function pause(string $message = 'Press enter to continue...'): bool + { + return (new PausePrompt(...func_get_args()))->prompt(); + } +} + +if (! function_exists('\Laravel\Prompts\suggest')) { + /** + * Prompt the user for text input with auto-completion. + * + * @param array|Collection|Closure(string): array $options + */ + function suggest(string $label, array|Collection|Closure $options, string $placeholder = '', string $default = '', int $scroll = 5, bool|string $required = false, mixed $validate = null, string $hint = '', ?Closure $transform = null): string + { + return (new SuggestPrompt(...func_get_args()))->prompt(); + } +} + +if (! function_exists('\Laravel\Prompts\search')) { + /** + * Allow the user to search for an option. + * + * @param Closure(string): array $options + * @param true|string $required + */ + function search(string $label, Closure $options, string $placeholder = '', int $scroll = 5, mixed $validate = null, string $hint = '', bool|string $required = true, ?Closure $transform = null): int|string + { + return (new SearchPrompt(...func_get_args()))->prompt(); + } +} + +if (! function_exists('\Laravel\Prompts\multisearch')) { + /** + * Allow the user to search for multiple option. + * + * @param Closure(string): array $options + * @return array + */ + function multisearch(string $label, Closure $options, string $placeholder = '', int $scroll = 5, bool|string $required = false, mixed $validate = null, string $hint = 'Use the space bar to select options.', ?Closure $transform = null): array + { + return (new MultiSearchPrompt(...func_get_args()))->prompt(); + } +} + +if (! function_exists('\Laravel\Prompts\spin')) { + /** + * Render a spinner while the given callback is executing. + * + * @template TReturn of mixed + * + * @param \Closure(): TReturn $callback + * @return TReturn + */ + function spin(Closure $callback, string $message = ''): mixed + { + return (new Spinner($message))->spin($callback); + } +} + +if (! function_exists('\Laravel\Prompts\note')) { + /** + * Display a note. + */ + function note(string $message, ?string $type = null): void + { + (new Note($message, $type))->display(); + } +} + +if (! function_exists('\Laravel\Prompts\error')) { + /** + * Display an error. + */ + function error(string $message): void + { + (new Note($message, 'error'))->display(); + } +} + +if (! function_exists('\Laravel\Prompts\warning')) { + /** + * Display a warning. + */ + function warning(string $message): void + { + (new Note($message, 'warning'))->display(); + } +} + +if (! function_exists('\Laravel\Prompts\alert')) { + /** + * Display an alert. + */ + function alert(string $message): void + { + (new Note($message, 'alert'))->display(); + } +} + +if (! function_exists('\Laravel\Prompts\info')) { + /** + * Display an informational message. + */ + function info(string $message): void + { + (new Note($message, 'info'))->display(); + } +} + +if (! function_exists('\Laravel\Prompts\intro')) { + /** + * Display an introduction. + */ + function intro(string $message): void + { + (new Note($message, 'intro'))->display(); + } +} + +if (! function_exists('\Laravel\Prompts\outro')) { + /** + * Display a closing message. + */ + function outro(string $message): void + { + (new Note($message, 'outro'))->display(); + } +} + +if (! function_exists('\Laravel\Prompts\table')) { + /** + * Display a table. + * + * @param array>|Collection> $headers + * @param array>|Collection> $rows + */ + function table(array|Collection $headers = [], array|Collection|null $rows = null): void + { + (new Table($headers, $rows))->display(); + } +} + +if (! function_exists('\Laravel\Prompts\progress')) { + /** + * Display a progress bar. + * + * @template TSteps of iterable|int + * @template TReturn + * + * @param TSteps $steps + * @param ?Closure((TSteps is int ? int : value-of), Progress): TReturn $callback + * @return ($callback is null ? Progress : array) + */ + function progress(string $label, iterable|int $steps, ?Closure $callback = null, string $hint = ''): array|Progress + { + $progress = new Progress($label, $steps, $hint); + + if ($callback !== null) { + return $progress->map($callback); + } + + return $progress; + } +} + +if (! function_exists('\Laravel\Prompts\form')) { + function form(): FormBuilder + { + return new FormBuilder; + } } diff --git a/vendor/league/flysystem-local/LocalFilesystemAdapter.php b/vendor/league/flysystem-local/LocalFilesystemAdapter.php index 2b2e095d..aa7f7d65 100644 --- a/vendor/league/flysystem-local/LocalFilesystemAdapter.php +++ b/vendor/league/flysystem-local/LocalFilesystemAdapter.php @@ -271,7 +271,7 @@ public function copy(string $source, string $destination, Config $config): void $this->resolveDirectoryVisibility($config->get(Config::OPTION_DIRECTORY_VISIBILITY)) ); - if ( ! @copy($sourcePath, $destinationPath)) { + if ($sourcePath !== $destinationPath && ! @copy($sourcePath, $destinationPath)) { throw UnableToCopyFile::because(error_get_last()['message'] ?? 'unknown', $source, $destination); } diff --git a/vendor/league/flysystem/composer.json b/vendor/league/flysystem/composer.json index 99a3cd38..81a39c4e 100644 --- a/vendor/league/flysystem/composer.json +++ b/vendor/league/flysystem/composer.json @@ -25,6 +25,7 @@ "ext-zip": "*", "ext-fileinfo": "*", "ext-ftp": "*", + "ext-mongodb": "^1.3", "microsoft/azure-storage-blob": "^1.1", "phpunit/phpunit": "^9.5.11|^10.0", "phpstan/phpstan": "^1.10", @@ -35,7 +36,9 @@ "google/cloud-storage": "^1.23", "async-aws/s3": "^1.5 || ^2.0", "async-aws/simple-s3": "^1.1 || ^2.0", - "sabre/dav": "^4.6.0" + "mongodb/mongodb": "^1.2", + "sabre/dav": "^4.6.0", + "guzzlehttp/psr7": "^2.6" }, "conflict": { "async-aws/core": "<1.19.0", diff --git a/vendor/league/flysystem/readme.md b/vendor/league/flysystem/readme.md index 7112e4cd..ab5931e4 100644 --- a/vendor/league/flysystem/readme.md +++ b/vendor/league/flysystem/readme.md @@ -32,6 +32,7 @@ for which ever storage is right for you. * **[AsyncAws S3](https://flysystem.thephpleague.com/docs/adapter/async-aws-s3/)** * **[Google Cloud Storage](https://flysystem.thephpleague.com/docs/adapter/google-cloud-storage/)** * **[Azure Blob Storage](https://flysystem.thephpleague.com/docs/adapter/azure-blob-storage/)** +* **[MongoDB GridFS](https://flysystem.thephpleague.com/docs/adapter/gridfs/)** * **[WebDAV](https://flysystem.thephpleague.com/docs/adapter/webdav/)** * **[ZipArchive](https://flysystem.thephpleague.com/docs/adapter/zip-archive/)** diff --git a/vendor/league/flysystem/src/Filesystem.php b/vendor/league/flysystem/src/Filesystem.php index a5ee34e2..4fb30cc1 100644 --- a/vendor/league/flysystem/src/Filesystem.php +++ b/vendor/league/flysystem/src/Filesystem.php @@ -187,7 +187,10 @@ public function publicUrl(string $path, array $config = []): string ?? throw UnableToGeneratePublicUrl::noGeneratorConfigured($path); $config = $this->config->extend($config); - return $this->publicUrlGenerator->publicUrl($this->pathNormalizer->normalizePath($path), $config); + return $this->publicUrlGenerator->publicUrl( + $this->pathNormalizer->normalizePath($path), + $config, + ); } public function temporaryUrl(string $path, DateTimeInterface $expiresAt, array $config = []): string @@ -214,9 +217,15 @@ public function checksum(string $path, array $config = []): string } try { - return $this->adapter->checksum($path, $config); + return $this->adapter->checksum( + $this->pathNormalizer->normalizePath($path), + $config, + ); } catch (ChecksumAlgoIsNotSupported) { - return $this->calculateChecksumFromStream($path, $config); + return $this->calculateChecksumFromStream( + $this->pathNormalizer->normalizePath($path), + $config, + ); } } diff --git a/vendor/league/flysystem/src/MountManager.php b/vendor/league/flysystem/src/MountManager.php index 2ef2288e..acab4a80 100644 --- a/vendor/league/flysystem/src/MountManager.php +++ b/vendor/league/flysystem/src/MountManager.php @@ -7,6 +7,7 @@ use DateTimeInterface; use Throwable; +use function compact; use function method_exists; use function sprintf; @@ -396,10 +397,11 @@ private function copyAcrossFilesystem( try { if ($visibility == null && $retainVisibility) { $visibility = $sourceFilesystem->visibility($sourcePath); + $config = $config->extend(compact('visibility')); } $stream = $sourceFilesystem->readStream($sourcePath); - $destinationFilesystem->writeStream($destinationPath, $stream, $visibility ? compact(Config::OPTION_VISIBILITY) : []); + $destinationFilesystem->writeStream($destinationPath, $stream, $config->toArray()); } catch (UnableToRetrieveMetadata | UnableToReadFile | UnableToWriteFile $exception) { throw UnableToCopyFile::fromLocationTo($source, $destination, $exception); } diff --git a/vendor/league/mime-type-detection/CHANGELOG.md b/vendor/league/mime-type-detection/CHANGELOG.md index a45872a9..eb138635 100644 --- a/vendor/league/mime-type-detection/CHANGELOG.md +++ b/vendor/league/mime-type-detection/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 1.16.0 - 2025-09-21 + +- Updated lookup +- Prepped for 8.4 implicit nullable deprecation + ## 1.15.0 - 2024-01-28 - Updated lookup diff --git a/vendor/league/mime-type-detection/src/ExtensionMimeTypeDetector.php b/vendor/league/mime-type-detection/src/ExtensionMimeTypeDetector.php index cd344620..0caa5fe6 100644 --- a/vendor/league/mime-type-detection/src/ExtensionMimeTypeDetector.php +++ b/vendor/league/mime-type-detection/src/ExtensionMimeTypeDetector.php @@ -13,7 +13,7 @@ class ExtensionMimeTypeDetector implements MimeTypeDetector, ExtensionLookup */ private $extensions; - public function __construct(ExtensionToMimeTypeMap $extensions = null) + public function __construct(?ExtensionToMimeTypeMap $extensions = null) { $this->extensions = $extensions ?: new GeneratedExtensionToMimeTypeMap(); } diff --git a/vendor/league/mime-type-detection/src/FinfoMimeTypeDetector.php b/vendor/league/mime-type-detection/src/FinfoMimeTypeDetector.php index 8084f924..2ccf328f 100644 --- a/vendor/league/mime-type-detection/src/FinfoMimeTypeDetector.php +++ b/vendor/league/mime-type-detection/src/FinfoMimeTypeDetector.php @@ -41,7 +41,7 @@ class FinfoMimeTypeDetector implements MimeTypeDetector, ExtensionLookup public function __construct( string $magicFile = '', - ExtensionToMimeTypeMap $extensionMap = null, + ?ExtensionToMimeTypeMap $extensionMap = null, ?int $bufferSampleSize = null, array $inconclusiveMimetypes = self::INCONCLUSIVE_MIME_TYPES ) { diff --git a/vendor/league/mime-type-detection/src/GeneratedExtensionToMimeTypeMap.php b/vendor/league/mime-type-detection/src/GeneratedExtensionToMimeTypeMap.php index 1ce17911..65e986ae 100644 --- a/vendor/league/mime-type-detection/src/GeneratedExtensionToMimeTypeMap.php +++ b/vendor/league/mime-type-detection/src/GeneratedExtensionToMimeTypeMap.php @@ -82,10 +82,12 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap, Extensi 'azv' => 'image/vnd.airzip.accelerator.azv', 'azw' => 'application/vnd.amazon.ebook', 'b16' => 'image/vnd.pco.b16', + 'bary' => 'model/vnd.bary', 'bat' => 'application/x-msdownload', 'bcpio' => 'application/x-bcpio', 'bdf' => 'application/x-font-bdf', 'bdm' => 'application/vnd.syncml.dm+wbxml', + 'bdo' => 'application/vnd.nato.bindingdataobject+xml', 'bdoc' => 'application/x-bdoc', 'bed' => 'application/vnd.realvnc.bed', 'bh2' => 'application/vnd.fujitsu.oasysprs', @@ -342,6 +344,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap, Extensi 'geojson' => 'application/geo+json', 'gex' => 'application/vnd.geometry-explorer', 'ggb' => 'application/vnd.geogebra.file', + 'ggs' => 'application/vnd.geogebra.slides', 'ggt' => 'application/vnd.geogebra.tool', 'ghf' => 'application/vnd.groove-help', 'gif' => 'image/gif', @@ -466,6 +469,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap, Extensi 'jsonml' => 'application/jsonml+json', 'jsx' => 'text/jsx', 'jt' => 'model/jt', + 'jxl' => 'image/jxl', 'jxr' => 'image/jxr', 'jxra' => 'image/jxra', 'jxrs' => 'image/jxrs', @@ -521,6 +525,8 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap, Extensi 'lzh' => 'application/octet-stream', 'm1v' => 'video/mpeg', 'm2a' => 'audio/mpeg', + 'm2t' => 'video/mp2t', + 'm2ts' => 'video/mp2t', 'm2v' => 'video/mpeg', 'm3a' => 'audio/mpeg', 'm3u' => 'text/plain', @@ -627,7 +633,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap, Extensi 'msp' => 'application/octet-stream', 'msty' => 'application/vnd.muvee.style', 'mtl' => 'model/mtl', - 'mts' => 'model/vnd.mts', + 'mts' => 'video/mp2t', 'mus' => 'application/vnd.musician', 'musd' => 'application/mmt-usd+xml', 'musicxml' => 'application/vnd.recordare.musicxml+xml', @@ -1172,6 +1178,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap, Extensi 'xbm' => 'image/x-xbitmap', 'xca' => 'application/xcap-caps+xml', 'xcs' => 'application/calendar+xml', + 'xdcf' => 'application/vnd.gov.sk.xmldatacontainer+xml', 'xdf' => 'application/xcap-diff+xml', 'xdm' => 'application/vnd.syncml.dm+xml', 'xdp' => 'application/vnd.adobe.xdp+xml', @@ -1523,6 +1530,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap, Extensi 'application/vnd.fuzzysheet' => ['fzs'], 'application/vnd.genomatix.tuxedo' => ['txd'], 'application/vnd.geogebra.file' => ['ggb'], + 'application/vnd.geogebra.slides' => ['ggs'], 'application/vnd.geogebra.tool' => ['ggt'], 'application/vnd.geometry-explorer' => ['gex', 'gre'], 'application/vnd.geonext' => ['gxt'], @@ -1534,6 +1542,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap, Extensi 'application/vnd.google-apps.spreadsheet' => ['gsheet'], 'application/vnd.google-earth.kml+xml' => ['kml'], 'application/vnd.google-earth.kmz' => ['kmz'], + 'application/vnd.gov.sk.xmldatacontainer+xml' => ['xdcf'], 'application/vnd.grafeq' => ['gqf', 'gqs'], 'application/vnd.groove-account' => ['gac'], 'application/vnd.groove-help' => ['ghf'], @@ -1649,6 +1658,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap, Extensi 'application/vnd.musician' => ['mus'], 'application/vnd.muvee.style' => ['msty'], 'application/vnd.mynfc' => ['taglet'], + 'application/vnd.nato.bindingdataobject+xml' => ['bdo'], 'application/vnd.neurolanguage.nlu' => ['nlu'], 'application/vnd.nitf' => ['ntf', 'nitf'], 'application/vnd.noblenet-directory' => ['nnd'], @@ -2029,6 +2039,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap, Extensi 'image/jphc' => ['jhc'], 'image/jpm' => ['jpm', 'jpgm'], 'image/jpx' => ['jpx', 'jpf'], + 'image/jxl' => ['jxl'], 'image/jxr' => ['jxr'], 'image/jxra' => ['jxra'], 'image/jxrs' => ['jxrs'], @@ -2111,6 +2122,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap, Extensi 'model/step-xml+zip' => ['stpxz'], 'model/stl' => ['stl'], 'model/u3d' => ['u3d'], + 'model/vnd.bary' => ['bary'], 'model/vnd.cld' => ['cld'], 'model/vnd.collada+xml' => ['dae'], 'model/vnd.dwf' => ['dwf'], @@ -2208,7 +2220,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap, Extensi 'video/jpeg' => ['jpgv'], 'video/jpm' => ['jpm', 'jpgm'], 'video/mj2' => ['mj2', 'mjp2'], - 'video/mp2t' => ['ts'], + 'video/mp2t' => ['ts', 'm2t', 'm2ts', 'mts'], 'video/mp4' => ['mp4', 'mp4v', 'mpg4', 'f4v'], 'video/mpeg' => ['mpeg', 'mpg', 'mpe', 'm1v', 'm2v'], 'video/ogg' => ['ogv'], diff --git a/vendor/myclabs/deep-copy/src/DeepCopy/DeepCopy.php b/vendor/myclabs/deep-copy/src/DeepCopy/DeepCopy.php index 084858ee..f739d922 100644 --- a/vendor/myclabs/deep-copy/src/DeepCopy/DeepCopy.php +++ b/vendor/myclabs/deep-copy/src/DeepCopy/DeepCopy.php @@ -4,6 +4,7 @@ use ArrayObject; use DateInterval; +use DatePeriod; use DateTimeInterface; use DateTimeZone; use DeepCopy\Exception\CloneException; @@ -12,6 +13,7 @@ use DeepCopy\Matcher\Matcher; use DeepCopy\Reflection\ReflectionHelper; use DeepCopy\TypeFilter\Date\DateIntervalFilter; +use DeepCopy\TypeFilter\Date\DatePeriodFilter; use DeepCopy\TypeFilter\Spl\ArrayObjectFilter; use DeepCopy\TypeFilter\Spl\SplDoublyLinkedListFilter; use DeepCopy\TypeFilter\TypeFilter; @@ -64,6 +66,7 @@ public function __construct($useCloneMethod = false) $this->addTypeFilter(new ArrayObjectFilter($this), new TypeMatcher(ArrayObject::class)); $this->addTypeFilter(new DateIntervalFilter(), new TypeMatcher(DateInterval::class)); + $this->addTypeFilter(new DatePeriodFilter(), new TypeMatcher(DatePeriod::class)); $this->addTypeFilter(new SplDoublyLinkedListFilter($this), new TypeMatcher(SplDoublyLinkedList::class)); } diff --git a/vendor/nikic/php-parser/README.md b/vendor/nikic/php-parser/README.md index 7555838e..edb3ed32 100644 --- a/vendor/nikic/php-parser/README.md +++ b/vendor/nikic/php-parser/README.md @@ -6,7 +6,7 @@ PHP Parser This is a PHP parser written in PHP. Its purpose is to simplify static code analysis and manipulation. -[**Documentation for version 5.x**][doc_master] (current; for running on PHP >= 7.4; for parsing PHP 7.0 to PHP 8.3, with limited support for parsing PHP 5.x). +[**Documentation for version 5.x**][doc_master] (current; for running on PHP >= 7.4; for parsing PHP 7.0 to PHP 8.4, with limited support for parsing PHP 5.x). [Documentation for version 4.x][doc_4_x] (supported; for running on PHP >= 7.0; for parsing PHP 5.2 to PHP 8.3). diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php index fa5dc10e..138fa638 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php @@ -28,7 +28,7 @@ class ClassConst implements PhpParser\Builder { * Creates a class constant builder * * @param string|Identifier $name Name - * @param Node\Expr|bool|null|int|float|string|array $value Value + * @param Node\Expr|bool|null|int|float|string|array|\UnitEnum $value Value */ public function __construct($name, $value) { $this->constants = [new Const_($name, BuilderHelpers::normalizeValue($value))]; @@ -38,7 +38,7 @@ public function __construct($name, $value) { * Add another constant to const group * * @param string|Identifier $name Name - * @param Node\Expr|bool|null|int|float|string|array $value Value + * @param Node\Expr|bool|null|int|float|string|array|\UnitEnum $value Value * * @return $this The builder instance (for fluid interface) */ diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/EnumCase.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/EnumCase.php index 04058bf5..c766321b 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Builder/EnumCase.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/EnumCase.php @@ -13,7 +13,6 @@ class EnumCase implements PhpParser\Builder { /** @var Identifier|string */ protected $name; - /** @var ?Node\Expr */ protected ?Node\Expr $value = null; /** @var array */ protected array $attributes = []; diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/Param.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/Param.php index f439e876..324a32b0 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Builder/Param.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/Param.php @@ -122,6 +122,28 @@ public function makeReadonly() { return $this; } + /** + * Gives the promoted property private(set) visibility. + * + * @return $this The builder instance (for fluid interface) + */ + public function makePrivateSet() { + $this->flags = BuilderHelpers::addModifier($this->flags, Modifiers::PRIVATE_SET); + + return $this; + } + + /** + * Gives the promoted property protected(set) visibility. + * + * @return $this The builder instance (for fluid interface) + */ + public function makeProtectedSet() { + $this->flags = BuilderHelpers::addModifier($this->flags, Modifiers::PROTECTED_SET); + + return $this; + } + /** * Adds an attribute group. * diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/Property.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/Property.php index 3fc96d98..c80fe481 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Builder/Property.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/Property.php @@ -23,6 +23,8 @@ class Property implements PhpParser\Builder { protected ?Node $type = null; /** @var list */ protected array $attributeGroups = []; + /** @var list */ + protected array $hooks = []; /** * Creates a property builder. @@ -88,6 +90,50 @@ public function makeReadonly() { return $this; } + /** + * Makes the property abstract. Requires at least one property hook to be specified as well. + * + * @return $this The builder instance (for fluid interface) + */ + public function makeAbstract() { + $this->flags = BuilderHelpers::addModifier($this->flags, Modifiers::ABSTRACT); + + return $this; + } + + /** + * Makes the property final. + * + * @return $this The builder instance (for fluid interface) + */ + public function makeFinal() { + $this->flags = BuilderHelpers::addModifier($this->flags, Modifiers::FINAL); + + return $this; + } + + /** + * Gives the property private(set) visibility. + * + * @return $this The builder instance (for fluid interface) + */ + public function makePrivateSet() { + $this->flags = BuilderHelpers::addModifier($this->flags, Modifiers::PRIVATE_SET); + + return $this; + } + + /** + * Gives the property protected(set) visibility. + * + * @return $this The builder instance (for fluid interface) + */ + public function makeProtectedSet() { + $this->flags = BuilderHelpers::addModifier($this->flags, Modifiers::PROTECTED_SET); + + return $this; + } + /** * Sets default value for the property. * @@ -142,12 +188,27 @@ public function addAttribute($attribute) { return $this; } + /** + * Adds a property hook. + * + * @return $this The builder instance (for fluid interface) + */ + public function addHook(Node\PropertyHook $hook) { + $this->hooks[] = $hook; + + return $this; + } + /** * Returns the built class node. * * @return Stmt\Property The built property node */ public function getNode(): PhpParser\Node { + if ($this->flags & Modifiers::ABSTRACT && !$this->hooks) { + throw new PhpParser\Error('Only hooked properties may be declared abstract'); + } + return new Stmt\Property( $this->flags !== 0 ? $this->flags : Modifiers::PUBLIC, [ @@ -155,7 +216,8 @@ public function getNode(): PhpParser\Node { ], $this->attributes, $this->type, - $this->attributeGroups + $this->attributeGroups, + $this->hooks ); } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php b/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php index b7efe5e9..07642f92 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php +++ b/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php @@ -210,7 +210,7 @@ public function enumCase($name): Builder\EnumCase { /** * Creates node a for a literal value. * - * @param Expr|bool|null|int|float|string|array $value $value + * @param Expr|bool|null|int|float|string|array|\UnitEnum $value $value */ public function val($value): Expr { return BuilderHelpers::normalizeValue($value); diff --git a/vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php b/vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php index 3e41b26f..f29a6915 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php +++ b/vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php @@ -6,6 +6,7 @@ use PhpParser\Node\Expr; use PhpParser\Node\Identifier; use PhpParser\Node\Name; +use PhpParser\Node\Name\FullyQualified; use PhpParser\Node\NullableType; use PhpParser\Node\Scalar; use PhpParser\Node\Stmt; @@ -214,7 +215,7 @@ public static function normalizeType($type) { * Normalizes a value: Converts nulls, booleans, integers, * floats, strings and arrays into their respective nodes * - * @param Node\Expr|bool|null|int|float|string|array $value The value to normalize + * @param Node\Expr|bool|null|int|float|string|array|\UnitEnum $value The value to normalize * * @return Expr The normalized value */ @@ -268,6 +269,10 @@ public static function normalizeValue($value): Expr { return new Expr\Array_($items); } + if ($value instanceof \UnitEnum) { + return new Expr\ClassConstFetch(new FullyQualified(\get_class($value)), new Identifier($value->name)); + } + throw new \LogicException('Invalid value'); } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php b/vendor/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php index c02844ac..cdbe2bdc 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php @@ -20,9 +20,9 @@ class TokenStream { * * @param Token[] $tokens Tokens in PhpToken::tokenize() format */ - public function __construct(array $tokens) { + public function __construct(array $tokens, int $tabWidth) { $this->tokens = $tokens; - $this->indentMap = $this->calcIndentMap(); + $this->indentMap = $this->calcIndentMap($tabWidth); } /** @@ -248,7 +248,7 @@ public function getTokenCode(int $from, int $to, int $indent): string { * * @return int[] Token position to indentation map */ - private function calcIndentMap(): array { + private function calcIndentMap(int $tabWidth): array { $indentMap = []; $indent = 0; foreach ($this->tokens as $i => $token) { @@ -258,11 +258,11 @@ private function calcIndentMap(): array { $content = $token->text; $newlinePos = \strrpos($content, "\n"); if (false !== $newlinePos) { - $indent = \strlen($content) - $newlinePos - 1; + $indent = $this->getIndent(\substr($content, $newlinePos + 1), $tabWidth); } elseif ($i === 1 && $this->tokens[0]->id === \T_OPEN_TAG && $this->tokens[0]->text[\strlen($this->tokens[0]->text) - 1] === "\n") { // Special case: Newline at the end of opening tag followed by whitespace. - $indent = \strlen($content); + $indent = $this->getIndent($content, $tabWidth); } } } @@ -272,4 +272,11 @@ private function calcIndentMap(): array { return $indentMap; } + + private function getIndent(string $ws, int $tabWidth): int { + $spaces = \substr_count($ws, " "); + $tabs = \substr_count($ws, "\t"); + assert(\strlen($ws) === $spaces + $tabs); + return $spaces + $tabs * $tabWidth; + } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php b/vendor/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php index 934954cd..c9b3b6d3 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php @@ -5,15 +5,13 @@ use PhpParser\Error; use PhpParser\ErrorHandler; use PhpParser\Lexer; +use PhpParser\Lexer\TokenEmulator\AsymmetricVisibilityTokenEmulator; use PhpParser\Lexer\TokenEmulator\AttributeEmulator; use PhpParser\Lexer\TokenEmulator\EnumTokenEmulator; -use PhpParser\Lexer\TokenEmulator\CoaleseEqualTokenEmulator; use PhpParser\Lexer\TokenEmulator\ExplicitOctalEmulator; -use PhpParser\Lexer\TokenEmulator\FlexibleDocStringEmulator; -use PhpParser\Lexer\TokenEmulator\FnTokenEmulator; use PhpParser\Lexer\TokenEmulator\MatchTokenEmulator; use PhpParser\Lexer\TokenEmulator\NullsafeTokenEmulator; -use PhpParser\Lexer\TokenEmulator\NumericLiteralSeparatorEmulator; +use PhpParser\Lexer\TokenEmulator\PropertyTokenEmulator; use PhpParser\Lexer\TokenEmulator\ReadonlyFunctionTokenEmulator; use PhpParser\Lexer\TokenEmulator\ReadonlyTokenEmulator; use PhpParser\Lexer\TokenEmulator\ReverseEmulator; @@ -47,6 +45,8 @@ public function __construct(?PhpVersion $phpVersion = null) { new ReadonlyTokenEmulator(), new ExplicitOctalEmulator(), new ReadonlyFunctionTokenEmulator(), + new PropertyTokenEmulator(), + new AsymmetricVisibilityTokenEmulator(), ]; // Collect emulators that are relevant for the PHP version we're running diff --git a/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php b/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php index 9803f996..066e7cd8 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php @@ -14,8 +14,12 @@ public function isEmulationNeeded(string $code): bool { /** @param Token[] $tokens */ protected function isKeywordContext(array $tokens, int $pos): bool { - $previousNonSpaceToken = $this->getPreviousNonSpaceToken($tokens, $pos); - return $previousNonSpaceToken === null || $previousNonSpaceToken->id !== \T_OBJECT_OPERATOR; + $prevToken = $this->getPreviousNonSpaceToken($tokens, $pos); + if ($prevToken === null) { + return false; + } + return $prevToken->id !== \T_OBJECT_OPERATOR + && $prevToken->id !== \T_NULLSAFE_OBJECT_OPERATOR; } public function emulate(string $code, array $tokens): array { diff --git a/vendor/nikic/php-parser/lib/PhpParser/Modifiers.php b/vendor/nikic/php-parser/lib/PhpParser/Modifiers.php index b7120eea..0f0f22d6 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Modifiers.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Modifiers.php @@ -14,23 +14,47 @@ final class Modifiers { public const ABSTRACT = 16; public const FINAL = 32; public const READONLY = 64; + public const PUBLIC_SET = 128; + public const PROTECTED_SET = 256; + public const PRIVATE_SET = 512; - public const VISIBILITY_MASK = 1 | 2 | 4; + public const VISIBILITY_MASK = self::PUBLIC | self::PROTECTED | self::PRIVATE; + + public const VISIBILITY_SET_MASK = self::PUBLIC_SET | self::PROTECTED_SET | self::PRIVATE_SET; + + private const TO_STRING_MAP = [ + self::PUBLIC => 'public', + self::PROTECTED => 'protected', + self::PRIVATE => 'private', + self::STATIC => 'static', + self::ABSTRACT => 'abstract', + self::FINAL => 'final', + self::READONLY => 'readonly', + self::PUBLIC_SET => 'public(set)', + self::PROTECTED_SET => 'protected(set)', + self::PRIVATE_SET => 'private(set)', + ]; + + public static function toString(int $modifier): string { + if (!isset(self::TO_STRING_MAP[$modifier])) { + throw new \InvalidArgumentException("Unknown modifier $modifier"); + } + return self::TO_STRING_MAP[$modifier]; + } + + private static function isValidModifier(int $modifier): bool { + $isPow2 = ($modifier & ($modifier - 1)) == 0 && $modifier != 0; + return $isPow2 && $modifier <= self::PRIVATE_SET; + } /** * @internal */ public static function verifyClassModifier(int $a, int $b): void { - if ($a & Modifiers::ABSTRACT && $b & Modifiers::ABSTRACT) { - throw new Error('Multiple abstract modifiers are not allowed'); - } - - if ($a & Modifiers::FINAL && $b & Modifiers::FINAL) { - throw new Error('Multiple final modifiers are not allowed'); - } - - if ($a & Modifiers::READONLY && $b & Modifiers::READONLY) { - throw new Error('Multiple readonly modifiers are not allowed'); + assert(self::isValidModifier($b)); + if (($a & $b) != 0) { + throw new Error( + 'Multiple ' . self::toString($b) . ' modifiers are not allowed'); } if ($a & 48 && $b & 48) { @@ -42,24 +66,16 @@ public static function verifyClassModifier(int $a, int $b): void { * @internal */ public static function verifyModifier(int $a, int $b): void { - if ($a & Modifiers::VISIBILITY_MASK && $b & Modifiers::VISIBILITY_MASK) { + assert(self::isValidModifier($b)); + if (($a & Modifiers::VISIBILITY_MASK && $b & Modifiers::VISIBILITY_MASK) || + ($a & Modifiers::VISIBILITY_SET_MASK && $b & Modifiers::VISIBILITY_SET_MASK) + ) { throw new Error('Multiple access type modifiers are not allowed'); } - if ($a & Modifiers::ABSTRACT && $b & Modifiers::ABSTRACT) { - throw new Error('Multiple abstract modifiers are not allowed'); - } - - if ($a & Modifiers::STATIC && $b & Modifiers::STATIC) { - throw new Error('Multiple static modifiers are not allowed'); - } - - if ($a & Modifiers::FINAL && $b & Modifiers::FINAL) { - throw new Error('Multiple final modifiers are not allowed'); - } - - if ($a & Modifiers::READONLY && $b & Modifiers::READONLY) { - throw new Error('Multiple readonly modifiers are not allowed'); + if (($a & $b) != 0) { + throw new Error( + 'Multiple ' . self::toString($b) . ' modifiers are not allowed'); } if ($a & 48 && $b & 48) { diff --git a/vendor/nikic/php-parser/lib/PhpParser/NameContext.php b/vendor/nikic/php-parser/lib/PhpParser/NameContext.php index 292df691..2265ecce 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/NameContext.php +++ b/vendor/nikic/php-parser/lib/PhpParser/NameContext.php @@ -185,7 +185,7 @@ public function getPossibleNames(string $name, int $type): array { // Check for relevant type-specific use statements foreach ($this->origAliases[$type] as $alias => $orig) { if ($type === Stmt\Use_::TYPE_CONSTANT) { - // Constants are are complicated-sensitive + // Constants are complicated-sensitive $normalizedOrig = $this->normalizeConstName($orig->toString()); if ($normalizedOrig === $this->normalizeConstName($name)) { $possibleNames[] = new Name($alias); diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Param.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Param.php index 0e9ff0e2..a277ca0a 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Param.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Param.php @@ -21,6 +21,8 @@ class Param extends NodeAbstract { public int $flags; /** @var AttributeGroup[] PHP attribute groups */ public array $attrGroups; + /** @var PropertyHook[] Property hooks for promoted properties */ + public array $hooks; /** * Constructs a parameter node. @@ -33,13 +35,15 @@ class Param extends NodeAbstract { * @param array $attributes Additional attributes * @param int $flags Optional visibility flags * @param list $attrGroups PHP attribute groups + * @param PropertyHook[] $hooks Property hooks for promoted properties */ public function __construct( Expr $var, ?Expr $default = null, ?Node $type = null, bool $byRef = false, bool $variadic = false, array $attributes = [], int $flags = 0, - array $attrGroups = [] + array $attrGroups = [], + array $hooks = [] ) { $this->attributes = $attributes; $this->type = $type; @@ -49,10 +53,11 @@ public function __construct( $this->default = $default; $this->flags = $flags; $this->attrGroups = $attrGroups; + $this->hooks = $hooks; } public function getSubNodeNames(): array { - return ['attrGroups', 'flags', 'type', 'byRef', 'variadic', 'var', 'default']; + return ['attrGroups', 'flags', 'type', 'byRef', 'variadic', 'var', 'default', 'hooks']; } public function getType(): string { @@ -81,4 +86,25 @@ public function isPrivate(): bool { public function isReadonly(): bool { return (bool) ($this->flags & Modifiers::READONLY); } + + /** + * Whether the promoted property has explicit public(set) visibility. + */ + public function isPublicSet(): bool { + return (bool) ($this->flags & Modifiers::PUBLIC_SET); + } + + /** + * Whether the promoted property has explicit protected(set) visibility. + */ + public function isProtectedSet(): bool { + return (bool) ($this->flags & Modifiers::PROTECTED_SET); + } + + /** + * Whether the promoted property has explicit private(set) visibility. + */ + public function isPrivateSet(): bool { + return (bool) ($this->flags & Modifiers::PRIVATE_SET); + } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Property.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Property.php index 872ea6b7..3b238c76 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Property.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Property.php @@ -18,6 +18,8 @@ class Property extends Node\Stmt { public ?Node $type; /** @var Node\AttributeGroup[] PHP attribute groups */ public array $attrGroups; + /** @var Node\PropertyHook[] Property hooks */ + public array $hooks; /** * Constructs a class property list node. @@ -27,17 +29,19 @@ class Property extends Node\Stmt { * @param array $attributes Additional attributes * @param null|Identifier|Name|ComplexType $type Type declaration * @param Node\AttributeGroup[] $attrGroups PHP attribute groups + * @param Node\PropertyHook[] $hooks Property hooks */ - public function __construct(int $flags, array $props, array $attributes = [], ?Node $type = null, array $attrGroups = []) { + public function __construct(int $flags, array $props, array $attributes = [], ?Node $type = null, array $attrGroups = [], array $hooks = []) { $this->attributes = $attributes; $this->flags = $flags; $this->props = $props; $this->type = $type; $this->attrGroups = $attrGroups; + $this->hooks = $hooks; } public function getSubNodeNames(): array { - return ['attrGroups', 'flags', 'type', 'props']; + return ['attrGroups', 'flags', 'type', 'props', 'hooks']; } /** @@ -76,6 +80,27 @@ public function isReadonly(): bool { return (bool) ($this->flags & Modifiers::READONLY); } + /** + * Whether the property has explicit public(set) visibility. + */ + public function isPublicSet(): bool { + return (bool) ($this->flags & Modifiers::PUBLIC_SET); + } + + /** + * Whether the property has explicit protected(set) visibility. + */ + public function isProtectedSet(): bool { + return (bool) ($this->flags & Modifiers::PROTECTED_SET); + } + + /** + * Whether the property has explicit private(set) visibility. + */ + public function isPrivateSet(): bool { + return (bool) ($this->flags & Modifiers::PRIVATE_SET); + } + public function getType(): string { return 'Stmt_Property'; } diff --git a/vendor/nikic/php-parser/lib/PhpParser/NodeDumper.php b/vendor/nikic/php-parser/lib/PhpParser/NodeDumper.php index a2535de7..39ce86aa 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/NodeDumper.php +++ b/vendor/nikic/php-parser/lib/PhpParser/NodeDumper.php @@ -185,6 +185,15 @@ protected function dumpFlags(int $flags): string { if ($flags & Modifiers::READONLY) { $strs[] = 'READONLY'; } + if ($flags & Modifiers::PUBLIC_SET) { + $strs[] = 'PUBLIC_SET'; + } + if ($flags & Modifiers::PROTECTED_SET) { + $strs[] = 'PROTECTED_SET'; + } + if ($flags & Modifiers::PRIVATE_SET) { + $strs[] = 'PRIVATE_SET'; + } if ($strs) { return implode(' | ', $strs) . ' (' . $flags . ')'; diff --git a/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php b/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php index ccd014eb..99449c49 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php +++ b/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php @@ -110,6 +110,12 @@ public function enterNode(Node $node) { $node->type = $this->resolveType($node->type); } $this->resolveAttrGroups($node); + } elseif ($node instanceof Node\PropertyHook) { + foreach ($node->params as $param) { + $param->type = $this->resolveType($param->type); + $this->resolveAttrGroups($param); + } + $this->resolveAttrGroups($node); } elseif ($node instanceof Stmt\Const_) { foreach ($node->consts as $const) { $this->addNamespacedName($const); diff --git a/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php b/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php index 050f91e8..2ab16954 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php @@ -122,54 +122,58 @@ class Php7 extends \PhpParser\ParserAbstract public const T_PROTECTED = 357; public const T_PUBLIC = 358; public const T_READONLY = 359; - public const T_VAR = 360; - public const T_UNSET = 361; - public const T_ISSET = 362; - public const T_EMPTY = 363; - public const T_HALT_COMPILER = 364; - public const T_CLASS = 365; - public const T_TRAIT = 366; - public const T_INTERFACE = 367; - public const T_ENUM = 368; - public const T_EXTENDS = 369; - public const T_IMPLEMENTS = 370; - public const T_OBJECT_OPERATOR = 371; - public const T_NULLSAFE_OBJECT_OPERATOR = 372; - public const T_LIST = 373; - public const T_ARRAY = 374; - public const T_CALLABLE = 375; - public const T_CLASS_C = 376; - public const T_TRAIT_C = 377; - public const T_METHOD_C = 378; - public const T_FUNC_C = 379; - public const T_LINE = 380; - public const T_FILE = 381; - public const T_START_HEREDOC = 382; - public const T_END_HEREDOC = 383; - public const T_DOLLAR_OPEN_CURLY_BRACES = 384; - public const T_CURLY_OPEN = 385; - public const T_PAAMAYIM_NEKUDOTAYIM = 386; - public const T_NAMESPACE = 387; - public const T_NS_C = 388; - public const T_DIR = 389; - public const T_NS_SEPARATOR = 390; - public const T_ELLIPSIS = 391; - public const T_NAME_FULLY_QUALIFIED = 392; - public const T_NAME_QUALIFIED = 393; - public const T_NAME_RELATIVE = 394; - public const T_ATTRIBUTE = 395; + public const T_PUBLIC_SET = 360; + public const T_PROTECTED_SET = 361; + public const T_PRIVATE_SET = 362; + public const T_VAR = 363; + public const T_UNSET = 364; + public const T_ISSET = 365; + public const T_EMPTY = 366; + public const T_HALT_COMPILER = 367; + public const T_CLASS = 368; + public const T_TRAIT = 369; + public const T_INTERFACE = 370; + public const T_ENUM = 371; + public const T_EXTENDS = 372; + public const T_IMPLEMENTS = 373; + public const T_OBJECT_OPERATOR = 374; + public const T_NULLSAFE_OBJECT_OPERATOR = 375; + public const T_LIST = 376; + public const T_ARRAY = 377; + public const T_CALLABLE = 378; + public const T_CLASS_C = 379; + public const T_TRAIT_C = 380; + public const T_METHOD_C = 381; + public const T_FUNC_C = 382; + public const T_PROPERTY_C = 383; + public const T_LINE = 384; + public const T_FILE = 385; + public const T_START_HEREDOC = 386; + public const T_END_HEREDOC = 387; + public const T_DOLLAR_OPEN_CURLY_BRACES = 388; + public const T_CURLY_OPEN = 389; + public const T_PAAMAYIM_NEKUDOTAYIM = 390; + public const T_NAMESPACE = 391; + public const T_NS_C = 392; + public const T_DIR = 393; + public const T_NS_SEPARATOR = 394; + public const T_ELLIPSIS = 395; + public const T_NAME_FULLY_QUALIFIED = 396; + public const T_NAME_QUALIFIED = 397; + public const T_NAME_RELATIVE = 398; + public const T_ATTRIBUTE = 399; - protected int $tokenToSymbolMapSize = 396; - protected int $actionTableSize = 1268; - protected int $gotoTableSize = 730; + protected int $tokenToSymbolMapSize = 400; + protected int $actionTableSize = 1286; + protected int $gotoTableSize = 646; - protected int $invalidSymbol = 168; + protected int $invalidSymbol = 172; protected int $errorSymbol = 1; protected int $defaultAction = -32766; protected int $unexpectedTokenRule = 32767; protected int $YY2TBLSTATE = 437; - protected int $numNonLeafStates = 743; + protected int $numNonLeafStates = 742; protected array $symbolToName = array( "EOF", @@ -295,6 +299,9 @@ class Php7 extends \PhpParser\ParserAbstract "T_PROTECTED", "T_PUBLIC", "T_READONLY", + "T_PUBLIC_SET", + "T_PROTECTED_SET", + "T_PRIVATE_SET", "T_VAR", "T_UNSET", "T_ISSET", @@ -315,6 +322,7 @@ class Php7 extends \PhpParser\ParserAbstract "T_TRAIT_C", "T_METHOD_C", "T_FUNC_C", + "T_PROPERTY_C", "T_LINE", "T_FILE", "T_START_HEREDOC", @@ -343,32 +351,32 @@ class Php7 extends \PhpParser\ParserAbstract ); protected array $tokenToSymbol = array( - 0, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 56, 166, 168, 167, 55, 168, 168, - 161, 162, 53, 50, 8, 51, 52, 54, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 31, 159, - 44, 16, 46, 30, 68, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 70, 168, 160, 36, 168, 165, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 163, 35, 164, 58, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 1, 2, 3, 4, + 0, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 56, 170, 172, 171, 55, 172, 172, + 165, 166, 53, 50, 8, 51, 52, 54, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 31, 163, + 44, 16, 46, 30, 68, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 70, 172, 164, 36, 172, 169, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 167, 35, 168, 58, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 1, 2, 3, 4, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 32, 33, 34, 37, 38, 39, 40, @@ -382,548 +390,544 @@ class Php7 extends \PhpParser\ParserAbstract 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, - 153, 154, 155, 156, 157, 158 + 153, 154, 155, 156, 157, 158, 159, 160, 161, 162 ); protected array $action = array( - 133, 134, 135, 586, 136, 137, 0, 755, 756, 757, - 138, 38,-32766,-32766,-32766, 151,-32766,-32766,-32766,-32767, - -32767,-32767,-32767, 102, 103, 104, 105, 106, 1116, 1117, - 1118, 1115, 1114, 1113, 1119, 749, 748,-32766,-32766,-32766, + 128, 129, 130, 565, 131, 132, 944, 754, 755, 756, + 133, 38, 838, 485, 561, 1365,-32766,-32766,-32766, 0, + 829, 1122, 1123, 1124, 1118, 1117, 1116, 1125, 1119, 1120, + 1121,-32766,-32766,-32766, -332, 748, 747,-32766, 840,-32766, -32766,-32766,-32766,-32766,-32766,-32766,-32767,-32767,-32767,-32767, - -32767, 1252, 841,-32766, 1331, 758,-32766,-32766,-32766,-32766, - -599,-32766,-32766,-32766, 104, 105, 106, -599, 1315, 265, - 139, 406, 762, 763, 764, 765, 994,-32766, 431,-32766, - -32766, -16,-32766, 242, 1031, 819, 766, 767, 768, 769, - 770, 771, 772, 773, 774, 775, 795, 587, 796, 797, - 798, 799, 787, 788, 347, 348, 790, 791, 776, 777, - 778, 780, 781, 782, 358, 822, 823, 824, 825, 826, - 588, 783, 784, 589, 590,-32766, 807, 805, 806, 818, - 802, 803, 839, 830, 591, 592, 801, 593, 594, 595, - 596, 597, 598, 830, 461, 462, 463, 1040, 804, 599, - 600, 945, 140, 2, 133, 134, 135, 586, 136, 137, - 1064, 755, 756, 757, 138, 38, -328, -110, -110, 1335, - 291, 23, -110,-32766,-32766,-32766, 1334, 35, -110, 1116, - 1117, 1118, 1115, 1114, 1113, 1119, 616,-32766, 129, 749, - 748, 107, 108, 109,-32766, 275,-32766,-32766,-32766,-32766, - -32766,-32766,-32766, 832, 995, -194, 145, 110, 300, 758, - 840, 75,-32766,-32766,-32766, 1360, 142, 328, 1361, -599, - 328, -599, 253, 265, 139, 406, 762, 763, 764, 765, - 82, -272, 431,-32766, 328,-32766,-32766,-32766,-32766, 819, - 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, - 795, 587, 796, 797, 798, 799, 787, 788, 347, 348, - 790, 791, 776, 777, 778, 780, 781, 782, 358, 822, - 823, 824, 825, 826, 588, 783, 784, 589, 590, 834, - 807, 805, 806, 818, 802, 803, 716, 311, 591, 592, - 801, 593, 594, 595, 596, 597, 598, -78, 83, 84, - 85, -85, 804, 599, 600, 313, 149, 779, 750, 751, - 752, 753, 754, 729, 755, 756, 757, 792, 793, 37, - -328, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, - 105, 106, 107, 108, 109, 325, 275, 485,-32766,-32766, - -32766, -58,-32766,-32766,-32766, 963, 964, 127, 110, -194, - 965, 341, 758,-32766,-32766,-32766, 959, -85, 292,-32766, - 1092,-32766,-32766,-32766,-32766,-32766, 759, 760, 761, 762, - 763, 764, 765, -193,-32766, 828,-32766,-32766,-32766, -367, - 431, -367, 819, 766, 767, 768, 769, 770, 771, 772, - 773, 774, 775, 795, 817, 796, 797, 798, 799, 787, - 788, 789, 816, 790, 791, 776, 777, 778, 780, 781, - 782, 821, 822, 823, 824, 825, 826, 827, 783, 784, - 785, 786, -552, 807, 805, 806, 818, 802, 803, 342, - 329, 794, 800, 801, 808, 809, 811, 810, 812, 813, - 1037, 866, 610, 867,-32766, 804, 815, 814, 50, 51, - 52, 516, 53, 54, 835, 1247, 1246, 1248, 55, 56, - -110, 57, 1040, 924, 1094, -110, 1040, -110, 292, 486, - 749, 748, 307, 384, 383, -110, -110, -110, -110, -110, - -110, -110, -110, 425, 924, 284, -552, -552, 372, 291, - 838, 924, 1252, 719, 470, 471, 58, 59,-32766,-32766, - 21, -550, 60, 560, 61, 247, 248, 62, 63, 64, - 65, 66, 67, 68, 69, -552, 28, 267, 70, 446, - 517, 720, 1108, -342, 1279, 1280, 518, -193, 839, 376, - 836, -548, 1277, 42, 25, 519, 391, 520, 241, 521, - 924, 522, 947, 1245, 523, 524, 914, 660, 26, 44, - 45, 447, 379, 378,-32766, 46, 525, 1027, 1026, 1025, - 1028, 370, 340, 442, 1285, -550, -550, 914, 1238, 947, - 527, 528, 529, 839, 914, 839, 1040, 443, 1350, 1243, - -550, 359, 531, 532, 444, 1266, 1267, 1268, 1269, 1263, - 1264, 299, -556, 445, -550, -548, -548, 1270, 1265, 291, - 1039, 1247, 1246, 1248, 300, 749, 748, 71, 364, 845, - -548, 323, 324, 328, -153, -153, -153, 152, 1247, 1246, - 1248, 926, -555, 914, -548, 714, 1063, 154,-32766, -153, - 1093, -153, 155, -153, 741, -153, 156, -596, 28, 268, - 36, 250, 926,-32766, -596, 377, 714, 679, 680, 926, - 839, 1273, 75, 714, 1277, 288, 963, 964, 328, -547, - 393, 526, 7, 1037, -57, 1040, 900, 959, -110, -110, - -110, 32, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 1040, 158, 382, 383, 866, - 1238, 867, 924, 749, 748, 1252, 33, 425, 926, 150, - 409, 924, 714, -153, 531, 532, -87, 1266, 1267, 1268, - 1269, 1263, 1264, 124, 1154, 1156, -84, -4, 924, 1270, - 1265, 125, 721, -547, -547, -546, 130, 749, 748, 73, - -32766, 724, 839, -78, 324, 328, 1245, 131, -547, 300, - -590, 1037, -590,-32766,-32766,-32766, 144,-32766, 159,-32766, - -554,-32766, -547, 160,-32766, 380, 381, 924, 161,-32766, - -32766,-32766, 162, 1040,-32766,-32766,-32766, 385, 386, 163, - 1245,-32766, 422, 651, 652, 914, 839,-32766,-32766,-32766, - -32766,-32766, -73,-32766, 914,-32766, 284, 731,-32766, -546, - -546, -72, 48,-32766,-32766,-32766, -596, -71, -596,-32766, - -32766, 914, -70, -69, -546,-32766, 422, -68, -67, -66, - 74, -110, -110, 141,-32766, -50, -110, 328, -546, -65, - -46, -18, -110, 377, 148, 438, 274, 285, 730, 733, - 298,-32766, 923, 147, 963, 964, 289, 290, -549, 526, - 914, -302, -298, 280, 530, 959, -110, -110, -110, 132, - 980, 281, 300, 941, 714, 75, 301, 302,-32766, 926, - 286, 328, 287, 714, 1245, 334, 293, 10, 294, 275, - 1362,-32766,-32766,-32766, 110,-32766, 926,-32766, 707,-32766, - 714, -4,-32766, 146, 830, 126, 689,-32766,-32766,-32766, - 705, 20,-32766,-32766,-32766, 924, 839, 682, 1245,-32766, - 422, 1123, -549, -549, 649,-32766,-32766,-32766,-32766,-32766, - 565,-32766, 661,-32766, 467, 926,-32766, -549,-32766, 714, - 666,-32766,-32766,-32766,-32766, 496, 667,-32766,-32766,-32766, - 1245, -549, 683,-32766, 422, 924, 571,-32766,-32766,-32766, - 838,-32766,-32766,-32766, 306,-32766, 735, 1278,-32766, 308, - 0, 960, 491,-32766,-32766,-32766,-32766, 0, 0,-32766, - -32766, 0, 1245, 578, 0,-32766, 422, -546, 305,-32766, - -32766,-32766, 312,-32766,-32766,-32766, 0,-32766, 914, 40, - -32766, 0, 0, 1284, 1286,-32766,-32766,-32766, -511, 0, - -501,-32766,-32766, 8, -250, -250, -250,-32766, 422, 614, - 377, 24, 49, 28, 267, 374,-32766, 943, 41, 300, - -275, 963, 964, 738, 739, 839, 526, 858, 914, 1277, - 905, 900, 959, -110, -110, -110, 1004, 981, 988, 978, - 989, -546, -546, 903, -249, -249, -249, 976, 28, 268, - 377, 1274, 288, 1097, 1100, 1101, -546, 1098, 1099, 1105, - 839, 963, 964, 926, 1277, 1238, 526, 714, -250, 850, - -546, 900, 959, -110, -110, -110, 303, 304, 1301, 1319, - 532, 1353, 1266, 1267, 1268, 1269, 1263, 1264, 654, -273, - -584, 375, -583, -582, 1270, 1265, -556, -555, -554, -553, - 1238, -495, 694, 926, 73, 128, 1, 714, -249, 324, - 328, 29, 30, 39, 43, 532, 47, 1266, 1267, 1268, - 1269, 1263, 1264, 72, 76, 77, 78, 79, 80, 1270, - 1265, 81, 143, 153,-32766, 157, 245, 330, 695, 73, - 1245, 359, 360, 361, 324, 328, 362,-32766,-32766,-32766, - 363,-32766, 364,-32766, 365,-32766, 366, 367,-32766, 696, - 697, 368, 369,-32766,-32766,-32766, 371, 439, 559,-32766, - -32766, -272, 13, 14, 15,-32766, 422, 1247, 1246, 1248, - 16, 18, 408, 284,-32766, 487, 488, 495, 498, 499, - 500, 501, 505, 506, 507, 514, 576, 700, 1256, 1194, - 1275, 1066, 1065, 1046, 1233, 1042, -277, -102, 12, 17, - 27, 297, 407, 607, 611, 640, 706, 1198, 1251, 1195, - 1332, 0, 34, 0, 322, 373, 715, 718, 722, 723, - 725, 726, 727, 728, 732, 717, 0, 901, 1357, 1359, - 861, 860, 869, 953, 996, 868, 1358, 952, 950, 951, - 954, 1226, 934, 944, 932, 986, 987, 638, 1356, 1313, - 1302, 1320, 1329, 0, 1211, 0, 0, 328 + -32767, 24,-32766, 1034, -568, 757, 1122, 1123, 1124, 1118, + 1117, 1116, 1125, 1119, 1120, 1121, 2, 381, 382, 265, + 134, 384, 761, 762, 763, 764, 1111, 425, 426, 1300, + 329, 36, 248, 26, 291, 818, 765, 766, 767, 768, + 769, 770, 771, 772, 773, 774, 794, 566, 795, 796, + 797, 798, 786, 787, 346, 347, 789, 790, 775, 776, + 777, 779, 780, 781, 357, 821, 822, 823, 824, 825, + 567, -568, -568, 299, 782, 783, 568, 569, -194, 806, + 804, 805, 817, 801, 802, 35, -193, 570, 571, 800, + 572, 573, 574, 575,-32766, 576, 577, 471, 472, 486, + 238, -568, 803, 578, 579, -371, 135, -371, 128, 129, + 130, 565, 131, 132, 1067, 754, 755, 756, 133, 38, + -32766, 136, 728, 1027, 1026, 1025, 1031, 1028, 1029, 1030, + -32766,-32766,-32766,-32767,-32767,-32767,-32767, 101, 102, 103, + 104, 105, -332, 748, 747, 1043, 923,-32766,-32766,-32766, + 839,-32766, 145,-32766,-32766,-32766,-32766,-32766,-32766,-32766, + -32766,-32766,-32766, 757,-32766,-32766,-32766, 611,-32766, 290, + -32766,-32766,-32766,-32766,-32766, 834, 718, 265, 134, 384, + 761, 762, 763, 764, -615,-32766, 426,-32766,-32766,-32766, + -32766, -615, 251, 818, 765, 766, 767, 768, 769, 770, + 771, 772, 773, 774, 794, 566, 795, 796, 797, 798, + 786, 787, 346, 347, 789, 790, 775, 776, 777, 779, + 780, 781, 357, 821, 822, 823, 824, 825, 567, 913, + 426, 310, 782, 783, 568, 569, -194, 806, 804, 805, + 817, 801, 802, 1288, -193, 570, 571, 800, 572, 573, + 574, 575, -273, 576, 577, 835, 82, 83, 84, -85, + 803, 578, 579, 237, 148, 778, 749, 750, 751, 752, + 753, 150, 754, 755, 756, 791, 792, 37,-32766, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, + 106, 107, 108, 1043, 276,-32766,-32766,-32766, 925, 1263, + 1262, 1264, 713, 831, 312, 393, 109, 7, 1097, 47, + 757,-32766,-32766,-32766, 838, -85,-32766, 1095,-32766,-32766, + -32766, 1268,-32766,-32766, 758, 759, 760, 761, 762, 763, + 764, 994,-32766, 827,-32766,-32766, 923, -615, 324, -615, + 818, 765, 766, 767, 768, 769, 770, 771, 772, 773, + 774, 794, 816, 795, 796, 797, 798, 786, 787, 788, + 815, 789, 790, 775, 776, 777, 779, 780, 781, 820, + 821, 822, 823, 824, 825, 826, 300, 301, 342, 782, + 783, 784, 785, 833, 806, 804, 805, 817, 801, 802, + 715, 1040, 793, 799, 800, 807, 808, 810, 809, 140, + 811, 812, 838, 327, 343,-32766, 125, 803, 814, 813, + 49, 50, 51, 517, 52, 53, 1043, -110, 371, 913, + 54, 55, -110, 56, -110, -566,-32766,-32766,-32766, 306, + 1043, 126, -110, -110, -110, -110, -110, -110, -110, -110, + -110, -110, -110, -612, 1096, 106, 107, 108, 740, 276, + -612, 963, 964,-32766, 290, 287, 965, 1330, 57, 58, + -32766, 109, 375, 995, 59, 959, 60, 245, 246, 61, + 62, 63, 64, 65, 66, 67, 68,-32766, 28, 267, + 69, 441, 518, 391, -346, 74, 1294, 1295, 519, 443, + 838, 327, -566, -566, 1292, 42, 20, 520, 925, 521, + 923, 522, 713, 523, -564, 693, 524, 525, -566, 923, + 444, 44, 45, 447, 378, 377, -78, 46, 526, 923, + -572, 445, -566, 369, 341, 1346, 103, 104, 105, -563, + 1254, 923, 383, 382, 446, 528, 529, 530, 865, 719, + 866, 694, 425, 461, 462, 463, 844, 532, 533, 720, + 1280, 1281, 1282, 1283, 1285, 1277, 1278, 298, 865, 151, + 866, 723, 153, 1284, 1279, 695, 696, 1263, 1262, 1264, + 299, -564, -564, 70, -153, -153, -153, 322, 323, 327, + 154, -4, 923, 913, 1263, 1262, 1264, -564, 155, -153, + 283, -153, 913, -153, 157, -153, -563, -563, 33, -571, + 1350, -564, 913, -58, 829, 376, -612, 1349, -612, 748, + 747, 837, -563, -606, 913, -606, 963, 964, -57, 748, + 747, 527, 123, 81, -570, 1040, -563, 327, 617, 899, + 959, -110, -110, -110, 32, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 124, -565, + 1043, 947, 28, 268, 149, 408, 923, 1375, 829, 137, + 1376, 138, 925, 144, 838, 913, 713, -153, 1292, 660, + 21, 925, 679, 680, 283, 713, 158, 1170, 1172, 379, + 380, 980, 385, 386, 159, 713, 730, 376, -562, 438, + 1066, 141, 160, 925, 297, 327, 161, 713, 963, 964, + 946, 651, 652, 527, 1254, -87, 162, -306, 748, 747, + -84, 531, 959, -110, -110, -110, -565, -565, -78, 287, + 1268, 532, 533, -73, 1280, 1281, 1282, 1283, 1285, 1277, + 1278, -72, -565, -71, -70, 11, 1261, 1284, 1279, 913, + -69, 748, 747, -68, 925,-32766, -565, 72, 713, -4, + -16, 1261, 323, 327, -67, -562, -562, 291,-32766,-32766, + -32766, -66,-32766, -65,-32766, -46,-32766, -18, 142,-32766, + 275, -562, 1259, 284,-32766,-32766,-32766, 729,-32766, 732, + -32766,-32766, 922, 147, 1261, -562,-32766, 422, 28, 267, + -302,-32766,-32766,-32766, 279,-32766, 1042,-32766,-32766,-32766, + 838, 838,-32766, 288, 1292, 1040, 280,-32766,-32766,-32766, + 285, 286, 335,-32766,-32766, 1263, 1262, 1264, 925,-32766, + 422, 289, 713, 28, 268, 292, 293, 276, 940, 73, + 1043,-32766, 109, 689, 146, 838, -110, -110, -562, 1292, + 1254, -110, 829,-32766, 1377, 704, 582, 10, 661, 838, + -110, 1129, 706, 649, 283, 307, 960,-32766, 533,-32766, + 1280, 1281, 1282, 1283, 1285, 1277, 1278, 682, 1043, 305, + -50, 468, 1299, 1284, 1279, 1254, 666, -528, 496, 667, + 304, 299, 683, 72, 74, 1301, 588,-32766, 323, 327, + 327, -518, 290, 533, 40, 1280, 1281, 1282, 1283, 1285, + 1277, 1278, 8, 139, 0, -562, -562, 27, 1284, 1279, + -276, 407, 0,-32766, 0, 0, 0, 0, 72, 1261, + 311, -562, 0, 323, 327, 0,-32766,-32766,-32766, 0, + -32766, 373,-32766, 0,-32766, -562, 0,-32766, 0, 0, + 615, 0,-32766,-32766,-32766, 923,-32766, 0,-32766,-32766, + 942, 1289, 1261, 837,-32766, 422, 41, 299, 34,-32766, + -32766,-32766, 737,-32766, 738,-32766,-32766,-32766, 923, 857, + -32766, 904, 1004, 981, 988,-32766,-32766,-32766, 978,-32766, + 989,-32766,-32766, 902, 976, 1261, 1100,-32766, 422, 48, + 1103, 1104,-32766,-32766,-32766, 1101,-32766, 1102,-32766,-32766, + -32766, 1108, -600,-32766, 849, 1316, 1334, 491,-32766,-32766, + -32766, 1368,-32766, 654,-32766,-32766, -599, -598, 1261, 595, + -32766, 422, -572, -571, 1268,-32766,-32766,-32766, 913,-32766, + -570,-32766,-32766,-32766, -569, -512,-32766, -274, 1, 29, + 30,-32766,-32766,-32766, -251, -251, -251,-32766,-32766, 39, + 376, 913, 43,-32766, 422, 71, 302, 303, 75, 76, + 77, 963, 964, 78, 79,-32766, 527, -250, -250, -250, + -273, 80, 374, 376, 899, 959, -110, -110, -110, 143, + 152, 156, 243, 331, 963, 964, 127, 358, 359, 527, + 360, 361, 362, 363, 364, 365, 366, 899, 959, -110, + -110, -110,-32766, 13, 367, 838, 368, 925, 1261, 14, + 370, 713, -251, 439, 560,-32766,-32766,-32766, 15,-32766, + 16,-32766, 18,-32766, 406, 487,-32766, 488, 495, 498, + 925,-32766,-32766,-32766, 713, -250, 499,-32766,-32766, 500, + -110, -110, 501,-32766, 422, -110, 505, 506, 507, 515, + 593, 699, 1069, 1210, -110,-32766, 1290, 1068, 1049, 1249, + 1045, -278, -102,-32766, 12, 17, 22, 296, 405, 607, + 612, 640, 705, 1214, 1267, 1211, 1347, 0, 321, 372, + 714, 717, 721, 722, 724, 299, 725, 726, 74, 727, + 1227, 731, 716, 0, 327, 411, 1293, 734, 900, 1372, + 1374, 860, 859, 953, 996, 1373, 952, 950, 951, 954, + 1242, 933, 943, 931, 986, 987, 638, 1371, 1328, 1317, + 1335, 1344, 0, 0, 0, 327 ); protected array $actionCheck = array( - 2, 3, 4, 5, 6, 7, 0, 9, 10, 11, - 12, 13, 9, 10, 11, 14, 9, 10, 11, 44, - 45, 46, 47, 48, 49, 50, 51, 52, 116, 117, - 118, 119, 120, 121, 122, 37, 38, 30, 116, 32, + 2, 3, 4, 5, 6, 7, 1, 9, 10, 11, + 12, 13, 82, 31, 85, 85, 9, 10, 11, 0, + 80, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125, 9, 10, 11, 8, 37, 38, 30, 1, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 1, 1, 9, 1, 57, 9, 10, 11, 137, - 1, 9, 10, 11, 50, 51, 52, 8, 1, 71, - 72, 73, 74, 75, 76, 77, 31, 30, 80, 32, - 33, 31, 30, 14, 1, 87, 88, 89, 90, 91, + 43, 101, 30, 1, 70, 57, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 8, 106, 107, 71, + 72, 73, 74, 75, 76, 77, 126, 116, 80, 150, + 70, 151, 152, 8, 30, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 116, 128, 129, 130, 131, - 132, 133, 82, 80, 136, 137, 138, 139, 140, 141, - 142, 143, 144, 80, 129, 130, 131, 138, 150, 151, - 152, 1, 154, 8, 2, 3, 4, 5, 6, 7, - 162, 9, 10, 11, 12, 13, 8, 117, 118, 1, - 161, 8, 122, 9, 10, 11, 8, 8, 128, 116, - 117, 118, 119, 120, 121, 122, 51, 137, 8, 37, - 38, 53, 54, 55, 30, 57, 32, 33, 34, 35, - 36, 37, 38, 80, 159, 8, 8, 69, 158, 57, - 159, 161, 9, 10, 11, 80, 163, 167, 83, 160, - 167, 162, 8, 71, 72, 73, 74, 75, 76, 77, - 163, 162, 80, 30, 167, 32, 33, 34, 35, 87, - 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 156, - 128, 129, 130, 131, 132, 133, 163, 8, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 16, 9, 10, - 11, 31, 150, 151, 152, 8, 154, 2, 3, 4, - 5, 6, 7, 163, 9, 10, 11, 12, 13, 30, - 162, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 8, 57, 31, 9, 10, - 11, 16, 9, 10, 11, 117, 118, 14, 69, 162, - 122, 8, 57, 9, 10, 11, 128, 97, 30, 30, - 1, 32, 33, 34, 35, 36, 71, 72, 73, 74, - 75, 76, 77, 8, 30, 80, 32, 33, 34, 106, - 80, 108, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, - 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 70, 128, 129, 130, 131, 132, 133, 8, - 70, 136, 137, 138, 139, 140, 141, 142, 143, 144, - 116, 106, 1, 108, 116, 150, 151, 152, 2, 3, - 4, 5, 6, 7, 80, 155, 156, 157, 12, 13, - 101, 15, 138, 1, 164, 106, 138, 108, 30, 163, - 37, 38, 113, 106, 107, 116, 117, 118, 119, 120, - 121, 122, 123, 116, 1, 161, 134, 135, 8, 161, - 155, 1, 1, 31, 134, 135, 50, 51, 9, 10, - 101, 70, 56, 85, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 163, 70, 71, 72, 73, - 74, 31, 123, 164, 78, 79, 80, 162, 82, 8, - 156, 70, 86, 87, 88, 89, 8, 91, 97, 93, - 1, 95, 122, 80, 98, 99, 84, 75, 76, 103, - 104, 105, 106, 107, 116, 109, 110, 119, 120, 121, - 122, 115, 116, 8, 146, 134, 135, 84, 122, 122, - 124, 125, 126, 82, 84, 82, 138, 8, 85, 116, - 149, 161, 136, 137, 8, 139, 140, 141, 142, 143, - 144, 145, 161, 8, 163, 134, 135, 151, 152, 161, - 137, 155, 156, 157, 158, 37, 38, 161, 161, 8, - 149, 165, 166, 167, 75, 76, 77, 14, 155, 156, - 157, 159, 161, 84, 163, 163, 1, 14, 137, 90, - 159, 92, 14, 94, 163, 96, 14, 1, 70, 71, - 147, 148, 159, 116, 8, 106, 163, 75, 76, 159, - 82, 1, 161, 163, 86, 30, 117, 118, 167, 70, - 106, 122, 108, 116, 16, 138, 127, 128, 129, 130, - 131, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 138, 14, 106, 107, 106, - 122, 108, 1, 37, 38, 1, 14, 116, 159, 101, - 102, 1, 163, 164, 136, 137, 31, 139, 140, 141, - 142, 143, 144, 16, 59, 60, 31, 0, 1, 151, - 152, 16, 31, 134, 135, 70, 16, 37, 38, 161, - 74, 31, 82, 31, 166, 167, 80, 16, 149, 158, - 160, 116, 162, 87, 88, 89, 16, 91, 16, 93, - 161, 95, 163, 16, 98, 106, 107, 1, 16, 103, - 104, 105, 16, 138, 74, 109, 110, 106, 107, 16, - 80, 115, 116, 111, 112, 84, 82, 87, 88, 89, - 124, 91, 31, 93, 84, 95, 161, 31, 98, 134, - 135, 31, 70, 103, 104, 105, 160, 31, 162, 109, - 110, 84, 31, 31, 149, 115, 116, 31, 31, 31, - 154, 117, 118, 163, 124, 31, 122, 167, 163, 31, - 31, 31, 128, 106, 31, 108, 31, 31, 31, 31, - 113, 137, 31, 31, 117, 118, 37, 37, 70, 122, - 84, 35, 35, 35, 127, 128, 129, 130, 131, 31, - 159, 35, 158, 38, 163, 161, 134, 135, 74, 159, - 35, 167, 35, 163, 80, 35, 37, 150, 37, 57, - 83, 87, 88, 89, 69, 91, 159, 93, 92, 95, - 163, 164, 98, 70, 80, 163, 77, 103, 104, 105, - 80, 97, 74, 109, 110, 1, 82, 94, 80, 115, - 116, 82, 134, 135, 113, 87, 88, 89, 124, 91, - 89, 93, 90, 95, 97, 159, 98, 149, 85, 163, - 96, 103, 104, 105, 74, 97, 100, 109, 110, 137, - 80, 163, 100, 115, 116, 1, 153, 87, 88, 89, - 155, 91, 124, 93, 133, 95, 164, 166, 98, 114, - -1, 128, 102, 103, 104, 105, 74, -1, -1, 109, - 110, -1, 80, 81, -1, 115, 116, 70, 132, 87, - 88, 89, 132, 91, 124, 93, -1, 95, 84, 159, - 98, -1, -1, 146, 146, 103, 104, 105, 149, -1, - 149, 109, 110, 149, 100, 101, 102, 115, 116, 153, - 106, 149, 70, 70, 71, 149, 124, 154, 159, 158, - 162, 117, 118, 159, 159, 82, 122, 159, 84, 86, - 159, 127, 128, 129, 130, 131, 159, 159, 159, 159, - 159, 134, 135, 159, 100, 101, 102, 159, 70, 71, - 106, 160, 30, 159, 159, 159, 149, 159, 159, 159, - 82, 117, 118, 159, 86, 122, 122, 163, 164, 160, - 163, 127, 128, 129, 130, 131, 134, 135, 160, 160, - 137, 160, 139, 140, 141, 142, 143, 144, 160, 162, - 161, 149, 161, 161, 151, 152, 161, 161, 161, 161, - 122, 161, 80, 159, 161, 163, 161, 163, 164, 166, - 167, 161, 161, 161, 161, 137, 161, 139, 140, 141, - 142, 143, 144, 161, 161, 161, 161, 161, 161, 151, - 152, 161, 161, 161, 74, 161, 161, 161, 116, 161, - 80, 161, 161, 161, 166, 167, 161, 87, 88, 89, - 161, 91, 161, 93, 161, 95, 161, 161, 98, 137, - 138, 161, 161, 103, 104, 105, 161, 161, 161, 109, - 110, 162, 162, 162, 162, 115, 116, 155, 156, 157, - 162, 162, 162, 161, 124, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, -1, 163, -1, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, -1, 164, 164, 164, - 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, - 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, - 164, 164, 164, -1, 165, -1, -1, 167 + 122, 137, 138, 162, 126, 127, 128, 129, 8, 131, + 132, 133, 134, 135, 136, 8, 8, 139, 140, 141, + 142, 143, 144, 145, 9, 147, 148, 137, 138, 167, + 14, 167, 154, 155, 156, 106, 158, 108, 2, 3, + 4, 5, 6, 7, 166, 9, 10, 11, 12, 13, + 116, 8, 167, 119, 120, 121, 122, 123, 124, 125, + 9, 10, 11, 44, 45, 46, 47, 48, 49, 50, + 51, 52, 166, 37, 38, 141, 1, 9, 10, 11, + 163, 30, 8, 32, 33, 34, 35, 36, 37, 38, + 9, 10, 11, 57, 9, 10, 11, 1, 30, 165, + 32, 33, 34, 35, 36, 80, 31, 71, 72, 73, + 74, 75, 76, 77, 1, 30, 80, 32, 33, 34, + 35, 8, 8, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 122, 84, + 80, 8, 126, 127, 128, 129, 166, 131, 132, 133, + 134, 135, 136, 1, 166, 139, 140, 141, 142, 143, + 144, 145, 166, 147, 148, 160, 9, 10, 11, 31, + 154, 155, 156, 97, 158, 2, 3, 4, 5, 6, + 7, 14, 9, 10, 11, 12, 13, 30, 116, 32, + 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, + 53, 54, 55, 141, 57, 9, 10, 11, 163, 159, + 160, 161, 167, 80, 8, 106, 69, 108, 168, 70, + 57, 9, 10, 11, 82, 97, 30, 1, 32, 33, + 34, 1, 9, 10, 71, 72, 73, 74, 75, 76, + 77, 31, 30, 80, 32, 33, 1, 164, 8, 166, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, + 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, + 117, 118, 119, 120, 121, 122, 137, 138, 8, 126, + 127, 128, 129, 160, 131, 132, 133, 134, 135, 136, + 167, 116, 139, 140, 141, 142, 143, 144, 145, 167, + 147, 148, 82, 171, 8, 116, 167, 154, 155, 156, + 2, 3, 4, 5, 6, 7, 141, 101, 8, 84, + 12, 13, 106, 15, 108, 70, 9, 10, 11, 113, + 141, 14, 116, 117, 118, 119, 120, 121, 122, 123, + 124, 125, 126, 1, 163, 53, 54, 55, 167, 57, + 8, 117, 118, 116, 165, 30, 122, 1, 50, 51, + 140, 69, 8, 163, 56, 131, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 68, 140, 70, 71, + 72, 73, 74, 8, 168, 165, 78, 79, 80, 8, + 82, 171, 137, 138, 86, 87, 88, 89, 163, 91, + 1, 93, 167, 95, 70, 80, 98, 99, 153, 1, + 8, 103, 104, 105, 106, 107, 16, 109, 110, 1, + 165, 8, 167, 115, 116, 1, 50, 51, 52, 70, + 122, 1, 106, 107, 8, 127, 128, 129, 106, 31, + 108, 116, 116, 132, 133, 134, 8, 139, 140, 31, + 142, 143, 144, 145, 146, 147, 148, 149, 106, 14, + 108, 31, 14, 155, 156, 140, 141, 159, 160, 161, + 162, 137, 138, 165, 75, 76, 77, 169, 170, 171, + 14, 0, 1, 84, 159, 160, 161, 153, 14, 90, + 165, 92, 84, 94, 14, 96, 137, 138, 14, 165, + 1, 167, 84, 16, 80, 106, 164, 8, 166, 37, + 38, 159, 153, 164, 84, 166, 117, 118, 16, 37, + 38, 122, 16, 167, 165, 116, 167, 171, 51, 130, + 131, 132, 133, 134, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, 16, 70, + 141, 73, 70, 71, 101, 102, 1, 80, 80, 16, + 83, 16, 163, 16, 82, 84, 167, 168, 86, 75, + 76, 163, 75, 76, 165, 167, 16, 59, 60, 106, + 107, 163, 106, 107, 16, 167, 31, 106, 70, 108, + 1, 167, 16, 163, 113, 171, 16, 167, 117, 118, + 122, 111, 112, 122, 122, 31, 16, 35, 37, 38, + 31, 130, 131, 132, 133, 134, 137, 138, 31, 30, + 1, 139, 140, 31, 142, 143, 144, 145, 146, 147, + 148, 31, 153, 31, 31, 154, 80, 155, 156, 84, + 31, 37, 38, 31, 163, 74, 167, 165, 167, 168, + 31, 80, 170, 171, 31, 137, 138, 30, 87, 88, + 89, 31, 91, 31, 93, 31, 95, 31, 31, 98, + 31, 153, 116, 31, 103, 104, 105, 31, 74, 31, + 109, 110, 31, 31, 80, 167, 115, 116, 70, 71, + 35, 87, 88, 89, 35, 91, 140, 93, 127, 95, + 82, 82, 98, 37, 86, 116, 35, 103, 104, 105, + 35, 35, 35, 109, 110, 159, 160, 161, 163, 115, + 116, 37, 167, 70, 71, 37, 37, 57, 38, 158, + 141, 127, 69, 77, 70, 82, 117, 118, 70, 86, + 122, 122, 80, 116, 83, 80, 89, 97, 90, 82, + 131, 82, 92, 113, 165, 114, 131, 85, 140, 140, + 142, 143, 144, 145, 146, 147, 148, 94, 141, 136, + 31, 97, 150, 155, 156, 122, 96, 153, 97, 100, + 135, 162, 100, 165, 165, 150, 157, 140, 170, 171, + 171, 153, 165, 140, 163, 142, 143, 144, 145, 146, + 147, 148, 153, 31, -1, 137, 138, 153, 155, 156, + 166, 168, -1, 74, -1, -1, -1, -1, 165, 80, + 135, 153, -1, 170, 171, -1, 87, 88, 89, -1, + 91, 153, 93, -1, 95, 167, -1, 98, -1, -1, + 157, -1, 103, 104, 105, 1, 74, -1, 109, 110, + 158, 164, 80, 159, 115, 116, 163, 162, 167, 87, + 88, 89, 163, 91, 163, 93, 127, 95, 1, 163, + 98, 163, 163, 163, 163, 103, 104, 105, 163, 74, + 163, 109, 110, 163, 163, 80, 163, 115, 116, 70, + 163, 163, 87, 88, 89, 163, 91, 163, 93, 127, + 95, 163, 165, 98, 164, 164, 164, 102, 103, 104, + 105, 164, 74, 164, 109, 110, 165, 165, 80, 81, + 115, 116, 165, 165, 1, 87, 88, 89, 84, 91, + 165, 93, 127, 95, 165, 165, 98, 166, 165, 165, + 165, 103, 104, 105, 100, 101, 102, 109, 110, 165, + 106, 84, 165, 115, 116, 165, 137, 138, 165, 165, + 165, 117, 118, 165, 165, 127, 122, 100, 101, 102, + 166, 165, 153, 106, 130, 131, 132, 133, 134, 165, + 165, 165, 165, 165, 117, 118, 167, 165, 165, 122, + 165, 165, 165, 165, 165, 165, 165, 130, 131, 132, + 133, 134, 74, 166, 165, 82, 165, 163, 80, 166, + 165, 167, 168, 165, 165, 87, 88, 89, 166, 91, + 166, 93, 166, 95, 166, 166, 98, 166, 166, 166, + 163, 103, 104, 105, 167, 168, 166, 109, 110, 166, + 117, 118, 166, 115, 116, 122, 166, 166, 166, 166, + 166, 166, 166, 166, 131, 127, 166, 166, 166, 166, + 166, 166, 166, 140, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, -1, 167, 167, + 167, 167, 167, 167, 167, 162, 167, 167, 165, 167, + 169, 167, 167, -1, 171, 168, 170, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, + 168, 168, -1, -1, -1, 171 ); protected array $actionBase = array( - 0, -2, 152, 549, 727, 904, 944, 1022, 660, 310, - 123, 899, 500, 710, 710, 766, 710, 472, 701, 820, - 63, 305, 305, 820, 305, 493, 493, 493, 666, 666, - 666, 666, 700, 700, 860, 860, 892, 828, 794, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 51, 45, 451, 692, 1049, 1055, - 1051, 1056, 1047, 1046, 1050, 1052, 1057, 1094, 1095, 812, - 1096, 1097, 1093, 1098, 1053, 928, 1048, 1054, 289, 289, - 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 289, 289, 289, 289, 289, 44, 343, 499, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 52, 52, - 52, 578, 578, 47, 354, 978, 943, 978, 978, 978, - 978, 978, 978, 978, 978, 203, 665, 339, 164, 164, - 7, 7, 7, 7, 7, 50, 369, 704, 704, -25, - -25, -25, -25, 448, 635, 501, 409, 283, 338, 591, - 334, 334, 14, 14, 557, 557, 9, 9, 557, 557, - 557, 537, 537, 537, 537, 441, 471, 599, 345, 428, - 802, 53, 53, 53, 53, 802, 802, 802, 802, 848, - 791, 802, 802, 802, 778, 907, 907, 942, 138, 138, - 138, 907, 593, 503, 503, 593, 238, 503, 67, 135, - -78, 833, 377, 590, -78, 362, 732, 646, 59, 795, - 659, 795, 1045, 430, 843, 843, 457, 799, 761, 900, - 1072, 1058, 836, 1091, 842, 1092, 15, 370, 712, 1044, - 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, 1044, - 1100, 443, 1045, 384, 1100, 1100, 1100, 443, 443, 443, - 443, 443, 443, 443, 443, 443, 443, 672, 384, 482, - 582, 384, 840, 443, 51, 851, 51, 51, 51, 51, - 51, 51, 51, 51, 51, 51, 800, 316, 51, 45, - 150, 150, 481, 83, 150, 150, 150, 150, 51, 51, - 51, 51, 659, 822, 793, 671, 856, 375, 822, 822, - 822, 270, 158, 69, 197, 816, 817, 564, 814, 814, - 829, 945, 814, 824, 814, 829, 955, 814, 814, 945, - 945, 861, 945, 180, 565, 353, 531, 579, 945, 279, - 814, 814, 814, 814, 850, 945, 586, 814, 214, 198, - 814, 814, 850, 846, 806, 145, 821, 945, 945, 945, - 850, 490, 821, 821, 821, 864, 865, 801, 805, 337, - 297, 611, 169, 825, 805, 805, 814, 538, 801, 805, - 801, 805, 863, 805, 805, 805, 801, 805, 824, 431, - 805, 742, 595, 163, 805, 6, 962, 963, 685, 964, - 952, 965, 1006, 966, 967, 1063, 940, 975, 953, 970, - 1007, 951, 950, 811, 707, 715, 854, 849, 938, 815, - 815, 815, 935, 936, 815, 815, 815, 815, 815, 815, - 815, 815, 707, 891, 866, 831, 981, 720, 731, 1034, - 847, 1073, 1099, 980, 1036, 971, 830, 740, 1019, 982, - 792, 1061, 985, 989, 1020, 1037, 868, 1038, 1074, 823, - 1075, 1076, 909, 993, 1064, 815, 962, 967, 695, 953, - 970, 951, 950, 798, 788, 786, 787, 782, 781, 770, - 776, 803, 1039, 932, 929, 918, 991, 937, 707, 919, - 1010, 1059, 1023, 1024, 1062, 827, 797, 921, 1077, 995, - 996, 1000, 1065, 1040, 1066, 859, 1011, 858, 1025, 838, - 1078, 1026, 1027, 1028, 1029, 1067, 1079, 1068, 931, 1069, - 871, 832, 927, 834, 1080, 1, 835, 837, 841, 1005, - 613, 976, 1070, 1081, 1082, 1030, 1031, 1032, 1083, 1084, - 972, 877, 1012, 813, 1018, 1009, 878, 879, 623, 839, - 1041, 818, 826, 810, 628, 632, 1085, 1086, 1087, 974, - 807, 819, 880, 881, 1042, 809, 1043, 1088, 682, 884, - 747, 1089, 1035, 752, 756, 281, 658, 335, 763, 796, - 1071, 862, 845, 804, 1001, 756, 808, 888, 1090, 894, - 895, 896, 1033, 898, 0, 0, 0, 0, 0, 0, + 0, -2, 156, 559, 641, 1004, 1027, 485, 292, 200, + -60, 283, 568, 590, 590, 715, 590, 195, 578, 894, + 395, 395, 395, 825, 313, 313, 825, 313, 731, 731, + 731, 731, 764, 764, 965, 965, 998, 932, 899, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 37, 360, 216, 644, 1061, 1067, 1063, + 1068, 1059, 1058, 1062, 1064, 1069, 1109, 1110, 812, 1111, + 1112, 1108, 1113, 1065, 909, 1060, 1066, 297, 297, 297, + 297, 297, 297, 297, 297, 297, 297, 297, 297, 297, + 297, 297, 297, 297, 297, 297, 297, 297, 297, 297, + 297, 297, 297, 297, 135, 477, 373, 201, 201, 201, + 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, + 201, 201, 201, 201, 201, 201, 201, 642, 642, 22, + 22, 22, 362, 813, 778, 813, 813, 813, 813, 813, + 813, 813, 813, 346, 205, 678, 188, 171, 171, 7, + 7, 7, 7, 7, 376, 779, 54, 1083, 1083, 139, + 139, 139, 139, -50, 49, 749, 380, 787, -39, 569, + 569, 536, 536, 335, 335, 349, 349, 335, 335, 335, + 212, 212, 212, 212, 415, 494, 519, 512, -71, 807, + 584, 584, 584, 584, 807, 807, 807, 807, 795, 1086, + 807, 807, 807, 639, 828, 828, 979, 452, 452, 452, + 828, 492, -70, -70, 492, 394, -70, 516, 982, 637, + 988, 397, 785, 486, 509, 397, -16, 299, 502, 233, + 854, 633, 854, 1056, 832, 832, 794, 752, 898, 1085, + 1070, 839, 1106, 842, 1107, 471, 10, 747, 1055, 1055, + 1055, 1055, 1055, 1055, 1055, 1055, 1055, 1055, 1055, 1114, + 632, 1056, 145, 1114, 1114, 1114, 632, 632, 632, 632, + 632, 632, 632, 632, 796, 632, 632, 650, 145, 654, + 657, 145, 837, 632, 798, 37, 37, 37, 37, 37, + 37, 37, 37, 37, 37, -18, 37, 37, 360, 5, + 5, 37, 341, 52, 5, 5, 5, 5, 37, 37, + 37, 37, 633, 830, 789, 636, 278, 843, 128, 830, + 830, 830, 26, 136, 120, 732, 815, 259, 822, 822, + 829, 933, 933, 822, 827, 822, 829, 822, 822, 933, + 933, 855, 933, 163, 541, 430, 514, 562, 933, 273, + 822, 822, 822, 822, 845, 933, 58, 573, 822, 234, + 194, 822, 822, 845, 805, 802, 793, 933, 933, 933, + 845, 470, 793, 793, 793, 859, 861, 800, 799, 390, + 356, 598, 127, 850, 799, 799, 822, 535, 800, 799, + 800, 799, 852, 799, 799, 799, 800, 799, 827, 456, + 799, 720, 728, 586, 75, 799, 19, 950, 953, 734, + 954, 944, 955, 1008, 958, 959, 1073, 930, 977, 947, + 966, 1009, 935, 934, 811, 666, 692, 809, 784, 929, + 823, 823, 823, 917, 918, 823, 823, 823, 823, 823, + 823, 823, 823, 666, 847, 838, 817, 983, 703, 705, + 1044, 782, 1090, 1081, 982, 950, 959, 739, 947, 966, + 935, 934, 792, 790, 772, 783, 769, 763, 760, 762, + 797, 1046, 974, 791, 707, 1016, 985, 1089, 1071, 986, + 987, 1018, 1047, 866, 1050, 1091, 824, 1092, 1093, 900, + 989, 1074, 823, 912, 897, 901, 988, 925, 666, 902, + 1051, 997, 851, 1019, 1021, 1072, 834, 821, 907, 1094, + 990, 991, 999, 1075, 1076, 853, 1003, 804, 1022, 841, + 803, 1023, 1030, 1033, 1036, 1077, 1095, 1079, 911, 1080, + 868, 818, 931, 840, 1096, 307, 835, 836, 849, 1005, + 605, 978, 1082, 1087, 1097, 1040, 1041, 1042, 1098, 1099, + 975, 869, 1012, 833, 1014, 964, 870, 871, 608, 848, + 1052, 819, 831, 844, 626, 634, 1100, 1101, 1102, 976, + 806, 816, 875, 877, 1053, 826, 1054, 1103, 640, 880, + 1104, 1045, 736, 740, 560, 662, 647, 750, 820, 1084, + 814, 801, 810, 1001, 740, 808, 881, 1105, 883, 887, + 888, 1043, 892, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 456, 456, 456, 456, 456, 456, - 305, 305, 305, 305, 305, 456, 456, 456, 456, 456, - 456, 456, 305, 305, 0, 0, 305, 0, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 289, 289, 289, - 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 289, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 468, 468, 468, 468, 468, 468, 313, + 313, 313, 313, 313, 468, 468, 468, 468, 468, 468, + 468, 313, 468, 468, 468, 313, 0, 0, 313, 0, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 297, 297, 297, 297, 297, + 297, 297, 297, 297, 297, 297, 297, 297, 297, 297, + 297, 297, 297, 297, 297, 297, 297, 297, 297, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 289, 289, - 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 289, 289, 289, 289, 473, 473, 289, 289, 473, 473, - 473, 473, 473, 473, 473, 473, 473, 473, 289, 0, - 289, 289, 289, 289, 289, 289, 289, 289, 473, 861, - 473, 473, 138, 138, 138, 138, 473, 473, 473, -88, - -88, 473, 238, 473, 473, 138, 138, 473, 473, 473, - 473, 473, 473, 473, 473, 473, 473, 473, 0, 0, - 0, 384, 503, 473, 824, 824, 824, 824, 473, 473, - 473, 473, 503, 503, 473, 473, 473, 0, 0, 0, - 0, 0, 0, 0, 0, 384, 0, 0, 384, 0, - 0, 824, 824, 473, 238, 861, 168, 473, 0, 0, - 0, 0, 384, 824, 384, 443, 814, 503, 503, 814, - 443, 443, 150, 51, 168, 608, 608, 608, 608, 0, - 0, 659, 861, 861, 861, 861, 861, 861, 861, 861, - 861, 861, 861, 824, 0, 861, 0, 824, 824, 824, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 824, 0, 0, 945, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 955, - 0, 0, 0, 0, 0, 0, 824, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 815, 827, 0, 827, - 0, 815, 815, 815, 0, 0, 0, 0, 839, 809 + 0, 0, 0, 0, 0, 0, 297, 297, 297, 297, + 297, 297, 297, 297, 297, 297, 297, 297, 297, 297, + 297, 297, 297, 297, 297, 297, 297, 297, 297, 716, + 716, 297, 297, 297, 297, 716, 716, 716, 716, 716, + 716, 716, 716, 716, 716, 297, 297, 0, 297, 297, + 297, 297, 297, 297, 297, 297, 855, 716, 716, 716, + 716, 452, 452, 452, 452, -95, -95, 716, 716, 716, + 394, 716, 716, 452, 452, 716, 716, 716, 716, 716, + 716, 716, 716, 716, 716, 716, 0, 0, 0, 145, + -70, 716, 827, 827, 827, 827, 716, 716, 716, 716, + -70, -70, 716, 716, 716, 0, 0, 0, 0, 0, + 0, 0, 0, 145, 0, 0, 145, 0, 0, 827, + 638, 827, 638, 716, 394, 855, 659, 716, 0, 0, + 0, 0, 145, 827, 145, 632, -70, -70, 632, 632, + 5, 37, 659, 613, 613, 613, 613, 0, 0, 633, + 855, 855, 855, 855, 855, 855, 855, 855, 855, 855, + 855, 827, 0, 855, 0, 827, 827, 827, 0, 0, + 0, 0, 0, 0, 0, 0, 933, 0, 0, 0, + 0, 0, 0, 0, 827, 0, 933, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 827, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 823, 834, 0, 0, 834, + 0, 823, 823, 823, 0, 0, 0, 848, 826 ); protected array $actionDefault = array( 3,32767, 102,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767, 100,32767,32767,32767,32767, 602, 602, - 602, 602,32767,32767, 254, 102,32767,32767, 470, 387, - 387, 387,32767,32767, 544, 544, 544, 544, 544, 544, - 32767,32767,32767,32767,32767,32767, 470,32767,32767,32767, + 32767,32767,32767,32767,32767,32767, 100,32767, 618, 618, + 618, 618,32767,32767, 255, 102,32767,32767, 487, 404, + 404, 404,32767,32767, 560, 560, 560, 560, 560,32767, + 32767,32767,32767,32767,32767, 487,32767,32767,32767,32767, + 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, + 32767,32767,32767,32767,32767,32767,32767,32767, 36, 7, + 8, 10, 11, 49, 17, 328, 100,32767,32767,32767, + 32767,32767,32767,32767,32767, 102,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767,32767,32767, 100, - 32767,32767,32767, 36, 7, 8, 10, 11, 49, 17, - 324,32767,32767,32767,32767, 102,32767,32767,32767,32767, + 32767,32767,32767,32767,32767,32767, 611,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767, 595,32767,32767, + 32767,32767,32767,32767,32767,32767,32767, 392, 491, 470, + 471, 473, 474, 403, 561, 617, 331, 614, 333, 402, + 145, 343, 334, 243, 259, 492, 260, 493, 496, 497, + 216, 389, 149, 150, 434, 488, 436, 486, 490, 435, + 409, 415, 416, 417, 418, 419, 420, 421, 422, 423, + 424, 425, 426, 427, 407, 408, 489,32767,32767, 467, + 466, 465, 432,32767,32767,32767,32767,32767,32767,32767, + 32767, 102,32767, 433, 437, 406, 440, 438, 439, 456, + 457, 454, 455, 458,32767,32767, 320,32767,32767, 459, + 460, 461, 462, 370, 368,32767,32767, 320, 111,32767, + 32767, 447, 448,32767,32767,32767,32767,32767,32767,32767, + 32767,32767,32767,32767, 504, 554, 464,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767,32767, 474, 453, - 454, 456, 457, 386, 545, 601, 327, 598, 385, 145, - 339, 329, 242, 330, 258, 475, 259, 476, 479, 480, - 215, 287, 382, 149, 150, 417, 471, 419, 469, 473, - 418, 392, 398, 399, 400, 401, 402, 403, 404, 405, - 406, 407, 408, 409, 410, 390, 391, 472, 450, 449, - 448,32767,32767, 415, 416,32767,32767,32767,32767,32767, - 32767,32767,32767, 102,32767, 420, 389, 423, 421, 422, - 439, 440, 437, 438, 441,32767,32767,32767,32767, 442, - 443, 444, 445, 316,32767,32767, 366, 364, 316, 111, - 32767,32767, 430, 431,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767, 487, 538, 447,32767,32767, + 102,32767, 100, 556, 429, 431, 524, 442, 443, 441, + 410,32767, 529,32767, 102,32767, 531,32767,32767,32767, + 32767,32767,32767,32767,32767,32767, 555,32767, 562, 562, + 32767, 517, 100, 195,32767, 530, 195, 195,32767,32767, + 32767,32767,32767,32767,32767,32767, 625, 517, 110, 110, + 110, 110, 110, 110, 110, 110, 110, 110, 110,32767, + 195, 110,32767,32767,32767, 100, 195, 195, 195, 195, + 195, 195, 195, 195, 532, 195, 195, 190,32767, 269, + 271, 102, 579, 195, 534,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767, 102,32767, 100, 540, 412, 414, 507, 425, 426, - 424, 393,32767, 514,32767, 102,32767, 516,32767,32767, - 32767,32767,32767,32767,32767, 539,32767, 546, 546,32767, - 500, 100, 195,32767,32767, 515,32767, 195, 195,32767, - 32767,32767,32767,32767,32767,32767,32767, 609, 500, 110, - 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, - 32767, 195, 110,32767,32767,32767, 100, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 190,32767, 268, - 270, 102, 563, 195,32767, 519,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767, 512,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767, 500, 435, 138,32767, 138, 546, 427, 428, - 429, 502, 546, 546, 546, 312, 289,32767,32767,32767, - 32767, 517, 100, 100, 100, 100, 512,32767,32767,32767, - 32767, 111, 486, 99, 99, 99, 99, 99, 103, 101, - 32767,32767,32767,32767, 223,32767, 99,32767, 101, 101, - 32767,32767, 223, 225, 212, 101, 227,32767, 567, 568, - 223, 101, 227, 227, 227, 247, 247, 489, 318, 101, - 99, 101, 101, 197, 318, 318,32767, 101, 489, 318, - 489, 318, 199, 318, 318, 318, 489, 318,32767, 101, - 318, 214, 99, 99, 318,32767,32767,32767, 502,32767, - 32767,32767,32767,32767,32767,32767, 222,32767,32767,32767, - 32767,32767,32767,32767,32767, 533,32767, 551, 565, 433, - 434, 436, 550, 548, 458, 459, 460, 461, 462, 463, - 464, 466, 597,32767, 506,32767,32767,32767, 338,32767, - 607,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767,32767, 608,32767, - 546,32767,32767,32767,32767, 432, 9, 74, 495, 42, - 43, 51, 57, 523, 524, 525, 526, 520, 521, 527, - 522,32767,32767, 528, 573,32767,32767, 547, 600,32767, - 32767,32767,32767,32767,32767, 138,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767, 533,32767, 136, - 32767,32767,32767,32767,32767,32767,32767,32767, 529,32767, - 32767,32767, 546,32767,32767,32767,32767, 314, 311,32767, + 32767,32767, 517, 452, 138,32767, 519, 138, 562, 444, + 445, 446, 562, 562, 562, 316, 293,32767,32767,32767, + 32767, 532, 532, 100, 100, 100, 100,32767,32767,32767, + 32767, 111, 503, 99, 99, 99, 99, 99, 103, 101, + 32767,32767,32767,32767, 224,32767, 101, 99,32767, 101, + 101,32767,32767, 224, 226, 213, 228,32767, 583, 584, + 224, 101, 228, 228, 228, 248, 248, 506, 322, 101, + 99, 101, 101, 197, 322, 322,32767, 101, 506, 322, + 506, 322, 199, 322, 322, 322, 506, 322,32767, 101, + 322, 215, 392, 99, 99, 322,32767,32767,32767, 519, + 32767,32767,32767,32767,32767,32767,32767, 223,32767,32767, + 32767,32767,32767,32767,32767,32767, 549,32767, 567, 581, + 450, 451, 453, 566, 564, 475, 476, 477, 478, 479, + 480, 481, 483, 613,32767, 523,32767,32767,32767, 342, + 32767, 623,32767,32767,32767, 9, 74, 512, 42, 43, + 51, 57, 538, 539, 540, 541, 535, 536, 542, 537, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767, 546,32767,32767,32767,32767, - 32767, 291,32767, 308,32767,32767,32767,32767,32767,32767, + 32767,32767,32767,32767,32767, 624,32767, 562,32767,32767, + 32767,32767, 449, 544, 589,32767,32767, 563, 616,32767, + 32767,32767,32767,32767,32767,32767, 138,32767,32767,32767, + 32767,32767,32767,32767,32767,32767,32767, 549,32767, 136, + 32767,32767,32767,32767,32767,32767,32767,32767, 545,32767, + 32767,32767, 562,32767,32767,32767,32767, 318, 315,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 286,32767,32767, 381, 502, 294, 296, 297,32767,32767, - 32767,32767, 360,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767, 152, 152, 3, 3, 341, 152, - 152, 152, 341, 341, 152, 341, 341, 341, 152, 152, - 152, 152, 152, 152, 280, 185, 262, 265, 247, 247, - 152, 352, 152 + 32767,32767,32767,32767,32767, 562,32767,32767,32767,32767, + 32767, 295,32767, 312,32767,32767,32767,32767,32767,32767, + 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, + 32767,32767, 388, 519, 298, 300, 301,32767,32767,32767, + 32767, 364,32767,32767,32767,32767,32767,32767,32767,32767, + 32767,32767,32767, 152, 152, 3, 3, 345, 152, 152, + 152, 345, 345, 152, 345, 345, 345, 152, 152, 152, + 152, 152, 152, 281, 185, 263, 266, 248, 248, 152, + 356, 152 ); protected array $goto = array( - 196, 196, 1038, 1069, 701, 353, 433, 665, 856, 710, - 427, 321, 315, 316, 337, 580, 432, 338, 434, 642, - 658, 659, 857, 676, 677, 678, 979, 167, 167, 167, - 167, 221, 197, 193, 193, 177, 179, 216, 193, 193, - 193, 193, 193, 194, 194, 194, 194, 194, 194, 188, - 189, 190, 191, 192, 218, 216, 219, 539, 540, 423, - 541, 544, 545, 546, 547, 548, 549, 550, 551, 1140, - 168, 169, 170, 195, 171, 172, 173, 166, 174, 175, - 176, 178, 215, 217, 220, 238, 243, 244, 255, 257, - 258, 259, 260, 261, 262, 263, 264, 269, 270, 271, - 272, 282, 283, 318, 319, 320, 428, 429, 430, 585, + 196, 196, 1041, 352, 700, 465, 587, 470, 470, 1072, + 736, 641, 643, 1205, 855, 663, 470, 856, 709, 687, + 690, 1014, 698, 707, 1010, 625, 662, 166, 166, 166, + 166, 220, 197, 193, 193, 176, 178, 215, 193, 193, + 193, 193, 193, 194, 194, 194, 194, 194, 188, 189, + 190, 191, 192, 217, 215, 218, 540, 541, 423, 542, + 545, 546, 547, 548, 549, 550, 551, 552, 1156, 167, + 168, 169, 195, 170, 171, 172, 165, 173, 174, 175, + 177, 214, 216, 219, 239, 242, 253, 254, 256, 257, + 258, 259, 260, 261, 262, 263, 269, 270, 271, 272, + 281, 282, 317, 318, 319, 429, 430, 431, 602, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, - 232, 233, 234, 235, 236, 180, 237, 181, 198, 199, - 200, 239, 188, 189, 190, 191, 192, 218, 1140, 201, - 182, 183, 184, 202, 198, 185, 240, 203, 201, 165, - 204, 205, 186, 206, 207, 208, 187, 209, 210, 211, - 212, 213, 214, 859, 421, 1041, 1041, 625, 662, 685, - 956, 251, 251, 1033, 1049, 1050, 279, 279, 279, 279, - 344, 831, 852, 627, 627, 890, 604, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 351, 249, 249, - 249, 249, 246, 252, 345, 344, 577, 864, 460, 913, - 908, 909, 922, 865, 910, 862, 911, 912, 863, 469, - 469, 916, 897, 855, 897, 897, 357, 917, 469, 918, - 1336, 1091, 1086, 1087, 1088, 852, 357, 357, 613, 628, - 631, 632, 633, 634, 655, 656, 657, 712, 396, 698, - 357, 357, 833, 1000, 357, 441, 1363, 354, 355, 872, - 1244, 698, 1244, 1244, 426, 698, 615, 558, 1038, 1038, - 1244, 357, 357, 1038, 884, 1038, 1038, 871, 575, 1038, - 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, - 1328, 1328, 1328, 1328, 1137, 1244, 356, 356, 356, 356, - 1244, 1244, 1244, 1244, 1111, 1112, 1244, 1244, 1244, 1220, - 948, 563, 556, 1221, 1224, 949, 1225, 1062, 554, 1307, - 554, 554, 482, 603, 1104, 930, 713, 465, 554, 931, - 484, 5, 946, 6, 1189, 946, 511, 704, 664, 1102, - 690, 343, 556, 563, 572, 573, 346, 583, 606, 620, - 621, 1044, 1043, 458, 852, 1047, 1048, 22, 973, 973, - 973, 973, 327, 310, 458, 967, 974, 1295, 1295, 440, - 558, 1295, 1295, 1295, 1295, 1295, 1295, 1295, 1295, 1295, - 1295, 1292, 1292, 837, 686, 1292, 1292, 1292, 1292, 1292, - 1292, 1292, 1292, 1292, 1292, 543, 543, 1323, 1324, 543, - 543, 543, 543, 543, 543, 543, 543, 543, 543, 542, - 542, 254, 254, 542, 670, 542, 542, 542, 542, 542, - 542, 542, 542, 339, 837, 962, 837, 557, 567, 581, - 618, 557, 849, 567, 877, 1237, 399, 464, 451, 451, - 451, 451, 405, 1318, 619, 1318, 1318, 1239, 874, 472, - 584, 473, 474, 1318, 1235, 1075, 882, 570, 1022, 1354, - 1355, 737, 641, 643, 740, 1079, 663, 479, 1321, 1322, - 687, 691, 1014, 699, 708, 1010, 503, 886, 504, 1330, - 1330, 1330, 1330, 1122, 510, 880, 984, 410, 411, 0, - 1346, 1346, 674, 1261, 675, 0, 414, 415, 416, 0, - 688, 1240, 1241, 417, 0, 0, 1314, 349, 1346, 0, - 847, 885, 873, 1074, 1078, 552, 552, 552, 552, 0, - 608, 0, 0, 982, 0, 1349, 1349, 0, 0, 1242, - 1304, 1305, 451, 451, 451, 451, 451, 451, 451, 451, - 451, 451, 451, 935, 1127, 451, 0, 972, 1077, 0, - 623, 0, 1316, 1316, 1077, 0, 1019, 0, 326, 276, - 326, 326, 0, 0, 876, 0, 668, 998, 435, 1120, - 889, 0, 870, 435, 398, 401, 564, 605, 609, 0, - 1003, 1045, 1045, 975, 1234, 736, 669, 1056, 1052, 1053, - 971, 412, 709, 555, 1012, 1007, 635, 637, 639, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 232, 233, 234, 235, 179, 236, 180, 188, 189, 190, + 191, 192, 217, 1156, 198, 199, 200, 201, 240, 181, + 182, 202, 183, 203, 199, 184, 241, 198, 164, 204, + 205, 185, 206, 207, 208, 186, 209, 210, 187, 211, + 212, 213, 278, 278, 278, 278, 858, 433, 665, 979, + 916, 604, 917, 428, 320, 314, 315, 338, 597, 432, + 339, 434, 642, 627, 627, 896, 854, 896, 896, 1291, + 1291, 1291, 1291, 1291, 1291, 1291, 1291, 1291, 1291, 614, + 628, 631, 632, 633, 634, 655, 656, 657, 711, 830, + 871, 460, 912, 907, 908, 921, 864, 909, 861, 910, + 911, 862, 356, 915, 868, 421, 883, 482, 867, 870, + 1361, 1361, 356, 356, 484, 1094, 1089, 1090, 1091, 889, + 603, 1107, 397, 400, 605, 609, 356, 356, 1361, 594, + 356, 712, 344, 1378, 353, 354, 511, 703, 442, 1105, + 1260, 1041, 1260, 1260, 350, 559, 1364, 1364, 356, 356, + 1041, 1260, 1041, 1351, 1041, 1041, 345, 344, 1041, 1041, + 1041, 1041, 1041, 1041, 1041, 1041, 1041, 1041, 1041, 1000, + 1236, 948, 249, 249, 1260, 1237, 1240, 949, 1241, 1260, + 1260, 1260, 1260, 1114, 1115, 1260, 1260, 1260, 1343, 1343, + 1343, 1343, 564, 557, 851, 427, 1322, 616, 395, 247, + 247, 247, 247, 244, 250, 592, 929, 503, 664, 504, + 930, 355, 355, 355, 355, 510, 945, 512, 945, 479, + 1336, 1337, 328, 557, 564, 589, 590, 330, 600, 606, + 1153, 621, 622, 555, 1065, 555, 555, 658, 659, 25, + 676, 677, 678, 440, 555, 1310, 1310, 686, 559, 851, + 670, 1310, 1310, 1310, 1310, 1310, 1310, 1310, 1310, 1310, + 1310, 1044, 1044, 1047, 1046, 685, 956, 458, 340, 1036, + 1052, 1053, 973, 973, 973, 973, 1050, 1051, 458, 967, + 974, 1307, 1307, 971, 412, 708, 848, 1307, 1307, 1307, + 1307, 1307, 1307, 1307, 1307, 1307, 1307, 5, 610, 6, + 873, 934, 1143, 451, 451, 876, 451, 451, 1333, 962, + 1333, 1333, 1253, 1019, 404, 553, 553, 553, 553, 1333, + 608, 875, 620, 668, 998, 1251, 558, 584, 1022, 869, + 739, 558, 885, 584, 480, 398, 464, 1078, 697, 326, + 309, 1250, 832, 1345, 1345, 1345, 1345, 1082, 473, 601, + 474, 475, 1338, 1339, 697, 1128, 881, 697, 984, 1369, + 1370, 598, 619, 1032, 0, 544, 544, 851, 836, 0, + 1329, 544, 544, 544, 544, 544, 544, 544, 544, 544, + 544, 543, 543, 1255, 879, 0, 0, 543, 0, 543, + 543, 543, 543, 543, 543, 543, 543, 451, 451, 451, + 451, 451, 451, 451, 451, 451, 451, 451, 252, 252, + 451, 836, 1080, 836, 409, 410, 1331, 1331, 1080, 674, + 0, 675, 0, 414, 415, 416, 0, 688, 0, 0, + 417, 635, 637, 639, 0, 348, 0, 0, 1256, 1257, + 0, 1243, 884, 872, 1077, 1081, 0, 846, 1003, 0, + 0, 975, 0, 735, 1243, 982, 556, 1012, 1007, 0, + 435, 0, 0, 0, 0, 0, 1258, 1319, 1320, 0, + 0, 435, 273, 325, 0, 325, 325, 0, 972, 1048, + 1048, 0, 0, 0, 669, 1059, 1055, 1056, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1126, 888, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1017, 1017 + 0, 0, 0, 0, 1017, 1017 ); protected array $gotoCheck = array( - 42, 42, 73, 127, 73, 97, 66, 66, 26, 9, - 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, - 86, 86, 27, 86, 86, 86, 49, 42, 42, 42, + 42, 42, 73, 97, 73, 156, 48, 154, 154, 128, + 48, 48, 48, 156, 26, 48, 154, 27, 9, 48, + 48, 48, 48, 48, 48, 56, 56, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, @@ -937,107 +941,101 @@ class Php7 extends \PhpParser\ParserAbstract 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 15, 43, 89, 89, 56, 56, 89, - 89, 5, 5, 89, 89, 89, 23, 23, 23, 23, - 170, 6, 22, 108, 108, 45, 130, 108, 108, 108, - 108, 108, 108, 108, 108, 108, 108, 181, 5, 5, - 5, 5, 5, 5, 170, 170, 174, 15, 83, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 149, - 149, 15, 25, 25, 25, 25, 14, 65, 149, 65, - 183, 15, 15, 15, 15, 22, 14, 14, 81, 81, - 81, 81, 81, 81, 81, 81, 81, 81, 62, 7, - 14, 14, 7, 103, 14, 83, 14, 97, 97, 35, - 73, 7, 73, 73, 13, 7, 13, 14, 73, 73, - 73, 14, 14, 73, 35, 73, 73, 35, 104, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 9, 9, 9, 9, 150, 73, 24, 24, 24, 24, - 73, 73, 73, 73, 144, 144, 73, 73, 73, 79, - 79, 76, 76, 79, 79, 79, 79, 114, 19, 14, - 19, 19, 84, 8, 8, 73, 8, 151, 19, 73, - 84, 46, 9, 46, 151, 9, 8, 8, 64, 8, - 14, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 118, 118, 19, 22, 119, 119, 76, 19, 19, - 19, 19, 171, 171, 19, 19, 19, 172, 172, 113, - 14, 172, 172, 172, 172, 172, 172, 172, 172, 172, - 172, 173, 173, 12, 116, 173, 173, 173, 173, 173, - 173, 173, 173, 173, 173, 175, 175, 180, 180, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 158, - 158, 5, 5, 158, 120, 158, 158, 158, 158, 158, - 158, 158, 158, 29, 12, 92, 12, 9, 9, 2, - 2, 9, 18, 9, 39, 14, 9, 9, 23, 23, - 23, 23, 28, 130, 80, 130, 130, 20, 37, 9, - 9, 9, 9, 130, 162, 129, 9, 48, 110, 9, - 9, 48, 48, 48, 99, 132, 48, 178, 178, 178, - 48, 48, 48, 48, 48, 48, 155, 41, 155, 130, - 130, 130, 130, 147, 155, 9, 96, 82, 82, -1, - 184, 184, 82, 20, 82, -1, 82, 82, 82, -1, - 82, 20, 20, 82, -1, -1, 130, 82, 184, -1, - 20, 16, 16, 16, 16, 107, 107, 107, 107, -1, - 107, -1, -1, 16, -1, 184, 184, -1, -1, 20, - 20, 20, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 23, 17, 17, 23, -1, 16, 130, -1, - 17, -1, 130, 130, 130, -1, 17, -1, 24, 24, - 24, 24, -1, -1, 17, -1, 17, 17, 117, 16, - 16, -1, 17, 117, 59, 59, 59, 59, 59, -1, - 50, 117, 117, 50, 17, 50, 117, 117, 117, 117, - 93, 93, 93, 50, 50, 50, 85, 85, 85, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 42, 42, 23, 23, 23, 23, 15, 66, 66, 49, + 65, 131, 65, 66, 66, 66, 66, 66, 66, 66, + 66, 66, 66, 108, 108, 25, 25, 25, 25, 108, + 108, 108, 108, 108, 108, 108, 108, 108, 108, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 6, + 35, 83, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 14, 15, 15, 43, 35, 84, 15, 35, + 188, 188, 14, 14, 84, 15, 15, 15, 15, 45, + 8, 8, 59, 59, 59, 59, 14, 14, 188, 178, + 14, 8, 174, 14, 97, 97, 8, 8, 83, 8, + 73, 73, 73, 73, 185, 14, 188, 188, 14, 14, + 73, 73, 73, 187, 73, 73, 174, 174, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 103, + 79, 79, 5, 5, 73, 79, 79, 79, 79, 73, + 73, 73, 73, 145, 145, 73, 73, 73, 9, 9, + 9, 9, 76, 76, 22, 13, 14, 13, 62, 5, + 5, 5, 5, 5, 5, 104, 73, 160, 64, 160, + 73, 24, 24, 24, 24, 160, 9, 14, 9, 182, + 182, 182, 76, 76, 76, 76, 76, 76, 76, 76, + 155, 76, 76, 19, 115, 19, 19, 86, 86, 76, + 86, 86, 86, 113, 19, 176, 176, 117, 14, 22, + 121, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 89, 89, 119, 119, 89, 89, 19, 29, 89, + 89, 89, 19, 19, 19, 19, 120, 120, 19, 19, + 19, 177, 177, 93, 93, 93, 18, 177, 177, 177, + 177, 177, 177, 177, 177, 177, 177, 46, 17, 46, + 37, 17, 17, 23, 23, 39, 23, 23, 131, 92, + 131, 131, 14, 17, 28, 107, 107, 107, 107, 131, + 107, 17, 80, 17, 17, 166, 9, 9, 110, 17, + 99, 9, 41, 9, 157, 9, 9, 130, 7, 175, + 175, 17, 7, 131, 131, 131, 131, 133, 9, 9, + 9, 9, 184, 184, 7, 148, 9, 7, 96, 9, + 9, 2, 2, 114, -1, 179, 179, 22, 12, -1, + 131, 179, 179, 179, 179, 179, 179, 179, 179, 179, + 179, 162, 162, 20, 9, -1, -1, 162, -1, 162, + 162, 162, 162, 162, 162, 162, 162, 23, 23, 23, + 23, 23, 23, 23, 23, 23, 23, 23, 5, 5, + 23, 12, 131, 12, 82, 82, 131, 131, 131, 82, + -1, 82, -1, 82, 82, 82, -1, 82, -1, -1, + 82, 85, 85, 85, -1, 82, -1, -1, 20, 20, + -1, 20, 16, 16, 16, 16, -1, 20, 50, -1, + -1, 50, -1, 50, 20, 16, 50, 50, 50, -1, + 118, -1, -1, -1, -1, -1, 20, 20, 20, -1, + -1, 118, 24, 24, -1, 24, 24, -1, 16, 118, + 118, -1, -1, -1, 118, 118, 118, 118, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 16, 16, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 107, 107 + -1, -1, -1, -1, 107, 107 ); protected array $gotoBase = array( - 0, 0, -287, 0, 0, 170, 161, 242, 315, -11, - 0, 0, 85, -75, -73, -187, 57, 75, 121, 53, - 52, 0, -97, 173, 293, 219, 4, 18, 103, 125, - 0, 0, 0, 0, 0, -114, 0, 107, 0, 109, - 0, 35, -1, 145, 0, 162, -409, 0, -258, 8, - 568, 0, 0, 0, 0, 0, 127, 0, 0, 529, - 0, 0, 206, 0, 96, 213, -235, 0, 0, 0, - 0, 0, 0, -5, 0, 0, -36, 0, 0, -101, - 98, -122, -7, -71, -150, 114, -702, 0, 0, -115, - 0, 0, 94, 284, 0, 0, 42, -481, 0, 55, - 0, 0, 0, 218, 235, 0, 0, 487, -58, 0, - 86, 0, 0, 91, 43, 0, 100, 295, 71, 69, - 123, 0, 0, 0, 0, 0, 0, 1, 0, 79, - 178, 0, 22, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 28, 0, 0, 38, 0, 185, - 48, 59, 0, 0, 0, -22, 0, 0, 168, 0, - 0, 0, 83, 0, 0, 0, 0, 0, 0, 0, - -119, 39, 126, 140, 177, 154, 0, 0, 165, 0, - 23, 167, 0, 199, 181, 0, 0 + 0, 0, -234, 0, 0, 291, 199, 451, 232, 8, + 0, 0, 191, -25, -76, -183, 108, -48, 96, 88, + 109, 0, 36, 159, 328, 182, 10, 13, 94, 91, + 0, 0, 0, 0, 0, -162, 0, 78, 0, 101, + 0, 9, -1, 202, 0, 213, -322, 0, -708, 151, + 556, 0, 0, 0, 0, 0, -15, 0, 0, 197, + 0, 0, 276, 0, 90, 156, -70, 0, 0, 0, + 0, 0, 0, -5, 0, 0, -34, 0, 0, -119, + 112, -160, 40, -67, -246, 69, -364, 0, 0, 102, + 0, 0, 97, 98, 0, 0, 33, -483, 0, 42, + 0, 0, 0, 254, 282, 0, 0, 407, -54, 0, + 77, 0, 0, 86, -29, 79, 0, 84, 314, 104, + 111, 80, 0, 0, 0, 0, 0, 0, 7, 0, + 82, 163, 0, 23, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 30, 0, 0, 29, 0, + 0, 0, 0, 0, -27, 106, -263, 12, 0, 0, + -171, 0, 264, 0, 0, 0, 75, 0, 0, 0, + 0, 0, 0, 0, -46, 137, 128, 164, 220, 248, + 0, 0, 38, 0, 99, 234, 0, 242, -78, 0, + 0 ); protected array $gotoDefault = array( - -32768, 515, 744, 4, 745, 939, 820, 829, 601, 533, - 711, 350, 629, 424, 1312, 915, 1126, 582, 848, 1253, - 1227, 459, 851, 332, 734, 927, 898, 899, 402, 388, - 394, 400, 653, 630, 497, 883, 455, 875, 489, 878, - 454, 887, 164, 420, 513, 891, 3, 894, 561, 925, - 977, 389, 902, 390, 681, 904, 566, 906, 907, 397, - 403, 404, 1131, 574, 626, 919, 256, 568, 920, 387, - 921, 929, 392, 395, 692, 468, 508, 502, 413, 1106, - 569, 612, 650, 448, 476, 624, 636, 622, 483, 436, - 418, 331, 961, 969, 490, 466, 983, 352, 991, 742, - 1139, 644, 492, 999, 645, 1006, 1009, 534, 535, 481, - 1021, 273, 1024, 493, 19, 671, 1035, 1036, 672, 646, - 1058, 647, 673, 648, 1060, 475, 602, 1068, 456, 1076, - 1300, 457, 1080, 266, 1083, 278, 419, 437, 1089, 1090, - 9, 1096, 702, 703, 11, 277, 512, 1121, 693, 453, - 1138, 452, 1208, 1210, 562, 494, 1228, 480, 295, 1231, - 684, 509, 1236, 449, 1303, 450, 536, 477, 317, 537, - 1347, 309, 335, 314, 553, 296, 336, 538, 478, 1309, - 1317, 333, 31, 1337, 1348, 579, 617 + -32768, 516, 743, 4, 744, 938, 819, 828, 580, 534, + 710, 349, 629, 424, 1327, 914, 1142, 599, 847, 1269, + 1275, 459, 850, 333, 733, 926, 897, 898, 401, 388, + 863, 399, 653, 630, 497, 882, 455, 874, 489, 877, + 454, 886, 163, 420, 514, 890, 3, 893, 562, 924, + 977, 389, 901, 390, 681, 903, 583, 905, 906, 396, + 402, 403, 1147, 591, 626, 918, 255, 585, 919, 387, + 920, 928, 392, 394, 691, 469, 508, 502, 413, 1109, + 586, 613, 650, 448, 476, 624, 636, 623, 483, 436, + 418, 332, 961, 969, 490, 467, 983, 351, 991, 741, + 1155, 644, 492, 999, 645, 1006, 1009, 535, 536, 481, + 1021, 266, 1024, 493, 1033, 23, 671, 1038, 1039, 672, + 646, 1061, 647, 673, 648, 1063, 466, 581, 1071, 456, + 1079, 1315, 457, 1083, 264, 1086, 277, 419, 437, 1092, + 1093, 9, 1099, 701, 702, 19, 274, 513, 1127, 692, + -32768,-32768,-32768,-32768, 453, 1154, 452, 1224, 1226, 563, + 494, 1244, 294, 1247, 684, 509, 1252, 449, 1318, 450, + 537, 477, 316, 538, 1362, 308, 336, 313, 554, 295, + 337, 539, 478, 1324, 1332, 334, 31, 1352, 1363, 596, + 618 ); protected array $ruleToNonTerminal = array( @@ -1061,25 +1059,27 @@ class Php7 extends \PhpParser\ParserAbstract 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 25, 25, 50, 69, 69, 72, 72, 71, 70, 70, 63, 75, 75, 76, 76, 77, 77, 78, - 78, 79, 79, 80, 80, 26, 26, 27, 27, 27, - 27, 27, 88, 88, 90, 90, 83, 83, 91, 91, - 92, 92, 92, 84, 84, 87, 87, 85, 85, 93, - 94, 94, 57, 57, 65, 65, 68, 68, 68, 67, - 95, 95, 96, 58, 58, 58, 58, 97, 97, 98, - 98, 99, 99, 100, 101, 101, 102, 102, 103, 103, - 55, 55, 51, 51, 105, 53, 53, 106, 52, 52, - 54, 54, 64, 64, 64, 64, 81, 81, 109, 109, - 111, 111, 112, 112, 112, 112, 110, 110, 110, 114, - 114, 114, 114, 89, 89, 117, 117, 117, 118, 118, - 115, 115, 119, 119, 121, 121, 122, 122, 116, 123, - 123, 120, 124, 124, 124, 124, 113, 113, 82, 82, - 82, 20, 20, 20, 126, 125, 125, 127, 127, 127, - 127, 60, 128, 128, 129, 61, 131, 131, 132, 132, - 133, 133, 86, 134, 134, 134, 134, 134, 134, 134, - 139, 139, 140, 140, 141, 141, 141, 141, 141, 142, - 143, 143, 138, 138, 135, 135, 137, 137, 145, 145, - 144, 144, 144, 144, 144, 144, 144, 136, 146, 146, - 148, 147, 147, 62, 104, 149, 149, 56, 56, 42, + 78, 79, 79, 80, 80, 80, 26, 26, 27, 27, + 27, 27, 27, 88, 88, 90, 90, 83, 83, 91, + 91, 92, 92, 92, 84, 84, 87, 87, 85, 85, + 93, 94, 94, 57, 57, 65, 65, 68, 68, 68, + 67, 95, 95, 96, 58, 58, 58, 58, 97, 97, + 98, 98, 99, 99, 100, 101, 101, 102, 102, 103, + 103, 55, 55, 51, 51, 105, 53, 53, 106, 52, + 52, 54, 54, 64, 64, 64, 64, 81, 81, 109, + 109, 111, 111, 112, 112, 112, 112, 112, 112, 112, + 110, 110, 110, 115, 115, 115, 115, 89, 89, 118, + 118, 118, 119, 119, 116, 116, 120, 120, 122, 122, + 123, 123, 117, 124, 124, 121, 125, 125, 125, 125, + 113, 113, 82, 82, 82, 20, 20, 20, 127, 126, + 126, 128, 128, 128, 128, 60, 129, 129, 130, 61, + 132, 132, 133, 133, 134, 134, 86, 135, 135, 135, + 135, 135, 135, 135, 140, 140, 141, 141, 142, 142, + 142, 142, 142, 143, 144, 144, 139, 139, 136, 136, + 138, 138, 146, 146, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 137, 147, 147, 149, 148, 148, + 150, 150, 114, 151, 151, 153, 153, 153, 152, 152, + 62, 104, 154, 154, 56, 56, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, @@ -1089,21 +1089,20 @@ class Php7 extends \PhpParser\ParserAbstract 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 156, 158, 158, 159, 150, 150, 155, - 155, 160, 161, 161, 162, 163, 164, 164, 164, 164, - 19, 19, 73, 73, 73, 73, 151, 151, 151, 151, - 166, 166, 152, 152, 154, 154, 154, 157, 157, 172, - 172, 172, 172, 172, 172, 172, 172, 172, 173, 173, - 173, 108, 175, 175, 175, 175, 153, 153, 153, 153, - 153, 153, 153, 153, 59, 59, 169, 169, 169, 169, - 169, 176, 176, 165, 165, 165, 165, 177, 177, 177, - 177, 177, 177, 74, 74, 66, 66, 66, 66, 130, - 130, 130, 130, 180, 179, 168, 168, 168, 168, 168, - 168, 168, 167, 167, 167, 178, 178, 178, 178, 107, - 174, 182, 182, 181, 181, 183, 183, 183, 183, 183, - 183, 183, 183, 171, 171, 171, 171, 170, 185, 184, - 184, 184, 184, 184, 184, 184, 184, 186, 186, 186, - 186 + 161, 162, 162, 163, 155, 155, 160, 160, 164, 165, + 165, 166, 167, 168, 168, 168, 168, 19, 19, 73, + 73, 73, 73, 156, 156, 156, 156, 170, 170, 159, + 159, 159, 157, 157, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 177, 177, 177, 108, 179, 179, + 179, 179, 158, 158, 158, 158, 158, 158, 158, 158, + 59, 59, 173, 173, 173, 173, 173, 180, 180, 169, + 169, 169, 169, 181, 181, 181, 181, 181, 181, 74, + 74, 66, 66, 66, 66, 131, 131, 131, 131, 184, + 183, 172, 172, 172, 172, 172, 172, 172, 171, 171, + 171, 182, 182, 182, 182, 107, 178, 186, 186, 185, + 185, 187, 187, 187, 187, 187, 187, 187, 187, 175, + 175, 175, 175, 174, 189, 188, 188, 188, 188, 188, + 188, 188, 188, 190, 190, 190, 190 ); protected array $ruleToLength = array( @@ -1119,7 +1118,7 @@ class Php7 extends \PhpParser\ParserAbstract 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 2, 1, 3, 4, 1, 2, 0, 1, 1, 1, 1, 4, 3, 5, 4, 3, - 4, 2, 3, 1, 1, 7, 6, 2, 3, 1, + 4, 1, 3, 1, 1, 8, 7, 2, 3, 1, 2, 3, 1, 2, 3, 1, 1, 3, 1, 3, 1, 2, 2, 3, 1, 3, 2, 3, 1, 3, 3, 2, 0, 1, 1, 1, 1, 1, 3, 7, @@ -1127,49 +1126,50 @@ class Php7 extends \PhpParser\ParserAbstract 3, 1, 2, 5, 7, 9, 6, 5, 6, 3, 2, 1, 1, 1, 1, 0, 2, 1, 3, 8, 0, 4, 2, 1, 3, 0, 1, 0, 1, 0, - 1, 3, 1, 1, 1, 8, 9, 7, 8, 7, - 6, 8, 0, 2, 0, 2, 1, 2, 1, 2, - 1, 1, 1, 0, 2, 0, 2, 0, 2, 2, - 1, 3, 1, 4, 1, 4, 1, 1, 4, 2, - 1, 3, 3, 3, 4, 4, 5, 0, 2, 4, - 3, 1, 1, 7, 0, 2, 1, 3, 3, 4, - 1, 4, 0, 2, 5, 0, 2, 6, 0, 2, - 0, 3, 1, 2, 1, 1, 2, 0, 1, 3, - 0, 2, 1, 1, 1, 1, 6, 8, 6, 1, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 3, - 3, 3, 1, 3, 3, 3, 3, 3, 1, 3, - 3, 1, 1, 2, 1, 1, 0, 1, 0, 2, - 2, 2, 4, 3, 1, 1, 3, 1, 2, 2, - 3, 2, 3, 1, 1, 2, 3, 1, 1, 3, - 2, 0, 1, 5, 5, 6, 10, 3, 5, 1, - 1, 3, 0, 2, 4, 5, 4, 4, 4, 3, - 1, 1, 1, 1, 1, 1, 0, 1, 1, 2, - 1, 1, 1, 1, 1, 1, 1, 2, 1, 3, - 1, 1, 3, 2, 2, 3, 1, 0, 1, 1, - 3, 3, 3, 4, 4, 1, 1, 2, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, + 1, 3, 1, 1, 1, 1, 8, 9, 7, 8, + 7, 6, 8, 0, 2, 0, 2, 1, 2, 1, + 2, 1, 1, 1, 0, 2, 0, 2, 0, 2, + 2, 1, 3, 1, 4, 1, 4, 1, 1, 4, + 2, 1, 3, 3, 3, 4, 4, 5, 0, 2, + 4, 3, 1, 1, 7, 0, 2, 1, 3, 3, + 4, 1, 4, 0, 2, 5, 0, 2, 6, 0, + 2, 0, 3, 1, 2, 1, 1, 2, 0, 1, + 3, 0, 2, 1, 1, 1, 1, 1, 1, 1, + 7, 9, 6, 1, 2, 1, 1, 1, 1, 1, + 1, 1, 1, 3, 3, 3, 1, 3, 3, 3, + 3, 3, 1, 3, 3, 1, 1, 2, 1, 1, + 0, 1, 0, 2, 2, 2, 4, 3, 1, 1, + 3, 1, 2, 2, 3, 2, 3, 1, 1, 2, + 3, 1, 1, 3, 2, 0, 1, 5, 5, 6, + 10, 3, 5, 1, 1, 3, 0, 2, 4, 5, + 4, 4, 4, 3, 1, 1, 1, 1, 1, 1, + 0, 1, 1, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 2, 1, 3, 1, 1, 3, + 0, 2, 0, 5, 8, 1, 3, 3, 0, 2, + 2, 2, 3, 1, 0, 1, 1, 3, 3, 3, + 4, 4, 1, 1, 2, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, + 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 5, 4, - 3, 4, 4, 2, 2, 4, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 1, 3, 2, - 1, 2, 4, 2, 2, 8, 9, 8, 9, 9, - 10, 9, 10, 8, 3, 2, 2, 1, 1, 0, - 4, 2, 1, 3, 2, 1, 2, 2, 2, 4, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, - 1, 1, 0, 3, 0, 1, 1, 0, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 5, - 3, 3, 4, 1, 1, 3, 1, 1, 1, 1, - 1, 3, 2, 3, 0, 1, 1, 3, 1, 1, - 1, 1, 1, 1, 3, 1, 1, 1, 4, 4, - 1, 4, 4, 0, 1, 1, 1, 3, 3, 1, - 4, 2, 2, 1, 3, 1, 4, 4, 3, 3, - 3, 3, 1, 3, 1, 1, 3, 1, 1, 4, - 1, 1, 1, 3, 1, 1, 2, 1, 3, 4, - 3, 2, 0, 2, 2, 1, 2, 1, 1, 1, - 4, 3, 3, 3, 3, 6, 3, 1, 1, 2, - 1 + 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 5, 4, 3, 4, 4, + 2, 2, 4, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 1, 3, 2, 1, 2, 4, + 2, 2, 8, 9, 8, 9, 9, 10, 9, 10, + 8, 3, 2, 2, 1, 1, 0, 4, 2, 1, + 3, 2, 1, 2, 2, 2, 4, 1, 1, 1, + 1, 1, 1, 1, 1, 3, 1, 1, 1, 0, + 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 3, 5, 3, 3, 4, 1, + 1, 3, 1, 1, 1, 1, 1, 3, 2, 3, + 0, 1, 1, 3, 1, 1, 1, 1, 1, 1, + 3, 1, 1, 1, 4, 4, 1, 4, 4, 0, + 1, 1, 1, 3, 3, 1, 4, 2, 2, 1, + 3, 1, 4, 4, 3, 3, 3, 3, 1, 3, + 1, 1, 3, 1, 1, 4, 1, 1, 1, 3, + 1, 1, 2, 1, 3, 4, 3, 2, 0, 2, + 2, 1, 2, 1, 1, 1, 4, 3, 3, 3, + 3, 6, 3, 1, 1, 2, 1 ); protected function initReduceCallbacks(): void { @@ -1381,10 +1381,10 @@ protected function initReduceCallbacks(): void { $self->semValue = Stmt\Use_::TYPE_CONSTANT; }, 125 => static function ($self, $stackPos) { - $self->semValue = new Stmt\GroupUse($self->semStack[$stackPos-(7-3)], $self->semStack[$stackPos-(7-6)], $self->semStack[$stackPos-(7-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(7-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Stmt\GroupUse($self->semStack[$stackPos-(8-3)], $self->semStack[$stackPos-(8-6)], $self->semStack[$stackPos-(8-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); }, 126 => static function ($self, $stackPos) { - $self->semValue = new Stmt\GroupUse($self->semStack[$stackPos-(6-2)], $self->semStack[$stackPos-(6-5)], Stmt\Use_::TYPE_UNKNOWN, $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Stmt\GroupUse($self->semStack[$stackPos-(7-2)], $self->semStack[$stackPos-(7-5)], Stmt\Use_::TYPE_UNKNOWN, $self->getAttributes($self->tokenStartStack[$stackPos-(7-1)], $self->tokenEndStack[$stackPos])); }, 127 => null, 128 => static function ($self, $stackPos) { @@ -1603,273 +1603,275 @@ protected function initReduceCallbacks(): void { $self->semValue = new Node\Identifier($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, 205 => static function ($self, $stackPos) { - $self->semValue = new Stmt\Function_($self->semStack[$stackPos-(8-3)], ['byRef' => $self->semStack[$stackPos-(8-2)], 'params' => $self->semStack[$stackPos-(8-5)], 'returnType' => $self->semStack[$stackPos-(8-7)], 'stmts' => $self->semStack[$stackPos-(8-8)], 'attrGroups' => []], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Node\Identifier($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, 206 => static function ($self, $stackPos) { - $self->semValue = new Stmt\Function_($self->semStack[$stackPos-(9-4)], ['byRef' => $self->semStack[$stackPos-(9-3)], 'params' => $self->semStack[$stackPos-(9-6)], 'returnType' => $self->semStack[$stackPos-(9-8)], 'stmts' => $self->semStack[$stackPos-(9-9)], 'attrGroups' => $self->semStack[$stackPos-(9-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(9-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Stmt\Function_($self->semStack[$stackPos-(8-3)], ['byRef' => $self->semStack[$stackPos-(8-2)], 'params' => $self->semStack[$stackPos-(8-5)], 'returnType' => $self->semStack[$stackPos-(8-7)], 'stmts' => $self->semStack[$stackPos-(8-8)], 'attrGroups' => []], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); }, 207 => static function ($self, $stackPos) { + $self->semValue = new Stmt\Function_($self->semStack[$stackPos-(9-4)], ['byRef' => $self->semStack[$stackPos-(9-3)], 'params' => $self->semStack[$stackPos-(9-6)], 'returnType' => $self->semStack[$stackPos-(9-8)], 'stmts' => $self->semStack[$stackPos-(9-9)], 'attrGroups' => $self->semStack[$stackPos-(9-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(9-1)], $self->tokenEndStack[$stackPos])); + }, + 208 => static function ($self, $stackPos) { $self->semValue = new Stmt\Class_($self->semStack[$stackPos-(7-2)], ['type' => $self->semStack[$stackPos-(7-1)], 'extends' => $self->semStack[$stackPos-(7-3)], 'implements' => $self->semStack[$stackPos-(7-4)], 'stmts' => $self->semStack[$stackPos-(7-6)], 'attrGroups' => []], $self->getAttributes($self->tokenStartStack[$stackPos-(7-1)], $self->tokenEndStack[$stackPos])); $self->checkClass($self->semValue, $stackPos-(7-2)); }, - 208 => static function ($self, $stackPos) { + 209 => static function ($self, $stackPos) { $self->semValue = new Stmt\Class_($self->semStack[$stackPos-(8-3)], ['type' => $self->semStack[$stackPos-(8-2)], 'extends' => $self->semStack[$stackPos-(8-4)], 'implements' => $self->semStack[$stackPos-(8-5)], 'stmts' => $self->semStack[$stackPos-(8-7)], 'attrGroups' => $self->semStack[$stackPos-(8-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); $self->checkClass($self->semValue, $stackPos-(8-3)); }, - 209 => static function ($self, $stackPos) { + 210 => static function ($self, $stackPos) { $self->semValue = new Stmt\Interface_($self->semStack[$stackPos-(7-3)], ['extends' => $self->semStack[$stackPos-(7-4)], 'stmts' => $self->semStack[$stackPos-(7-6)], 'attrGroups' => $self->semStack[$stackPos-(7-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(7-1)], $self->tokenEndStack[$stackPos])); $self->checkInterface($self->semValue, $stackPos-(7-3)); }, - 210 => static function ($self, $stackPos) { + 211 => static function ($self, $stackPos) { $self->semValue = new Stmt\Trait_($self->semStack[$stackPos-(6-3)], ['stmts' => $self->semStack[$stackPos-(6-5)], 'attrGroups' => $self->semStack[$stackPos-(6-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos])); }, - 211 => static function ($self, $stackPos) { + 212 => static function ($self, $stackPos) { $self->semValue = new Stmt\Enum_($self->semStack[$stackPos-(8-3)], ['scalarType' => $self->semStack[$stackPos-(8-4)], 'implements' => $self->semStack[$stackPos-(8-5)], 'stmts' => $self->semStack[$stackPos-(8-7)], 'attrGroups' => $self->semStack[$stackPos-(8-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); $self->checkEnum($self->semValue, $stackPos-(8-3)); }, - 212 => static function ($self, $stackPos) { + 213 => static function ($self, $stackPos) { $self->semValue = null; }, - 213 => static function ($self, $stackPos) { + 214 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(2-2)]; }, - 214 => static function ($self, $stackPos) { + 215 => static function ($self, $stackPos) { $self->semValue = null; }, - 215 => static function ($self, $stackPos) { + 216 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(2-2)]; }, - 216 => static function ($self, $stackPos) { + 217 => static function ($self, $stackPos) { $self->semValue = 0; }, - 217 => null, 218 => null, - 219 => static function ($self, $stackPos) { + 219 => null, + 220 => static function ($self, $stackPos) { $self->checkClassModifier($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $self->semValue = $self->semStack[$stackPos-(2-1)] | $self->semStack[$stackPos-(2-2)]; }, - 220 => static function ($self, $stackPos) { + 221 => static function ($self, $stackPos) { $self->semValue = Modifiers::ABSTRACT; }, - 221 => static function ($self, $stackPos) { + 222 => static function ($self, $stackPos) { $self->semValue = Modifiers::FINAL; }, - 222 => static function ($self, $stackPos) { + 223 => static function ($self, $stackPos) { $self->semValue = Modifiers::READONLY; }, - 223 => static function ($self, $stackPos) { + 224 => static function ($self, $stackPos) { $self->semValue = null; }, - 224 => static function ($self, $stackPos) { + 225 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(2-2)]; }, - 225 => static function ($self, $stackPos) { + 226 => static function ($self, $stackPos) { $self->semValue = array(); }, - 226 => static function ($self, $stackPos) { + 227 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(2-2)]; }, - 227 => static function ($self, $stackPos) { + 228 => static function ($self, $stackPos) { $self->semValue = array(); }, - 228 => static function ($self, $stackPos) { + 229 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(2-2)]; }, - 229 => null, - 230 => static function ($self, $stackPos) { + 230 => null, + 231 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 231 => static function ($self, $stackPos) { + 232 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 232 => null, - 233 => static function ($self, $stackPos) { + 233 => null, + 234 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-2)]; }, - 234 => null, - 235 => static function ($self, $stackPos) { + 235 => null, + 236 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-2)]; }, - 236 => static function ($self, $stackPos) { + 237 => static function ($self, $stackPos) { if ($self->semStack[$stackPos-(1-1)] instanceof Stmt\Block) { $self->semValue = $self->semStack[$stackPos-(1-1)]->stmts; } else if ($self->semStack[$stackPos-(1-1)] === null) { $self->semValue = []; } else { $self->semValue = [$self->semStack[$stackPos-(1-1)]]; }; }, - 237 => static function ($self, $stackPos) { + 238 => static function ($self, $stackPos) { $self->semValue = null; }, - 238 => static function ($self, $stackPos) { + 239 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-2)]; }, - 239 => null, - 240 => static function ($self, $stackPos) { + 240 => null, + 241 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 241 => static function ($self, $stackPos) { + 242 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 242 => static function ($self, $stackPos) { + 243 => static function ($self, $stackPos) { $self->semValue = new Node\DeclareItem($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 243 => static function ($self, $stackPos) { + 244 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 244 => static function ($self, $stackPos) { + 245 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-3)]; }, - 245 => static function ($self, $stackPos) { + 246 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-2)]; }, - 246 => static function ($self, $stackPos) { + 247 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(5-3)]; }, - 247 => static function ($self, $stackPos) { + 248 => static function ($self, $stackPos) { $self->semValue = array(); }, - 248 => static function ($self, $stackPos) { + 249 => static function ($self, $stackPos) { $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; }, - 249 => static function ($self, $stackPos) { + 250 => static function ($self, $stackPos) { $self->semValue = new Stmt\Case_($self->semStack[$stackPos-(4-2)], $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 250 => static function ($self, $stackPos) { + 251 => static function ($self, $stackPos) { $self->semValue = new Stmt\Case_(null, $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 251 => null, 252 => null, - 253 => static function ($self, $stackPos) { + 253 => null, + 254 => static function ($self, $stackPos) { $self->semValue = new Expr\Match_($self->semStack[$stackPos-(7-3)], $self->semStack[$stackPos-(7-6)], $self->getAttributes($self->tokenStartStack[$stackPos-(7-1)], $self->tokenEndStack[$stackPos])); }, - 254 => static function ($self, $stackPos) { + 255 => static function ($self, $stackPos) { $self->semValue = []; }, - 255 => null, - 256 => static function ($self, $stackPos) { + 256 => null, + 257 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 257 => static function ($self, $stackPos) { + 258 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 258 => static function ($self, $stackPos) { + 259 => static function ($self, $stackPos) { $self->semValue = new Node\MatchArm($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 259 => static function ($self, $stackPos) { + 260 => static function ($self, $stackPos) { $self->semValue = new Node\MatchArm(null, $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 260 => static function ($self, $stackPos) { + 261 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(1-1)]; }, - 261 => static function ($self, $stackPos) { + 262 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-2)]; }, - 262 => static function ($self, $stackPos) { + 263 => static function ($self, $stackPos) { $self->semValue = array(); }, - 263 => static function ($self, $stackPos) { + 264 => static function ($self, $stackPos) { $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; }, - 264 => static function ($self, $stackPos) { + 265 => static function ($self, $stackPos) { $self->semValue = new Stmt\ElseIf_($self->semStack[$stackPos-(5-3)], $self->semStack[$stackPos-(5-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos])); }, - 265 => static function ($self, $stackPos) { + 266 => static function ($self, $stackPos) { $self->semValue = array(); }, - 266 => static function ($self, $stackPos) { + 267 => static function ($self, $stackPos) { $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; }, - 267 => static function ($self, $stackPos) { + 268 => static function ($self, $stackPos) { $self->semValue = new Stmt\ElseIf_($self->semStack[$stackPos-(6-3)], $self->semStack[$stackPos-(6-6)], $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos])); $self->fixupAlternativeElse($self->semValue); }, - 268 => static function ($self, $stackPos) { + 269 => static function ($self, $stackPos) { $self->semValue = null; }, - 269 => static function ($self, $stackPos) { + 270 => static function ($self, $stackPos) { $self->semValue = new Stmt\Else_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 270 => static function ($self, $stackPos) { + 271 => static function ($self, $stackPos) { $self->semValue = null; }, - 271 => static function ($self, $stackPos) { + 272 => static function ($self, $stackPos) { $self->semValue = new Stmt\Else_($self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); $self->fixupAlternativeElse($self->semValue); }, - 272 => static function ($self, $stackPos) { + 273 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)], false); }, - 273 => static function ($self, $stackPos) { + 274 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(2-2)], true); }, - 274 => static function ($self, $stackPos) { + 275 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)], false); }, - 275 => static function ($self, $stackPos) { + 276 => static function ($self, $stackPos) { $self->semValue = array($self->fixupArrayDestructuring($self->semStack[$stackPos-(1-1)]), false); }, - 276 => null, - 277 => static function ($self, $stackPos) { - $self->semValue = array(); - }, + 277 => null, 278 => static function ($self, $stackPos) { - $self->semValue = array($self->semStack[$stackPos-(1-1)]); + $self->semValue = array(); }, 279 => static function ($self, $stackPos) { - $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; + $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, 280 => static function ($self, $stackPos) { - $self->semValue = 0; + $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, 281 => static function ($self, $stackPos) { - $self->checkModifier($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $self->semValue = $self->semStack[$stackPos-(2-1)] | $self->semStack[$stackPos-(2-2)]; + $self->semValue = 0; }, 282 => static function ($self, $stackPos) { - $self->semValue = Modifiers::PUBLIC; + $self->checkModifier($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $self->semValue = $self->semStack[$stackPos-(2-1)] | $self->semStack[$stackPos-(2-2)]; }, 283 => static function ($self, $stackPos) { - $self->semValue = Modifiers::PROTECTED; + $self->semValue = Modifiers::PUBLIC; }, 284 => static function ($self, $stackPos) { - $self->semValue = Modifiers::PRIVATE; + $self->semValue = Modifiers::PROTECTED; }, 285 => static function ($self, $stackPos) { - $self->semValue = Modifiers::READONLY; + $self->semValue = Modifiers::PRIVATE; }, 286 => static function ($self, $stackPos) { - $self->semValue = new Node\Param($self->semStack[$stackPos-(6-6)], null, $self->semStack[$stackPos-(6-3)], $self->semStack[$stackPos-(6-4)], $self->semStack[$stackPos-(6-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(6-2)], $self->semStack[$stackPos-(6-1)]); - $self->checkParam($self->semValue); + $self->semValue = Modifiers::PUBLIC_SET; }, 287 => static function ($self, $stackPos) { - $self->semValue = new Node\Param($self->semStack[$stackPos-(8-6)], $self->semStack[$stackPos-(8-8)], $self->semStack[$stackPos-(8-3)], $self->semStack[$stackPos-(8-4)], $self->semStack[$stackPos-(8-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(8-2)], $self->semStack[$stackPos-(8-1)]); - $self->checkParam($self->semValue); + $self->semValue = Modifiers::PROTECTED_SET; }, 288 => static function ($self, $stackPos) { - $self->semValue = new Node\Param(new Expr\Error($self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos])), null, $self->semStack[$stackPos-(6-3)], $self->semStack[$stackPos-(6-4)], $self->semStack[$stackPos-(6-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(6-2)], $self->semStack[$stackPos-(6-1)]); + $self->semValue = Modifiers::PRIVATE_SET; + }, + 289 => static function ($self, $stackPos) { + $self->semValue = Modifiers::READONLY; }, - 289 => null, 290 => static function ($self, $stackPos) { - $self->semValue = new Node\NullableType($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Node\Param($self->semStack[$stackPos-(7-6)], null, $self->semStack[$stackPos-(7-3)], $self->semStack[$stackPos-(7-4)], $self->semStack[$stackPos-(7-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(7-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(7-2)], $self->semStack[$stackPos-(7-1)], $self->semStack[$stackPos-(7-7)]); + $self->checkParam($self->semValue); }, 291 => static function ($self, $stackPos) { - $self->semValue = new Node\UnionType($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Node\Param($self->semStack[$stackPos-(9-6)], $self->semStack[$stackPos-(9-8)], $self->semStack[$stackPos-(9-3)], $self->semStack[$stackPos-(9-4)], $self->semStack[$stackPos-(9-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(9-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(9-2)], $self->semStack[$stackPos-(9-1)], $self->semStack[$stackPos-(9-9)]); + $self->checkParam($self->semValue); + }, + 292 => static function ($self, $stackPos) { + $self->semValue = new Node\Param(new Expr\Error($self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos])), null, $self->semStack[$stackPos-(6-3)], $self->semStack[$stackPos-(6-4)], $self->semStack[$stackPos-(6-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(6-2)], $self->semStack[$stackPos-(6-1)]); }, - 292 => null, 293 => null, 294 => static function ($self, $stackPos) { - $self->semValue = new Node\Name('static', $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Node\NullableType($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, 295 => static function ($self, $stackPos) { - $self->semValue = $self->handleBuiltinTypes($self->semStack[$stackPos-(1-1)]); - }, - 296 => static function ($self, $stackPos) { - $self->semValue = new Node\Identifier('array', $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Node\UnionType($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 297 => static function ($self, $stackPos) { - $self->semValue = new Node\Identifier('callable', $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); + 296 => null, + 297 => null, + 298 => static function ($self, $stackPos) { + $self->semValue = new Node\Name('static', $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 298 => null, 299 => static function ($self, $stackPos) { - $self->semValue = $self->semStack[$stackPos-(3-2)]; + $self->semValue = $self->handleBuiltinTypes($self->semStack[$stackPos-(1-1)]); }, 300 => static function ($self, $stackPos) { - $self->semValue = array($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)]); + $self->semValue = new Node\Identifier('array', $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, 301 => static function ($self, $stackPos) { - $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; + $self->semValue = new Node\Identifier('callable', $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, 302 => null, 303 => static function ($self, $stackPos) { @@ -1881,863 +1883,908 @@ protected function initReduceCallbacks(): void { 305 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 306 => static function ($self, $stackPos) { - $self->semValue = array($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)]); - }, + 306 => null, 307 => static function ($self, $stackPos) { - $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; + $self->semValue = $self->semStack[$stackPos-(3-2)]; }, 308 => static function ($self, $stackPos) { - $self->semValue = new Node\IntersectionType($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = array($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)]); }, 309 => static function ($self, $stackPos) { - $self->semValue = array($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)]); + $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, 310 => static function ($self, $stackPos) { - $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; + $self->semValue = array($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)]); }, 311 => static function ($self, $stackPos) { + $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; + }, + 312 => static function ($self, $stackPos) { $self->semValue = new Node\IntersectionType($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 312 => null, 313 => static function ($self, $stackPos) { - $self->semValue = new Node\NullableType($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = array($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)]); }, 314 => static function ($self, $stackPos) { + $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; + }, + 315 => static function ($self, $stackPos) { + $self->semValue = new Node\IntersectionType($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); + }, + 316 => null, + 317 => static function ($self, $stackPos) { + $self->semValue = new Node\NullableType($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); + }, + 318 => static function ($self, $stackPos) { $self->semValue = new Node\UnionType($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 315 => null, - 316 => static function ($self, $stackPos) { + 319 => null, + 320 => static function ($self, $stackPos) { $self->semValue = null; }, - 317 => null, - 318 => static function ($self, $stackPos) { + 321 => null, + 322 => static function ($self, $stackPos) { $self->semValue = null; }, - 319 => static function ($self, $stackPos) { + 323 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(2-2)]; }, - 320 => static function ($self, $stackPos) { + 324 => static function ($self, $stackPos) { $self->semValue = null; }, - 321 => static function ($self, $stackPos) { + 325 => static function ($self, $stackPos) { $self->semValue = array(); }, - 322 => static function ($self, $stackPos) { + 326 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-2)]; }, - 323 => static function ($self, $stackPos) { + 327 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(3-2)]); }, - 324 => static function ($self, $stackPos) { + 328 => static function ($self, $stackPos) { $self->semValue = new Node\VariadicPlaceholder($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 325 => static function ($self, $stackPos) { + 329 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 326 => static function ($self, $stackPos) { + 330 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 327 => static function ($self, $stackPos) { + 331 => static function ($self, $stackPos) { $self->semValue = new Node\Arg($self->semStack[$stackPos-(1-1)], false, false, $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 328 => static function ($self, $stackPos) { + 332 => static function ($self, $stackPos) { $self->semValue = new Node\Arg($self->semStack[$stackPos-(2-2)], true, false, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 329 => static function ($self, $stackPos) { + 333 => static function ($self, $stackPos) { $self->semValue = new Node\Arg($self->semStack[$stackPos-(2-2)], false, true, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 330 => static function ($self, $stackPos) { + 334 => static function ($self, $stackPos) { $self->semValue = new Node\Arg($self->semStack[$stackPos-(3-3)], false, false, $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(3-1)]); }, - 331 => null, - 332 => static function ($self, $stackPos) { + 335 => null, + 336 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 333 => static function ($self, $stackPos) { + 337 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 334 => null, - 335 => null, - 336 => static function ($self, $stackPos) { + 338 => null, + 339 => null, + 340 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 337 => static function ($self, $stackPos) { + 341 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 338 => static function ($self, $stackPos) { + 342 => static function ($self, $stackPos) { $self->semValue = new Node\StaticVar($self->semStack[$stackPos-(1-1)], null, $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 339 => static function ($self, $stackPos) { + 343 => static function ($self, $stackPos) { $self->semValue = new Node\StaticVar($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 340 => static function ($self, $stackPos) { + 344 => static function ($self, $stackPos) { if ($self->semStack[$stackPos-(2-2)] !== null) { $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; } else { $self->semValue = $self->semStack[$stackPos-(2-1)]; } }, - 341 => static function ($self, $stackPos) { + 345 => static function ($self, $stackPos) { $self->semValue = array(); }, - 342 => static function ($self, $stackPos) { + 346 => static function ($self, $stackPos) { $nop = $self->maybeCreateZeroLengthNop($self->tokenPos);; if ($nop !== null) { $self->semStack[$stackPos-(1-1)][] = $nop; } $self->semValue = $self->semStack[$stackPos-(1-1)]; }, - 343 => static function ($self, $stackPos) { + 347 => static function ($self, $stackPos) { $self->semValue = new Stmt\Property($self->semStack[$stackPos-(5-2)], $self->semStack[$stackPos-(5-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(5-3)], $self->semStack[$stackPos-(5-1)]); - $self->checkProperty($self->semValue, $stackPos-(5-2)); }, - 344 => static function ($self, $stackPos) { + 348 => static function ($self, $stackPos) { $self->semValue = new Stmt\ClassConst($self->semStack[$stackPos-(5-4)], $self->semStack[$stackPos-(5-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(5-1)]); $self->checkClassConst($self->semValue, $stackPos-(5-2)); }, - 345 => static function ($self, $stackPos) { + 349 => static function ($self, $stackPos) { $self->semValue = new Stmt\ClassConst($self->semStack[$stackPos-(6-5)], $self->semStack[$stackPos-(6-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(6-1)], $self->semStack[$stackPos-(6-4)]); $self->checkClassConst($self->semValue, $stackPos-(6-2)); }, - 346 => static function ($self, $stackPos) { + 350 => static function ($self, $stackPos) { $self->semValue = new Stmt\ClassMethod($self->semStack[$stackPos-(10-5)], ['type' => $self->semStack[$stackPos-(10-2)], 'byRef' => $self->semStack[$stackPos-(10-4)], 'params' => $self->semStack[$stackPos-(10-7)], 'returnType' => $self->semStack[$stackPos-(10-9)], 'stmts' => $self->semStack[$stackPos-(10-10)], 'attrGroups' => $self->semStack[$stackPos-(10-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(10-1)], $self->tokenEndStack[$stackPos])); $self->checkClassMethod($self->semValue, $stackPos-(10-2)); }, - 347 => static function ($self, $stackPos) { + 351 => static function ($self, $stackPos) { $self->semValue = new Stmt\TraitUse($self->semStack[$stackPos-(3-2)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 348 => static function ($self, $stackPos) { + 352 => static function ($self, $stackPos) { $self->semValue = new Stmt\EnumCase($self->semStack[$stackPos-(5-3)], $self->semStack[$stackPos-(5-4)], $self->semStack[$stackPos-(5-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos])); }, - 349 => static function ($self, $stackPos) { + 353 => static function ($self, $stackPos) { $self->semValue = null; /* will be skipped */ }, - 350 => static function ($self, $stackPos) { + 354 => static function ($self, $stackPos) { $self->semValue = array(); }, - 351 => static function ($self, $stackPos) { + 355 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 352 => static function ($self, $stackPos) { + 356 => static function ($self, $stackPos) { $self->semValue = array(); }, - 353 => static function ($self, $stackPos) { + 357 => static function ($self, $stackPos) { $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; }, - 354 => static function ($self, $stackPos) { + 358 => static function ($self, $stackPos) { $self->semValue = new Stmt\TraitUseAdaptation\Precedence($self->semStack[$stackPos-(4-1)][0], $self->semStack[$stackPos-(4-1)][1], $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 355 => static function ($self, $stackPos) { + 359 => static function ($self, $stackPos) { $self->semValue = new Stmt\TraitUseAdaptation\Alias($self->semStack[$stackPos-(5-1)][0], $self->semStack[$stackPos-(5-1)][1], $self->semStack[$stackPos-(5-3)], $self->semStack[$stackPos-(5-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos])); }, - 356 => static function ($self, $stackPos) { + 360 => static function ($self, $stackPos) { $self->semValue = new Stmt\TraitUseAdaptation\Alias($self->semStack[$stackPos-(4-1)][0], $self->semStack[$stackPos-(4-1)][1], $self->semStack[$stackPos-(4-3)], null, $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 357 => static function ($self, $stackPos) { + 361 => static function ($self, $stackPos) { $self->semValue = new Stmt\TraitUseAdaptation\Alias($self->semStack[$stackPos-(4-1)][0], $self->semStack[$stackPos-(4-1)][1], null, $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 358 => static function ($self, $stackPos) { + 362 => static function ($self, $stackPos) { $self->semValue = new Stmt\TraitUseAdaptation\Alias($self->semStack[$stackPos-(4-1)][0], $self->semStack[$stackPos-(4-1)][1], null, $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 359 => static function ($self, $stackPos) { + 363 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)]); }, - 360 => null, - 361 => static function ($self, $stackPos) { - $self->semValue = array(null, $self->semStack[$stackPos-(1-1)]); - }, - 362 => static function ($self, $stackPos) { - $self->semValue = null; - }, - 363 => null, 364 => null, 365 => static function ($self, $stackPos) { - $self->semValue = 0; + $self->semValue = array(null, $self->semStack[$stackPos-(1-1)]); }, 366 => static function ($self, $stackPos) { - $self->semValue = 0; + $self->semValue = null; }, 367 => null, 368 => null, 369 => static function ($self, $stackPos) { - $self->checkModifier($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $self->semValue = $self->semStack[$stackPos-(2-1)] | $self->semStack[$stackPos-(2-2)]; + $self->semValue = 0; }, 370 => static function ($self, $stackPos) { + $self->semValue = 0; + }, + 371 => null, + 372 => null, + 373 => static function ($self, $stackPos) { + $self->checkModifier($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $self->semValue = $self->semStack[$stackPos-(2-1)] | $self->semStack[$stackPos-(2-2)]; + }, + 374 => static function ($self, $stackPos) { $self->semValue = Modifiers::PUBLIC; }, - 371 => static function ($self, $stackPos) { + 375 => static function ($self, $stackPos) { $self->semValue = Modifiers::PROTECTED; }, - 372 => static function ($self, $stackPos) { + 376 => static function ($self, $stackPos) { $self->semValue = Modifiers::PRIVATE; }, - 373 => static function ($self, $stackPos) { + 377 => static function ($self, $stackPos) { + $self->semValue = Modifiers::PUBLIC_SET; + }, + 378 => static function ($self, $stackPos) { + $self->semValue = Modifiers::PROTECTED_SET; + }, + 379 => static function ($self, $stackPos) { + $self->semValue = Modifiers::PRIVATE_SET; + }, + 380 => static function ($self, $stackPos) { $self->semValue = Modifiers::STATIC; }, - 374 => static function ($self, $stackPos) { + 381 => static function ($self, $stackPos) { $self->semValue = Modifiers::ABSTRACT; }, - 375 => static function ($self, $stackPos) { + 382 => static function ($self, $stackPos) { $self->semValue = Modifiers::FINAL; }, - 376 => static function ($self, $stackPos) { + 383 => static function ($self, $stackPos) { $self->semValue = Modifiers::READONLY; }, - 377 => null, - 378 => static function ($self, $stackPos) { + 384 => null, + 385 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 379 => static function ($self, $stackPos) { + 386 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 380 => static function ($self, $stackPos) { + 387 => static function ($self, $stackPos) { $self->semValue = new Node\VarLikeIdentifier(substr($self->semStack[$stackPos-(1-1)], 1), $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 381 => static function ($self, $stackPos) { + 388 => static function ($self, $stackPos) { $self->semValue = new Node\PropertyItem($self->semStack[$stackPos-(1-1)], null, $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 382 => static function ($self, $stackPos) { + 389 => static function ($self, $stackPos) { $self->semValue = new Node\PropertyItem($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 383 => null, - 384 => null, - 385 => static function ($self, $stackPos) { + 390 => static function ($self, $stackPos) { + $self->semValue = []; + }, + 391 => static function ($self, $stackPos) { + $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; + }, + 392 => static function ($self, $stackPos) { + $self->semValue = []; + }, + 393 => static function ($self, $stackPos) { + $self->semValue = new Node\PropertyHook($self->semStack[$stackPos-(5-4)], $self->semStack[$stackPos-(5-5)], ['flags' => $self->semStack[$stackPos-(5-2)], 'byRef' => $self->semStack[$stackPos-(5-3)], 'params' => [], 'attrGroups' => $self->semStack[$stackPos-(5-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos])); + $self->checkPropertyHook($self->semValue, null); + }, + 394 => static function ($self, $stackPos) { + $self->semValue = new Node\PropertyHook($self->semStack[$stackPos-(8-4)], $self->semStack[$stackPos-(8-8)], ['flags' => $self->semStack[$stackPos-(8-2)], 'byRef' => $self->semStack[$stackPos-(8-3)], 'params' => $self->semStack[$stackPos-(8-6)], 'attrGroups' => $self->semStack[$stackPos-(8-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); + $self->checkPropertyHook($self->semValue, $stackPos-(8-5)); + }, + 395 => static function ($self, $stackPos) { + $self->semValue = null; + }, + 396 => static function ($self, $stackPos) { + $self->semValue = $self->semStack[$stackPos-(3-2)]; + }, + 397 => static function ($self, $stackPos) { + $self->semValue = $self->semStack[$stackPos-(3-2)]; + }, + 398 => static function ($self, $stackPos) { + $self->semValue = 0; + }, + 399 => static function ($self, $stackPos) { + $self->checkPropertyHookModifiers($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $self->semValue = $self->semStack[$stackPos-(2-1)] | $self->semStack[$stackPos-(2-2)]; + }, + 400 => null, + 401 => null, + 402 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 386 => static function ($self, $stackPos) { + 403 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 387 => static function ($self, $stackPos) { + 404 => static function ($self, $stackPos) { $self->semValue = array(); }, - 388 => null, - 389 => null, - 390 => static function ($self, $stackPos) { + 405 => null, + 406 => null, + 407 => static function ($self, $stackPos) { $self->semValue = new Expr\Assign($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 391 => static function ($self, $stackPos) { + 408 => static function ($self, $stackPos) { $self->semValue = new Expr\Assign($self->fixupArrayDestructuring($self->semStack[$stackPos-(3-1)]), $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 392 => static function ($self, $stackPos) { + 409 => static function ($self, $stackPos) { $self->semValue = new Expr\Assign($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 393 => static function ($self, $stackPos) { + 410 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignRef($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 394 => static function ($self, $stackPos) { + 411 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignRef($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); if (!$self->phpVersion->allowsAssignNewByReference()) { $self->emitError(new Error('Cannot assign new by reference', $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos]))); } }, - 395 => null, - 396 => null, - 397 => static function ($self, $stackPos) { + 412 => null, + 413 => null, + 414 => static function ($self, $stackPos) { $self->semValue = new Expr\Clone_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 398 => static function ($self, $stackPos) { + 415 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Plus($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 399 => static function ($self, $stackPos) { + 416 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Minus($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 400 => static function ($self, $stackPos) { + 417 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Mul($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 401 => static function ($self, $stackPos) { + 418 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Div($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 402 => static function ($self, $stackPos) { + 419 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Concat($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 403 => static function ($self, $stackPos) { + 420 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Mod($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 404 => static function ($self, $stackPos) { + 421 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\BitwiseAnd($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 405 => static function ($self, $stackPos) { + 422 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\BitwiseOr($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 406 => static function ($self, $stackPos) { + 423 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\BitwiseXor($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 407 => static function ($self, $stackPos) { + 424 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\ShiftLeft($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 408 => static function ($self, $stackPos) { + 425 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\ShiftRight($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 409 => static function ($self, $stackPos) { + 426 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Pow($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 410 => static function ($self, $stackPos) { + 427 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Coalesce($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 411 => static function ($self, $stackPos) { + 428 => static function ($self, $stackPos) { $self->semValue = new Expr\PostInc($self->semStack[$stackPos-(2-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 412 => static function ($self, $stackPos) { + 429 => static function ($self, $stackPos) { $self->semValue = new Expr\PreInc($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 413 => static function ($self, $stackPos) { + 430 => static function ($self, $stackPos) { $self->semValue = new Expr\PostDec($self->semStack[$stackPos-(2-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 414 => static function ($self, $stackPos) { + 431 => static function ($self, $stackPos) { $self->semValue = new Expr\PreDec($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 415 => static function ($self, $stackPos) { + 432 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\BooleanOr($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 416 => static function ($self, $stackPos) { + 433 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\BooleanAnd($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 417 => static function ($self, $stackPos) { + 434 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\LogicalOr($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 418 => static function ($self, $stackPos) { + 435 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\LogicalAnd($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 419 => static function ($self, $stackPos) { + 436 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\LogicalXor($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 420 => static function ($self, $stackPos) { + 437 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\BitwiseOr($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 421 => static function ($self, $stackPos) { + 438 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\BitwiseAnd($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 422 => static function ($self, $stackPos) { + 439 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\BitwiseAnd($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 423 => static function ($self, $stackPos) { + 440 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\BitwiseXor($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 424 => static function ($self, $stackPos) { + 441 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Concat($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 425 => static function ($self, $stackPos) { + 442 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Plus($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 426 => static function ($self, $stackPos) { + 443 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Minus($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 427 => static function ($self, $stackPos) { + 444 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Mul($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 428 => static function ($self, $stackPos) { + 445 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Div($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 429 => static function ($self, $stackPos) { + 446 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Mod($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 430 => static function ($self, $stackPos) { + 447 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\ShiftLeft($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 431 => static function ($self, $stackPos) { + 448 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\ShiftRight($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 432 => static function ($self, $stackPos) { + 449 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Pow($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 433 => static function ($self, $stackPos) { + 450 => static function ($self, $stackPos) { $self->semValue = new Expr\UnaryPlus($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 434 => static function ($self, $stackPos) { + 451 => static function ($self, $stackPos) { $self->semValue = new Expr\UnaryMinus($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 435 => static function ($self, $stackPos) { + 452 => static function ($self, $stackPos) { $self->semValue = new Expr\BooleanNot($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 436 => static function ($self, $stackPos) { + 453 => static function ($self, $stackPos) { $self->semValue = new Expr\BitwiseNot($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 437 => static function ($self, $stackPos) { + 454 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Identical($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 438 => static function ($self, $stackPos) { + 455 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\NotIdentical($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 439 => static function ($self, $stackPos) { + 456 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Equal($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 440 => static function ($self, $stackPos) { + 457 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\NotEqual($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 441 => static function ($self, $stackPos) { + 458 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Spaceship($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 442 => static function ($self, $stackPos) { + 459 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Smaller($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 443 => static function ($self, $stackPos) { + 460 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\SmallerOrEqual($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 444 => static function ($self, $stackPos) { + 461 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Greater($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 445 => static function ($self, $stackPos) { + 462 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\GreaterOrEqual($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 446 => static function ($self, $stackPos) { + 463 => static function ($self, $stackPos) { $self->semValue = new Expr\Instanceof_($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 447 => static function ($self, $stackPos) { + 464 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 448 => static function ($self, $stackPos) { + 465 => static function ($self, $stackPos) { $self->semValue = new Expr\Ternary($self->semStack[$stackPos-(5-1)], $self->semStack[$stackPos-(5-3)], $self->semStack[$stackPos-(5-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos])); }, - 449 => static function ($self, $stackPos) { + 466 => static function ($self, $stackPos) { $self->semValue = new Expr\Ternary($self->semStack[$stackPos-(4-1)], null, $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 450 => static function ($self, $stackPos) { + 467 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Coalesce($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 451 => static function ($self, $stackPos) { + 468 => static function ($self, $stackPos) { $self->semValue = new Expr\Isset_($self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 452 => static function ($self, $stackPos) { + 469 => static function ($self, $stackPos) { $self->semValue = new Expr\Empty_($self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 453 => static function ($self, $stackPos) { + 470 => static function ($self, $stackPos) { $self->semValue = new Expr\Include_($self->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 454 => static function ($self, $stackPos) { + 471 => static function ($self, $stackPos) { $self->semValue = new Expr\Include_($self->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 455 => static function ($self, $stackPos) { + 472 => static function ($self, $stackPos) { $self->semValue = new Expr\Eval_($self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 456 => static function ($self, $stackPos) { + 473 => static function ($self, $stackPos) { $self->semValue = new Expr\Include_($self->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 457 => static function ($self, $stackPos) { + 474 => static function ($self, $stackPos) { $self->semValue = new Expr\Include_($self->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 458 => static function ($self, $stackPos) { + 475 => static function ($self, $stackPos) { $self->semValue = new Expr\Cast\Int_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 459 => static function ($self, $stackPos) { + 476 => static function ($self, $stackPos) { $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos]); $attrs['kind'] = $self->getFloatCastKind($self->semStack[$stackPos-(2-1)]); $self->semValue = new Expr\Cast\Double($self->semStack[$stackPos-(2-2)], $attrs); }, - 460 => static function ($self, $stackPos) { + 477 => static function ($self, $stackPos) { $self->semValue = new Expr\Cast\String_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 461 => static function ($self, $stackPos) { + 478 => static function ($self, $stackPos) { $self->semValue = new Expr\Cast\Array_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 462 => static function ($self, $stackPos) { + 479 => static function ($self, $stackPos) { $self->semValue = new Expr\Cast\Object_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 463 => static function ($self, $stackPos) { + 480 => static function ($self, $stackPos) { $self->semValue = new Expr\Cast\Bool_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 464 => static function ($self, $stackPos) { + 481 => static function ($self, $stackPos) { $self->semValue = new Expr\Cast\Unset_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 465 => static function ($self, $stackPos) { - $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos]); - $attrs['kind'] = strtolower($self->semStack[$stackPos-(2-1)]) === 'exit' ? Expr\Exit_::KIND_EXIT : Expr\Exit_::KIND_DIE; - $self->semValue = new Expr\Exit_($self->semStack[$stackPos-(2-2)], $attrs); + 482 => static function ($self, $stackPos) { + $self->semValue = $self->createExitExpr($self->semStack[$stackPos-(2-1)], $stackPos-(2-1), $self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 466 => static function ($self, $stackPos) { + 483 => static function ($self, $stackPos) { $self->semValue = new Expr\ErrorSuppress($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 467 => null, - 468 => static function ($self, $stackPos) { + 484 => null, + 485 => static function ($self, $stackPos) { $self->semValue = new Expr\ShellExec($self->semStack[$stackPos-(3-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 469 => static function ($self, $stackPos) { + 486 => static function ($self, $stackPos) { $self->semValue = new Expr\Print_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 470 => static function ($self, $stackPos) { + 487 => static function ($self, $stackPos) { $self->semValue = new Expr\Yield_(null, null, $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 471 => static function ($self, $stackPos) { + 488 => static function ($self, $stackPos) { $self->semValue = new Expr\Yield_($self->semStack[$stackPos-(2-2)], null, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 472 => static function ($self, $stackPos) { + 489 => static function ($self, $stackPos) { $self->semValue = new Expr\Yield_($self->semStack[$stackPos-(4-4)], $self->semStack[$stackPos-(4-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 473 => static function ($self, $stackPos) { + 490 => static function ($self, $stackPos) { $self->semValue = new Expr\YieldFrom($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 474 => static function ($self, $stackPos) { + 491 => static function ($self, $stackPos) { $self->semValue = new Expr\Throw_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 475 => static function ($self, $stackPos) { + 492 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrowFunction(['static' => false, 'byRef' => $self->semStack[$stackPos-(8-2)], 'params' => $self->semStack[$stackPos-(8-4)], 'returnType' => $self->semStack[$stackPos-(8-6)], 'expr' => $self->semStack[$stackPos-(8-8)], 'attrGroups' => []], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); }, - 476 => static function ($self, $stackPos) { + 493 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrowFunction(['static' => true, 'byRef' => $self->semStack[$stackPos-(9-3)], 'params' => $self->semStack[$stackPos-(9-5)], 'returnType' => $self->semStack[$stackPos-(9-7)], 'expr' => $self->semStack[$stackPos-(9-9)], 'attrGroups' => []], $self->getAttributes($self->tokenStartStack[$stackPos-(9-1)], $self->tokenEndStack[$stackPos])); }, - 477 => static function ($self, $stackPos) { + 494 => static function ($self, $stackPos) { $self->semValue = new Expr\Closure(['static' => false, 'byRef' => $self->semStack[$stackPos-(8-2)], 'params' => $self->semStack[$stackPos-(8-4)], 'uses' => $self->semStack[$stackPos-(8-6)], 'returnType' => $self->semStack[$stackPos-(8-7)], 'stmts' => $self->semStack[$stackPos-(8-8)], 'attrGroups' => []], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); }, - 478 => static function ($self, $stackPos) { + 495 => static function ($self, $stackPos) { $self->semValue = new Expr\Closure(['static' => true, 'byRef' => $self->semStack[$stackPos-(9-3)], 'params' => $self->semStack[$stackPos-(9-5)], 'uses' => $self->semStack[$stackPos-(9-7)], 'returnType' => $self->semStack[$stackPos-(9-8)], 'stmts' => $self->semStack[$stackPos-(9-9)], 'attrGroups' => []], $self->getAttributes($self->tokenStartStack[$stackPos-(9-1)], $self->tokenEndStack[$stackPos])); }, - 479 => static function ($self, $stackPos) { + 496 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrowFunction(['static' => false, 'byRef' => $self->semStack[$stackPos-(9-3)], 'params' => $self->semStack[$stackPos-(9-5)], 'returnType' => $self->semStack[$stackPos-(9-7)], 'expr' => $self->semStack[$stackPos-(9-9)], 'attrGroups' => $self->semStack[$stackPos-(9-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(9-1)], $self->tokenEndStack[$stackPos])); }, - 480 => static function ($self, $stackPos) { + 497 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrowFunction(['static' => true, 'byRef' => $self->semStack[$stackPos-(10-4)], 'params' => $self->semStack[$stackPos-(10-6)], 'returnType' => $self->semStack[$stackPos-(10-8)], 'expr' => $self->semStack[$stackPos-(10-10)], 'attrGroups' => $self->semStack[$stackPos-(10-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(10-1)], $self->tokenEndStack[$stackPos])); }, - 481 => static function ($self, $stackPos) { + 498 => static function ($self, $stackPos) { $self->semValue = new Expr\Closure(['static' => false, 'byRef' => $self->semStack[$stackPos-(9-3)], 'params' => $self->semStack[$stackPos-(9-5)], 'uses' => $self->semStack[$stackPos-(9-7)], 'returnType' => $self->semStack[$stackPos-(9-8)], 'stmts' => $self->semStack[$stackPos-(9-9)], 'attrGroups' => $self->semStack[$stackPos-(9-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(9-1)], $self->tokenEndStack[$stackPos])); }, - 482 => static function ($self, $stackPos) { + 499 => static function ($self, $stackPos) { $self->semValue = new Expr\Closure(['static' => true, 'byRef' => $self->semStack[$stackPos-(10-4)], 'params' => $self->semStack[$stackPos-(10-6)], 'uses' => $self->semStack[$stackPos-(10-8)], 'returnType' => $self->semStack[$stackPos-(10-9)], 'stmts' => $self->semStack[$stackPos-(10-10)], 'attrGroups' => $self->semStack[$stackPos-(10-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(10-1)], $self->tokenEndStack[$stackPos])); }, - 483 => static function ($self, $stackPos) { + 500 => static function ($self, $stackPos) { $self->semValue = array(new Stmt\Class_(null, ['type' => $self->semStack[$stackPos-(8-2)], 'extends' => $self->semStack[$stackPos-(8-4)], 'implements' => $self->semStack[$stackPos-(8-5)], 'stmts' => $self->semStack[$stackPos-(8-7)], 'attrGroups' => $self->semStack[$stackPos-(8-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])), $self->semStack[$stackPos-(8-3)]); $self->checkClass($self->semValue[0], -1); }, - 484 => static function ($self, $stackPos) { + 501 => static function ($self, $stackPos) { $self->semValue = new Expr\New_($self->semStack[$stackPos-(3-2)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 485 => static function ($self, $stackPos) { + 502 => static function ($self, $stackPos) { list($class, $ctorArgs) = $self->semStack[$stackPos-(2-2)]; $self->semValue = new Expr\New_($class, $ctorArgs, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 486 => static function ($self, $stackPos) { + 503 => static function ($self, $stackPos) { $self->semValue = new Expr\New_($self->semStack[$stackPos-(2-2)], [], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 487 => null, - 488 => null, - 489 => static function ($self, $stackPos) { + 504 => null, + 505 => null, + 506 => static function ($self, $stackPos) { $self->semValue = array(); }, - 490 => static function ($self, $stackPos) { + 507 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-3)]; }, - 491 => null, - 492 => static function ($self, $stackPos) { + 508 => null, + 509 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 493 => static function ($self, $stackPos) { + 510 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 494 => static function ($self, $stackPos) { + 511 => static function ($self, $stackPos) { $self->semValue = new Node\ClosureUse($self->semStack[$stackPos-(2-2)], $self->semStack[$stackPos-(2-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 495 => static function ($self, $stackPos) { + 512 => static function ($self, $stackPos) { $self->semValue = new Name($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 496 => static function ($self, $stackPos) { + 513 => static function ($self, $stackPos) { $self->semValue = new Expr\FuncCall($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 497 => static function ($self, $stackPos) { + 514 => static function ($self, $stackPos) { $self->semValue = new Expr\FuncCall($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 498 => static function ($self, $stackPos) { + 515 => static function ($self, $stackPos) { $self->semValue = new Expr\FuncCall($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 499 => static function ($self, $stackPos) { + 516 => static function ($self, $stackPos) { $self->semValue = new Expr\StaticCall($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 500 => static function ($self, $stackPos) { + 517 => static function ($self, $stackPos) { $self->semValue = new Name($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 501 => null, - 502 => static function ($self, $stackPos) { + 518 => null, + 519 => static function ($self, $stackPos) { $self->semValue = new Name($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 503 => static function ($self, $stackPos) { + 520 => static function ($self, $stackPos) { $self->semValue = new Name($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 504 => static function ($self, $stackPos) { + 521 => static function ($self, $stackPos) { $self->semValue = new Name\FullyQualified(substr($self->semStack[$stackPos-(1-1)], 1), $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 505 => static function ($self, $stackPos) { + 522 => static function ($self, $stackPos) { $self->semValue = new Name\Relative(substr($self->semStack[$stackPos-(1-1)], 10), $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 506 => null, - 507 => null, - 508 => static function ($self, $stackPos) { + 523 => null, + 524 => null, + 525 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 509 => static function ($self, $stackPos) { + 526 => static function ($self, $stackPos) { $self->semValue = new Expr\Error($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); $self->errorState = 2; }, - 510 => null, - 511 => null, - 512 => static function ($self, $stackPos) { - $self->semValue = null; - }, - 513 => static function ($self, $stackPos) { - $self->semValue = $self->semStack[$stackPos-(3-2)]; - }, - 514 => static function ($self, $stackPos) { + 527 => null, + 528 => null, + 529 => static function ($self, $stackPos) { $self->semValue = array(); }, - 515 => static function ($self, $stackPos) { + 530 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); foreach ($self->semValue as $s) { if ($s instanceof Node\InterpolatedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', $self->phpVersion->supportsUnicodeEscapes()); } }; }, - 516 => static function ($self, $stackPos) { + 531 => static function ($self, $stackPos) { foreach ($self->semStack[$stackPos-(1-1)] as $s) { if ($s instanceof Node\InterpolatedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', $self->phpVersion->supportsUnicodeEscapes()); } }; $self->semValue = $self->semStack[$stackPos-(1-1)]; }, - 517 => static function ($self, $stackPos) { + 532 => static function ($self, $stackPos) { $self->semValue = array(); }, - 518 => null, - 519 => static function ($self, $stackPos) { + 533 => null, + 534 => static function ($self, $stackPos) { $self->semValue = new Expr\ConstFetch($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 520 => static function ($self, $stackPos) { + 535 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\Line($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 521 => static function ($self, $stackPos) { + 536 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\File($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 522 => static function ($self, $stackPos) { + 537 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\Dir($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 523 => static function ($self, $stackPos) { + 538 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\Class_($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 524 => static function ($self, $stackPos) { + 539 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\Trait_($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 525 => static function ($self, $stackPos) { + 540 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\Method($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 526 => static function ($self, $stackPos) { + 541 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\Function_($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 527 => static function ($self, $stackPos) { + 542 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\Namespace_($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 528 => static function ($self, $stackPos) { + 543 => static function ($self, $stackPos) { + $self->semValue = new Scalar\MagicConst\Property($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); + }, + 544 => static function ($self, $stackPos) { $self->semValue = new Expr\ClassConstFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 529 => static function ($self, $stackPos) { + 545 => static function ($self, $stackPos) { $self->semValue = new Expr\ClassConstFetch($self->semStack[$stackPos-(5-1)], $self->semStack[$stackPos-(5-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos])); }, - 530 => static function ($self, $stackPos) { + 546 => static function ($self, $stackPos) { $self->semValue = new Expr\ClassConstFetch($self->semStack[$stackPos-(3-1)], new Expr\Error($self->getAttributes($self->tokenStartStack[$stackPos-(3-3)], $self->tokenEndStack[$stackPos-(3-3)])), $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); $self->errorState = 2; }, - 531 => static function ($self, $stackPos) { + 547 => static function ($self, $stackPos) { $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]); $attrs['kind'] = Expr\Array_::KIND_SHORT; $self->semValue = new Expr\Array_($self->semStack[$stackPos-(3-2)], $attrs); }, - 532 => static function ($self, $stackPos) { + 548 => static function ($self, $stackPos) { $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos]); $attrs['kind'] = Expr\Array_::KIND_LONG; $self->semValue = new Expr\Array_($self->semStack[$stackPos-(4-3)], $attrs); $self->createdArrays->attach($self->semValue); }, - 533 => static function ($self, $stackPos) { + 549 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(1-1)]; $self->createdArrays->attach($self->semValue); }, - 534 => static function ($self, $stackPos) { + 550 => static function ($self, $stackPos) { $self->semValue = Scalar\String_::fromString($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos]), $self->phpVersion->supportsUnicodeEscapes()); }, - 535 => static function ($self, $stackPos) { + 551 => static function ($self, $stackPos) { $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]); $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED; foreach ($self->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\InterpolatedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', $self->phpVersion->supportsUnicodeEscapes()); } }; $self->semValue = new Scalar\InterpolatedString($self->semStack[$stackPos-(3-2)], $attrs); }, - 536 => static function ($self, $stackPos) { + 552 => static function ($self, $stackPos) { $self->semValue = $self->parseLNumber($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos]), $self->phpVersion->allowsInvalidOctals()); }, - 537 => static function ($self, $stackPos) { + 553 => static function ($self, $stackPos) { $self->semValue = Scalar\Float_::fromString($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 538 => null, - 539 => null, - 540 => null, - 541 => static function ($self, $stackPos) { + 554 => null, + 555 => null, + 556 => null, + 557 => static function ($self, $stackPos) { $self->semValue = $self->parseDocString($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-2)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]), $self->getAttributes($self->tokenStartStack[$stackPos-(3-3)], $self->tokenEndStack[$stackPos-(3-3)]), true); }, - 542 => static function ($self, $stackPos) { + 558 => static function ($self, $stackPos) { $self->semValue = $self->parseDocString($self->semStack[$stackPos-(2-1)], '', $self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos]), $self->getAttributes($self->tokenStartStack[$stackPos-(2-2)], $self->tokenEndStack[$stackPos-(2-2)]), true); }, - 543 => static function ($self, $stackPos) { + 559 => static function ($self, $stackPos) { $self->semValue = $self->parseDocString($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-2)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]), $self->getAttributes($self->tokenStartStack[$stackPos-(3-3)], $self->tokenEndStack[$stackPos-(3-3)]), true); }, - 544 => static function ($self, $stackPos) { + 560 => static function ($self, $stackPos) { $self->semValue = null; }, - 545 => null, - 546 => null, - 547 => static function ($self, $stackPos) { + 561 => null, + 562 => null, + 563 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 548 => null, - 549 => null, - 550 => null, - 551 => null, - 552 => null, - 553 => null, - 554 => static function ($self, $stackPos) { + 564 => null, + 565 => null, + 566 => null, + 567 => null, + 568 => null, + 569 => null, + 570 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 555 => null, - 556 => null, - 557 => null, - 558 => static function ($self, $stackPos) { + 571 => null, + 572 => null, + 573 => null, + 574 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrayDimFetch($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 559 => static function ($self, $stackPos) { + 575 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrayDimFetch($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 560 => null, - 561 => static function ($self, $stackPos) { + 576 => null, + 577 => static function ($self, $stackPos) { $self->semValue = new Expr\MethodCall($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 562 => static function ($self, $stackPos) { + 578 => static function ($self, $stackPos) { $self->semValue = new Expr\NullsafeMethodCall($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 563 => static function ($self, $stackPos) { + 579 => static function ($self, $stackPos) { $self->semValue = null; }, - 564 => null, - 565 => null, - 566 => null, - 567 => static function ($self, $stackPos) { + 580 => null, + 581 => null, + 582 => null, + 583 => static function ($self, $stackPos) { $self->semValue = new Expr\PropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 568 => static function ($self, $stackPos) { + 584 => static function ($self, $stackPos) { $self->semValue = new Expr\NullsafePropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 569 => null, - 570 => static function ($self, $stackPos) { + 585 => null, + 586 => static function ($self, $stackPos) { $self->semValue = new Expr\Variable($self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 571 => static function ($self, $stackPos) { + 587 => static function ($self, $stackPos) { $self->semValue = new Expr\Variable($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 572 => static function ($self, $stackPos) { + 588 => static function ($self, $stackPos) { $self->semValue = new Expr\Variable(new Expr\Error($self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])), $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); $self->errorState = 2; }, - 573 => static function ($self, $stackPos) { + 589 => static function ($self, $stackPos) { $var = $self->semStack[$stackPos-(1-1)]->name; $self->semValue = \is_string($var) ? new Node\VarLikeIdentifier($var, $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])) : $var; }, - 574 => static function ($self, $stackPos) { + 590 => static function ($self, $stackPos) { $self->semValue = new Expr\StaticPropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 575 => null, - 576 => static function ($self, $stackPos) { + 591 => null, + 592 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrayDimFetch($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 577 => static function ($self, $stackPos) { + 593 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrayDimFetch($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 578 => static function ($self, $stackPos) { + 594 => static function ($self, $stackPos) { $self->semValue = new Expr\PropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 579 => static function ($self, $stackPos) { + 595 => static function ($self, $stackPos) { $self->semValue = new Expr\NullsafePropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 580 => static function ($self, $stackPos) { + 596 => static function ($self, $stackPos) { $self->semValue = new Expr\StaticPropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 581 => static function ($self, $stackPos) { + 597 => static function ($self, $stackPos) { $self->semValue = new Expr\StaticPropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 582 => null, - 583 => static function ($self, $stackPos) { + 598 => null, + 599 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 584 => null, - 585 => null, - 586 => static function ($self, $stackPos) { + 600 => null, + 601 => null, + 602 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 587 => null, - 588 => static function ($self, $stackPos) { + 603 => null, + 604 => static function ($self, $stackPos) { $self->semValue = new Expr\Error($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); $self->errorState = 2; }, - 589 => static function ($self, $stackPos) { + 605 => static function ($self, $stackPos) { $self->semValue = new Expr\List_($self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); $self->semValue->setAttribute('kind', Expr\List_::KIND_LIST); $self->postprocessList($self->semValue); }, - 590 => static function ($self, $stackPos) { + 606 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(1-1)]; $end = count($self->semValue)-1; if ($self->semValue[$end]->value instanceof Expr\Error) array_pop($self->semValue); }, - 591 => null, - 592 => static function ($self, $stackPos) { + 607 => null, + 608 => static function ($self, $stackPos) { /* do nothing -- prevent default action of $$=$self->semStack[$1]. See $551. */ }, - 593 => static function ($self, $stackPos) { + 609 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 594 => static function ($self, $stackPos) { + 610 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 595 => static function ($self, $stackPos) { + 611 => static function ($self, $stackPos) { $self->semValue = new Node\ArrayItem($self->semStack[$stackPos-(1-1)], null, false, $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 596 => static function ($self, $stackPos) { + 612 => static function ($self, $stackPos) { $self->semValue = new Node\ArrayItem($self->semStack[$stackPos-(2-2)], null, true, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 597 => static function ($self, $stackPos) { + 613 => static function ($self, $stackPos) { $self->semValue = new Node\ArrayItem($self->semStack[$stackPos-(1-1)], null, false, $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 598 => static function ($self, $stackPos) { + 614 => static function ($self, $stackPos) { $self->semValue = new Node\ArrayItem($self->semStack[$stackPos-(3-3)], $self->semStack[$stackPos-(3-1)], false, $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 599 => static function ($self, $stackPos) { + 615 => static function ($self, $stackPos) { $self->semValue = new Node\ArrayItem($self->semStack[$stackPos-(4-4)], $self->semStack[$stackPos-(4-1)], true, $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 600 => static function ($self, $stackPos) { + 616 => static function ($self, $stackPos) { $self->semValue = new Node\ArrayItem($self->semStack[$stackPos-(3-3)], $self->semStack[$stackPos-(3-1)], false, $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 601 => static function ($self, $stackPos) { + 617 => static function ($self, $stackPos) { $self->semValue = new Node\ArrayItem($self->semStack[$stackPos-(2-2)], null, false, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos]), true); }, - 602 => static function ($self, $stackPos) { + 618 => static function ($self, $stackPos) { /* Create an Error node now to remember the position. We'll later either report an error, or convert this into a null element, depending on whether this is a creation or destructuring context. */ $attrs = $self->createEmptyElemAttributes($self->tokenPos); $self->semValue = new Node\ArrayItem(new Expr\Error($attrs), null, false, $attrs); }, - 603 => static function ($self, $stackPos) { + 619 => static function ($self, $stackPos) { $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; }, - 604 => static function ($self, $stackPos) { + 620 => static function ($self, $stackPos) { $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; }, - 605 => static function ($self, $stackPos) { + 621 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 606 => static function ($self, $stackPos) { + 622 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)]); }, - 607 => static function ($self, $stackPos) { + 623 => static function ($self, $stackPos) { $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos]); $attrs['rawValue'] = $self->semStack[$stackPos-(1-1)]; $self->semValue = new Node\InterpolatedStringPart($self->semStack[$stackPos-(1-1)], $attrs); }, - 608 => static function ($self, $stackPos) { + 624 => static function ($self, $stackPos) { $self->semValue = new Expr\Variable($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 609 => null, - 610 => static function ($self, $stackPos) { + 625 => null, + 626 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrayDimFetch($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 611 => static function ($self, $stackPos) { + 627 => static function ($self, $stackPos) { $self->semValue = new Expr\PropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 612 => static function ($self, $stackPos) { + 628 => static function ($self, $stackPos) { $self->semValue = new Expr\NullsafePropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 613 => static function ($self, $stackPos) { + 629 => static function ($self, $stackPos) { $self->semValue = new Expr\Variable($self->semStack[$stackPos-(3-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 614 => static function ($self, $stackPos) { + 630 => static function ($self, $stackPos) { $self->semValue = new Expr\Variable($self->semStack[$stackPos-(3-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 615 => static function ($self, $stackPos) { + 631 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrayDimFetch($self->semStack[$stackPos-(6-2)], $self->semStack[$stackPos-(6-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos])); }, - 616 => static function ($self, $stackPos) { + 632 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 617 => static function ($self, $stackPos) { + 633 => static function ($self, $stackPos) { $self->semValue = new Scalar\String_($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 618 => static function ($self, $stackPos) { + 634 => static function ($self, $stackPos) { $self->semValue = $self->parseNumString($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 619 => static function ($self, $stackPos) { + 635 => static function ($self, $stackPos) { $self->semValue = $self->parseNumString('-' . $self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 620 => null, + 636 => null, ]; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/Parser/Php8.php b/vendor/nikic/php-parser/lib/PhpParser/Parser/Php8.php index 1317c543..e1aa4b1f 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/Parser/Php8.php +++ b/vendor/nikic/php-parser/lib/PhpParser/Parser/Php8.php @@ -122,54 +122,58 @@ class Php8 extends \PhpParser\ParserAbstract public const T_PROTECTED = 357; public const T_PUBLIC = 358; public const T_READONLY = 359; - public const T_VAR = 360; - public const T_UNSET = 361; - public const T_ISSET = 362; - public const T_EMPTY = 363; - public const T_HALT_COMPILER = 364; - public const T_CLASS = 365; - public const T_TRAIT = 366; - public const T_INTERFACE = 367; - public const T_ENUM = 368; - public const T_EXTENDS = 369; - public const T_IMPLEMENTS = 370; - public const T_OBJECT_OPERATOR = 371; - public const T_NULLSAFE_OBJECT_OPERATOR = 372; - public const T_LIST = 373; - public const T_ARRAY = 374; - public const T_CALLABLE = 375; - public const T_CLASS_C = 376; - public const T_TRAIT_C = 377; - public const T_METHOD_C = 378; - public const T_FUNC_C = 379; - public const T_LINE = 380; - public const T_FILE = 381; - public const T_START_HEREDOC = 382; - public const T_END_HEREDOC = 383; - public const T_DOLLAR_OPEN_CURLY_BRACES = 384; - public const T_CURLY_OPEN = 385; - public const T_PAAMAYIM_NEKUDOTAYIM = 386; - public const T_NAMESPACE = 387; - public const T_NS_C = 388; - public const T_DIR = 389; - public const T_NS_SEPARATOR = 390; - public const T_ELLIPSIS = 391; - public const T_NAME_FULLY_QUALIFIED = 392; - public const T_NAME_QUALIFIED = 393; - public const T_NAME_RELATIVE = 394; - public const T_ATTRIBUTE = 395; + public const T_PUBLIC_SET = 360; + public const T_PROTECTED_SET = 361; + public const T_PRIVATE_SET = 362; + public const T_VAR = 363; + public const T_UNSET = 364; + public const T_ISSET = 365; + public const T_EMPTY = 366; + public const T_HALT_COMPILER = 367; + public const T_CLASS = 368; + public const T_TRAIT = 369; + public const T_INTERFACE = 370; + public const T_ENUM = 371; + public const T_EXTENDS = 372; + public const T_IMPLEMENTS = 373; + public const T_OBJECT_OPERATOR = 374; + public const T_NULLSAFE_OBJECT_OPERATOR = 375; + public const T_LIST = 376; + public const T_ARRAY = 377; + public const T_CALLABLE = 378; + public const T_CLASS_C = 379; + public const T_TRAIT_C = 380; + public const T_METHOD_C = 381; + public const T_FUNC_C = 382; + public const T_PROPERTY_C = 383; + public const T_LINE = 384; + public const T_FILE = 385; + public const T_START_HEREDOC = 386; + public const T_END_HEREDOC = 387; + public const T_DOLLAR_OPEN_CURLY_BRACES = 388; + public const T_CURLY_OPEN = 389; + public const T_PAAMAYIM_NEKUDOTAYIM = 390; + public const T_NAMESPACE = 391; + public const T_NS_C = 392; + public const T_DIR = 393; + public const T_NS_SEPARATOR = 394; + public const T_ELLIPSIS = 395; + public const T_NAME_FULLY_QUALIFIED = 396; + public const T_NAME_QUALIFIED = 397; + public const T_NAME_RELATIVE = 398; + public const T_ATTRIBUTE = 399; - protected int $tokenToSymbolMapSize = 396; - protected int $actionTableSize = 1272; - protected int $gotoTableSize = 689; + protected int $tokenToSymbolMapSize = 400; + protected int $actionTableSize = 1289; + protected int $gotoTableSize = 608; - protected int $invalidSymbol = 168; + protected int $invalidSymbol = 172; protected int $errorSymbol = 1; protected int $defaultAction = -32766; protected int $unexpectedTokenRule = 32767; - protected int $YY2TBLSTATE = 437; - protected int $numNonLeafStates = 743; + protected int $YY2TBLSTATE = 442; + protected int $numNonLeafStates = 753; protected array $symbolToName = array( "EOF", @@ -295,6 +299,9 @@ class Php8 extends \PhpParser\ParserAbstract "T_PROTECTED", "T_PUBLIC", "T_READONLY", + "T_PUBLIC_SET", + "T_PROTECTED_SET", + "T_PRIVATE_SET", "T_VAR", "T_UNSET", "T_ISSET", @@ -315,6 +322,7 @@ class Php8 extends \PhpParser\ParserAbstract "T_TRAIT_C", "T_METHOD_C", "T_FUNC_C", + "T_PROPERTY_C", "T_LINE", "T_FILE", "T_START_HEREDOC", @@ -343,32 +351,32 @@ class Php8 extends \PhpParser\ParserAbstract ); protected array $tokenToSymbol = array( - 0, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 56, 166, 168, 167, 55, 168, 168, - 161, 162, 53, 51, 8, 52, 48, 54, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 31, 159, - 44, 16, 46, 30, 68, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 70, 168, 160, 36, 168, 165, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 163, 35, 164, 58, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 168, 1, 2, 3, 4, + 0, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 56, 170, 172, 171, 55, 172, 172, + 165, 166, 53, 51, 8, 52, 48, 54, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 31, 163, + 44, 16, 46, 30, 68, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 70, 172, 164, 36, 172, 169, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 167, 35, 168, 58, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 1, 2, 3, 4, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 32, 33, 34, 37, 38, 39, 40, @@ -382,546 +390,543 @@ class Php8 extends \PhpParser\ParserAbstract 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, - 153, 154, 155, 156, 157, 158 + 153, 154, 155, 156, 157, 158, 159, 160, 161, 162 ); protected array $action = array( - 133, 134, 135, 586, 136, 137, 0, 755, 756, 757, - 138, 38, 329,-32766,-32766,-32766,-32766,-32766,-32766, 841, - 830,-32767,-32767,-32767,-32767, 102, 103, 104, 1116, 1117, - 1118, 1115, 1114, 1113, 1119, 749, 748,-32766, 1031,-32766, + 126, 127, 128, 570, 129, 130, 955, 765, 766, 767, + 131, 38, 849, -85,-32766, 1376,-32766,-32766,-32766, 0, + 840, 1134, 1135, 1136, 1130, 1129, 1128, 1137, 1131, 1132, + 1133,-32766,-32766,-32766, 851, 759, 758,-32766,-32766,-32766, -32766,-32766,-32766,-32766,-32766,-32766,-32767,-32767,-32767,-32767, - -32767, 1252,-32766,-32766, 1331, 758, 1116, 1117, 1118, 1115, - 1114, 1113, 1119, 461, 462, 463, 2, 994, 1315, 265, - 139, 406, 762, 763, 764, 765, 470, 471, 431, 839, - 610, -16, 1350, 23, 293, 819, 766, 767, 768, 769, - 770, 771, 772, 773, 774, 775, 795, 587, 796, 797, - 798, 799, 787, 788, 347, 348, 790, 791, 776, 777, - 778, 780, 781, 782, 358, 822, 823, 824, 825, 826, - 588, 783, 784, 589, 590, 945, 807, 805, 806, 818, - 802, 803, 839, 830, 591, 592, 801, 593, 594, 595, - 596, 597, 598, -328, 36, 250, 35, -194, 804, 599, - 600, -193, 140, -85, 133, 134, 135, 586, 136, 137, - 1064, 755, 756, 757, 138, 38, 129, -110, -110, -590, - -32766, -590, -110,-32766,-32766,-32766, 241, 840, -110, 145, - 963, 964,-32766,-32766,-32766, 965, -599,-32766, 485, 749, - 748, 959, 1040, -599,-32766, 995,-32766,-32766,-32766,-32766, - -32766,-32766,-32766,-32766,-32766,-32766,-32766,-32766, 301, 758, - 835, 75,-32766,-32766,-32766, 292, 142, 328, 242, -85, - 328, 384, 383, 265, 139, 406, 762, 763, 764, 765, - 82, 425, 431,-32766, 328,-32766,-32766,-32766,-32766, 819, - 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, - 795, 587, 796, 797, 798, 799, 787, 788, 347, 348, - 790, 791, 776, 777, 778, 780, 781, 782, 358, 822, - 823, 824, 825, 826, 588, 783, 784, 589, 590, 253, - 807, 805, 806, 818, 802, 803, 836, 729, 591, 592, - 801, 593, 594, 595, 596, 597, 598, -328, 83, 84, - 85, -194, 804, 599, 600, -193, 149, 779, 750, 751, - 752, 753, 754, 151, 755, 756, 757, 792, 793, 37, - 486, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, - 105, 106, 107, 108, 109, -599, 275, -599,-32766,-32766, - -32766,-32766,-32766,-32766, 312, 1093, 127, 314, 110, 741, - 1335, 21, 758,-32766,-32766,-32766, -272, 1334,-32766,-32766, - 1092,-32766,-32766,-32766,-32766,-32766, 759, 760, 761, 762, - 763, 764, 765, 1108,-32766, 828,-32766,-32766, -550, 560, - 1040, 1273, 819, 766, 767, 768, 769, 770, 771, 772, - 773, 774, 775, 795, 817, 796, 797, 798, 799, 787, - 788, 789, 816, 790, 791, 776, 777, 778, 780, 781, - 782, 821, 822, 823, 824, 825, 826, 827, 783, 784, - 785, 786, 1037, 807, 805, 806, 818, 802, 803, 749, - 748, 794, 800, 801, 808, 809, 811, 810, 812, 813, - 1285, 325, -550, -550, 1040, 804, 815, 814, 50, 51, - 52, 516, 53, 54, 866, 341, 867, -550, 55, 56, - -110, 57, 839, 924, -367, -110, -367, -110, 293, -556, - 152, -550, 308, 103, 104, -110, -110, -110, -110, -110, - -110, -110, -110, 105, 106, 107, 108, 109, 947, 275, - 342, 924, 1252, 719,-32766,-32766,-32766, 58, 59, -549, - 372, 110, 60, 838, 61, 247, 248, 62, 63, 64, - 65, 66, 67, 68, 69,-32766, 28, 267, 70, 446, - 517, 720, 376, -342, 1279, 1280, 518, 359, 839, -548, - 391, -546, 1277, 42, 25, 519, 947, 520, 616, 521, - 924, 522, 442, 141, 523, 524, 914, 328, 443, 44, - 45, 447, 379, 378,-32766, 46, 525, 1027, 1026, 1025, - 1028, 370, 340, -549, -549, 444, 1360, 431, 1238, 1361, - 527, 528, 529, 839, 914, 364, 1040, 445, -549,-32766, - -32766,-32766, 531, 532, 845, 1266, 1267, 1268, 1269, 1263, - 1264, 300, -549, -548, -548, -546, -546, 1270, 1265, 292, - -32766, 1247, 1246, 1248, 301, 749, 748, 71, -548, -78, - -546, 323, 324, 328, -153, -153, -153, 393,-32766, 7, - -555, 926, -548, 914, -546, 714, 660, 26,-32766, -153, - 832, -153, 866, -153, 867, -153, 382, 383, 28, 268, - 1040, 154, 1247, 1246, 1248, 377, 425, 155, -596, 926, - 839, 1094, 75, 714, 1277, -596, 963, 964, 328, -547, - 156, 526, 158, 292, 1245, 33, 900, 959, -110, -110, - -110, 32, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 679, 680, -58, 301, -57, - 1238, 124, 924, 749, 748, 1252, 150, 409, 926, 125, - 1243, 924, 714, -153, 531, 532, 834, 1266, 1267, 1268, - 1269, 1263, 1264, 716, 1154, 1156, -87, -4, 924, 1270, - 1265, 1039, 721, -547, -547, -546, 130, 749, 748, 73, - -32766, 724, 131, -552, 324, 328, 1245, 144, -547, 1247, - 1246, 1248, 159,-32766,-32766,-32766, 1037,-32766, 160,-32766, - -554,-32766, -547, 161,-32766, 380, 381, 924, 162,-32766, - -32766,-32766, 163, 49,-32766,-32766,-32766, -84, 1040, -78, - 1245,-32766, 422, 48, 924, 914, 839,-32766,-32766,-32766, - -32766,-32766, -73,-32766, 914,-32766, -72, 731,-32766, -546, - -546, 283, -71,-32766,-32766,-32766, -70, -552, -552,-32766, - -32766, 914, 385, 386, -546,-32766, 422, -596, -69, -596, - 74, -110, -110, -68,-32766, -50, -110, -67, -546, 651, - 652, -66, -110, 377, -65, 438, -552, 304, 305, -46, - 299,-32766, -18, 148, 963, 964, 274, 302, 303, 526, - 914, 284, 375, 730, 530, 959, -110, -110, -110, 132, - 980, 733, 301, 923, 714, 75, 128, 914,-32766, 926, - 147, 328, -302, 714, 1245, -298, 126, 10, 1063, 281, - 282,-32766,-32766,-32766, 285,-32766, 926,-32766, 286,-32766, - 714, -4,-32766, 334, 288, 275, 289,-32766,-32766,-32766, - 294, 295,-32766,-32766,-32766, 924, 941, 287, 1245,-32766, - 422, 110, 689, 146, 830,-32766,-32766,-32766,-32766,-32766, - 565,-32766, 666,-32766, 1362, 926,-32766, 705, 839, 714, - 1123,-32766,-32766,-32766,-32766,-32766, 667,-32766,-32766, 309, - 1245, 661, 926,-32766, 422, 924, 714,-32766,-32766,-32766, - 682,-32766,-32766,-32766, 707,-32766, 306, 960,-32766, 313, - -32766, 683, 491,-32766,-32766,-32766,-32766, 20, 467,-32766, - -32766, 496, 1245, 578, 571,-32766, 422, 301, 649,-32766, - -32766,-32766, -511,-32766,-32766,-32766, 0,-32766, 914, 0, - -32766, 0, 0, 1037, 0,-32766,-32766,-32766, 1284, 307, - 1286,-32766,-32766, 0, -250, -250, -250,-32766, 422, 943, - 377, 0, 0, 28, 267, 1040,-32766, 0, -501, 0, - 614, 963, 964, 0, 8, 839, 526, 24, 914, 1277, - 374, 900, 959, -110, -110, -110, 1274, 838, 283, 40, - -584, 0, 41, 738, -249, -249, -249, 739, 28, 268, - 377, 850, 287, 858, 905, 1004, 981, 988, 978, 989, - 839, 963, 964, 926, 1277, 1238, 526, 714, -250, 903, - 976, 900, 959, -110, -110, -110, 1097, 1100, 1101, 1098, - 532, 1099, 1266, 1267, 1268, 1269, 1263, 1264, 1105, -583, - 1301, 1319, 1353, 654, 1270, 1265, -582, -556, -555, -554, - 1238, -553, 694, 926, 73, 34, -495, 714, -249, 324, - 328, 1, 29, 30, 39, 532, 43, 1266, 1267, 1268, - 1269, 1263, 1264, 47, 72, 76, 77, 78, 79, 1270, - 1265, 80, 81, 143,-32766, 153, 157, 245, 695, 73, - 1245, 330, 359, 360, 324, 328, 361,-32766,-32766,-32766, - 362,-32766, 363,-32766, 364,-32766, 365, 366,-32766, 696, - 697, 367, 368,-32766,-32766,-32766, 369, 371, 439,-32766, - -32766, 559, 322, -275, -273,-32766, 422, 1247, 1246, 1248, - -272, 13, 14, 283,-32766, 15, 16, 18, 408, 487, - 488, 495, 498, 499, 500, 501, 505, 506, 507, 514, - 576, 700, 1256, 1194, 1275, 1066, 1065, 1046, 1233, 1042, - -277, -102, 12, 17, 27, 298, 407, 607, 611, 640, - 706, 1198, 0, 1251, 1195, 1332, 0, 373, 715, 718, - 722, 723, 725, 726, 727, 728, 732, 717, 0, 735, - 901, 1357, 1359, 861, 860, 869, 953, 996, 868, 1358, - 952, 950, 951, 954, 1226, 934, 944, 932, 986, 987, - 638, 1356, 1313, 1302, 1320, 1329, 0, 1211, 0, 1278, - 0, 328 + -32767, 1005,-32766, 1045, -570, 768, 1134, 1135, 1136, 1130, + 1129, 1128, 1137, 1131, 1132, 1133, 388, 387, 842, 263, + 132, 389, 772, 773, 774, 775, 430, 845, 431, -85, + 2, 36, 246, 47, 291, 829, 776, 777, 778, 779, + 780, 781, 782, 783, 784, 785, 805, 571, 806, 807, + 808, 809, 797, 798, 344, 345, 800, 801, 786, 787, + 788, 790, 791, 792, 359, 832, 833, 834, 835, 836, + 572, -570, -570, -332, 793, 794, 573, 574, 236, 817, + 815, 816, 828, 812, 813, 26, -194, 575, 576, 811, + 577, 578, 579, 580, 323, 581, 582, 876, 844, 877, + 297, 298, 814, 583, 584, 722, 133, 846, 126, 127, + 128, 570, 129, 130, 1078, 765, 766, 767, 131, 38, + -32766, 35, 735, 1038, 1037, 1036, 1042, 1039, 1040, 1041, + -32766,-32766,-32766, 1006, 104, 105, 106, 107, 108, -372, + 275, -372,-32766, 759, 758, 1054, 850,-32766,-32766,-32766, + 848,-32766, 109,-32766,-32766,-32766,-32766,-32766,-32766,-32766, + 134, 476, 477, 768,-32766,-32766,-32766, 1054,-32766, 290, + -32766,-32766,-32766,-32766,-32766, 616, 143, 263, 132, 389, + 772, 773, 774, 775, 249,-32766, 431,-32766,-32766,-32766, + -32766, 290, 307, 829, 776, 777, 778, 779, 780, 781, + 782, 783, 784, 785, 805, 571, 806, 807, 808, 809, + 797, 798, 344, 345, 800, 801, 786, 787, 788, 790, + 791, 792, 359, 832, 833, 834, 835, 836, 572, 958, + -273, -332, 793, 794, 573, 574, 840, 817, 815, 816, + 828, 812, 813, 1301, -194, 575, 576, 811, 577, 578, + 579, 580, 566, 581, 582, 1108, 82, 83, 84, 748, + 814, 583, 584, 309, 146, 789, 760, 761, 762, 763, + 764, 235, 765, 766, 767, 802, 803, 37, 957, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, + 106, 107, 108, 157, 275,-32766,-32766,-32766,-32767,-32767, + -32767,-32767, 101, 102, 103,-32766, 109, 1313, 622, 318, + 768,-32766,-32766,-32766, 849, 1361,-32766, 1107,-32766,-32766, + -32766, 340, 1360, 1357, 769, 770, 771, 772, 773, 774, + 775, 341,-32766, 838,-32766,-32766, 1386, 374, 1281, 1387, + 829, 776, 777, 778, 779, 780, 781, 782, 783, 784, + 785, 805, 827, 806, 807, 808, 809, 797, 798, 799, + 826, 800, 801, 786, 787, 788, 790, 791, 792, 831, + 832, 833, 834, 835, 836, 837, 1077, 431, -567, 793, + 794, 795, 796, 148, 817, 815, 816, 828, 812, 813, + 380, -193, 804, 810, 811, 818, 819, 821, 820, 138, + 822, 823, 840, 321, 396, 285, 24, 814, 825, 824, + 49, 50, 51, 522, 52, 53, 398, -110, 7, 849, + 54, 55, -110, 56, -110,-32766,-32766,-32766, 1342, 303, + 125, 1123, -110, -110, -110, -110, -110, -110, -110, -110, + -110, -110, -110, 161, 750, -567, -567, 291, 974, 975, + -32766,-32766,-32766, 976, 448, 285, 1276, 1275, 1277, 57, + 58, -567,-32766,-32766, 59, 1109, 60, 243, 244, 61, + 62, 63, 64, 65, 66, 67, 68,-32766, 28, 265, + 69, 446, 523, 490, -346, 449, 1307, 1308, 524, 139, + 849, 1051, 450, 321, 1305, 42, 20, 525, 934, 526, + 934, 527, 74, 528, -568, 698, 529, 530, 321, 386, + 387, 44, 45, 452, 383, 382, 1054, 46, 531, 430, + 974, 975, 451, 372, 339, 976, 1281, 855, 725, 934, + 1267, 759, 758,-32766, 970, 533, 534, 535, 149, 934, + 281, 699, -78, -566, 1274, 102, 103, 537, 538, -193, + 1293, 1294, 1295, 1296, 1298, 1290, 1291, 295, 1054, 726, + 466, 467, 468, 1297, 1292, 700, 701, 1276, 1275, 1277, + 296, -568, -568, 70, -153, -153, -153, 316, 317, 321, + 1272, 924, 290, 924, 1276, 1275, 1277, -568, 1051, -153, + 281, -153, 1150, -153, 81, -153, 740, 151, 321, -574, + 152, 759, 758,-32766, 1053, 381, 876, 849, 877, 153, + -566, -566, 924, 1054, 1051, 155, 974, 975, -606, 491, + -606, 532, 924, 1276, 1275, 1277, -566, 33, 1054, 910, + 970, -110, -110, -110, 28, 266, -58, 281, -573, 1054, + -32766,-32766, -110, -110, 665, 21, 849, -110, -57, -564, + 1305, 684, 685, 147, 413, 123, -110, 384, 385, 124, + 936, 135, 936, 136, 720,-32766, 720, -153, 142, 48, + 32, 110, 111, 112, 113, 114, 115, 116, 117, 118, + 119, 120, 121, 122, 390, 391, 1267, 296, 759, 758, + 74, 936, 156, 934, 158, 720, 321, -4, 934, 159, + 934, 936, 160, 537, 538, 720, 1293, 1294, 1295, 1296, + 1298, 1290, 1291, 1183, 1185, 934, -564, -564, -565, 1297, + 1292, 759, 758, 727, -564,-32766, 656, 657, -306, 72, + 730, 1274, -564, -87, 317, 321, 299, 300,-32766,-32766, + -32766, -84,-32766, -78,-32766, 737,-32766, -73, -72,-32766, + -71, -70, 379, -69,-32766,-32766,-32766, -68,-32766, -67, + -32766,-32766, -66, -65, 1274, -46,-32766, 427, 28, 265, + -18,-32766,-32766,-32766, 140,-32766, 924,-32766,-32766,-32766, + 849, 924,-32766, 924, 1305, -565, -565,-32766,-32766,-32766, + 274, -564, -564,-32766,-32766, 282, 736, 739, 924,-32766, + 427, -565, 933, 381, 145, 443, 286, -564, 951, 73, + 294,-32766, -302, -572, 974, 975, 279, 280, 283, 532, + 1267, 28, 266, 284, 329, 275, 109, 536, 970, -110, + -110, -110, 287, 849, 292, 293, 840, 1305, 538, 694, + 1293, 1294, 1295, 1296, 1298, 1290, 1291, 709, 144, 587, + 711, 11, 10, 1297, 1292, 991, 849, 1141, 473, 720, + 936,-32766, 936, 72, 720, -4, 720, 1388, 317, 321, + -50, 970, 672, 1267, 687, 666, 501, 936, 971, 301, + 308, 720, 671, 1312, 302, 1314,-32766, 688, 953, -530, + -520, 538, 40, 1293, 1294, 1295, 1296, 1298, 1290, 1291, + 848, 41, 8, 137, 654, 27, 1297, 1292, 304, 34, + 593, 620, 296,-32766, 0, 0, 72, 0, 0, 1274, + 0, 317, 321, 0, 0, 0,-32766,-32766,-32766, -276, + -32766, 0,-32766, 0,-32766, 0, 0,-32766, 0, 0, + 0, 0,-32766,-32766,-32766, 934,-32766, 0,-32766,-32766, + 0, 0, 1274, 378,-32766, 427, 745, -600, 412,-32766, + -32766,-32766, 746,-32766, 868,-32766,-32766,-32766, 934, 915, + -32766, 1015, 992, 999, 989,-32766,-32766,-32766, 1000,-32766, + 913,-32766,-32766, 987, 1112, 1274, 1115,-32766, 427, 1116, + 1113, 1152,-32766,-32766,-32766, 1114,-32766, 1120,-32766,-32766, + -32766, 1302, 860,-32766, 1329, 1346, 1379, 496,-32766,-32766, + -32766, 659,-32766, -599,-32766,-32766, -598, -574, 1274, 600, + -32766, 427, -573, -572, -571,-32766,-32766,-32766, 924,-32766, + -514,-32766,-32766,-32766, 1, 29,-32766, -274, 30, 39, + 43,-32766,-32766,-32766, -251, -251, -251,-32766,-32766, 71, + 381, 924, 75,-32766, 427, 76, 77, 78, 1281, 79, + 80, 974, 975, 141, 150,-32766, 532, -250, -250, -250, + -273, 154, 241, 381, 910, 970, -110, -110, -110, 325, + 360, 361, 362, 363, 974, 975, 364, 365, -16, 532, + 366, 367, 368, 369, 370, 373, 444, 910, 970, -110, + -110, -110,-32766, 13, 565, 371, 1306, 936, 1274, 14, + 416, 720, -251, 15, 16,-32766,-32766,-32766, 18,-32766, + 354,-32766, 411,-32766, 492, 493,-32766, 500, 503, 504, + 936,-32766,-32766,-32766, 720, -250, 505,-32766,-32766, 849, + 506, 510, 511,-32766, 427, 512, 519, 598, 704, 1080, + 1223, 1303, 1079, 1060, 1262,-32766, 1056, -278, -102, 12, + 17, 22, 312, 410, 612, 617, 645, 710, 1227, 1280, + 1224, 1358, 0, 315, -110, -110, 375, 721, 724, -110, + 728, 729, 731, 732, 733, 734, 738, 750, -110, 723, + 751, 0, 742, 911, 1383, 1385, 0,-32766, 871, 870, + 964, 1007, 1384, 963, 961, 962, 965, 1255, 944, 954, + 942, 1151, 1147, 1101, 997, 998, 643, 1382, 1340, 296, + 1355, 0, 74, 1240, 321, 0, 0, 0, 321 ); protected array $actionCheck = array( - 2, 3, 4, 5, 6, 7, 0, 9, 10, 11, - 12, 13, 70, 9, 10, 11, 9, 10, 11, 1, - 80, 44, 45, 46, 47, 48, 49, 50, 116, 117, - 118, 119, 120, 121, 122, 37, 38, 30, 1, 32, + 2, 3, 4, 5, 6, 7, 1, 9, 10, 11, + 12, 13, 82, 31, 116, 85, 9, 10, 11, 0, + 80, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125, 9, 10, 11, 1, 37, 38, 30, 140, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 1, 9, 10, 1, 57, 116, 117, 118, 119, - 120, 121, 122, 129, 130, 131, 8, 31, 1, 71, - 72, 73, 74, 75, 76, 77, 134, 135, 80, 82, - 1, 31, 85, 8, 30, 87, 88, 89, 90, 91, + 43, 31, 30, 1, 70, 57, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 106, 107, 80, 71, + 72, 73, 74, 75, 76, 77, 116, 80, 80, 97, + 8, 151, 152, 70, 30, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 1, 128, 129, 130, 131, - 132, 133, 82, 80, 136, 137, 138, 139, 140, 141, - 142, 143, 144, 8, 147, 148, 8, 8, 150, 151, - 152, 8, 154, 31, 2, 3, 4, 5, 6, 7, - 162, 9, 10, 11, 12, 13, 8, 117, 118, 160, - 116, 162, 122, 9, 10, 11, 97, 159, 128, 8, - 117, 118, 9, 10, 11, 122, 1, 137, 31, 37, - 38, 128, 138, 8, 30, 159, 32, 33, 34, 35, - 36, 37, 38, 30, 9, 32, 33, 34, 158, 57, - 80, 161, 9, 10, 11, 161, 163, 167, 14, 97, - 167, 106, 107, 71, 72, 73, 74, 75, 76, 77, - 163, 116, 80, 30, 167, 32, 33, 34, 35, 87, - 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 8, - 128, 129, 130, 131, 132, 133, 156, 163, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 162, 9, 10, - 11, 162, 150, 151, 152, 162, 154, 2, 3, 4, - 5, 6, 7, 14, 9, 10, 11, 12, 13, 30, - 163, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 160, 57, 162, 9, 10, - 11, 9, 10, 11, 8, 159, 14, 8, 69, 163, - 1, 101, 57, 9, 10, 11, 162, 8, 116, 30, - 1, 32, 33, 34, 35, 36, 71, 72, 73, 74, - 75, 76, 77, 123, 30, 80, 32, 33, 70, 85, - 138, 1, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, - 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 116, 128, 129, 130, 131, 132, 133, 37, - 38, 136, 137, 138, 139, 140, 141, 142, 143, 144, - 146, 8, 134, 135, 138, 150, 151, 152, 2, 3, - 4, 5, 6, 7, 106, 8, 108, 149, 12, 13, - 101, 15, 82, 1, 106, 106, 108, 108, 30, 161, - 14, 163, 113, 49, 50, 116, 117, 118, 119, 120, - 121, 122, 123, 51, 52, 53, 54, 55, 122, 57, - 8, 1, 1, 31, 9, 10, 11, 51, 52, 70, - 8, 69, 56, 155, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 30, 70, 71, 72, 73, - 74, 31, 8, 164, 78, 79, 80, 161, 82, 70, - 8, 70, 86, 87, 88, 89, 122, 91, 52, 93, - 1, 95, 8, 163, 98, 99, 84, 167, 8, 103, - 104, 105, 106, 107, 116, 109, 110, 119, 120, 121, - 122, 115, 116, 134, 135, 8, 80, 80, 122, 83, - 124, 125, 126, 82, 84, 161, 138, 8, 149, 116, - 51, 52, 136, 137, 8, 139, 140, 141, 142, 143, - 144, 145, 163, 134, 135, 134, 135, 151, 152, 161, - 137, 155, 156, 157, 158, 37, 38, 161, 149, 16, - 149, 165, 166, 167, 75, 76, 77, 106, 116, 108, - 161, 159, 163, 84, 163, 163, 75, 76, 137, 90, - 80, 92, 106, 94, 108, 96, 106, 107, 70, 71, - 138, 14, 155, 156, 157, 106, 116, 14, 1, 159, - 82, 164, 161, 163, 86, 8, 117, 118, 167, 70, - 14, 122, 14, 161, 80, 14, 127, 128, 129, 130, - 131, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 75, 76, 16, 158, 16, - 122, 16, 1, 37, 38, 1, 101, 102, 159, 16, - 116, 1, 163, 164, 136, 137, 156, 139, 140, 141, - 142, 143, 144, 163, 59, 60, 31, 0, 1, 151, - 152, 137, 31, 134, 135, 70, 16, 37, 38, 161, - 74, 31, 16, 70, 166, 167, 80, 16, 149, 155, - 156, 157, 16, 87, 88, 89, 116, 91, 16, 93, - 161, 95, 163, 16, 98, 106, 107, 1, 16, 103, - 104, 105, 16, 70, 74, 109, 110, 31, 138, 31, - 80, 115, 116, 70, 1, 84, 82, 87, 88, 89, - 124, 91, 31, 93, 84, 95, 31, 31, 98, 134, - 135, 161, 31, 103, 104, 105, 31, 134, 135, 109, - 110, 84, 106, 107, 149, 115, 116, 160, 31, 162, - 154, 117, 118, 31, 124, 31, 122, 31, 163, 111, - 112, 31, 128, 106, 31, 108, 163, 134, 135, 31, - 113, 137, 31, 31, 117, 118, 31, 134, 135, 122, - 84, 31, 149, 31, 127, 128, 129, 130, 131, 31, - 159, 31, 158, 31, 163, 161, 163, 84, 74, 159, - 31, 167, 35, 163, 80, 35, 163, 150, 1, 35, - 35, 87, 88, 89, 35, 91, 159, 93, 35, 95, - 163, 164, 98, 35, 37, 57, 37, 103, 104, 105, - 37, 37, 74, 109, 110, 1, 38, 30, 80, 115, - 116, 69, 77, 70, 80, 87, 88, 89, 124, 91, - 89, 93, 96, 95, 83, 159, 98, 80, 82, 163, - 82, 103, 104, 105, 74, 85, 100, 109, 110, 114, - 80, 90, 159, 115, 116, 1, 163, 87, 88, 89, - 94, 91, 124, 93, 92, 95, 132, 128, 98, 132, - 137, 100, 102, 103, 104, 105, 74, 97, 97, 109, - 110, 97, 80, 81, 153, 115, 116, 158, 113, 87, - 88, 89, 149, 91, 124, 93, -1, 95, 84, -1, - 98, -1, -1, 116, -1, 103, 104, 105, 146, 133, - 146, 109, 110, -1, 100, 101, 102, 115, 116, 154, - 106, -1, -1, 70, 71, 138, 124, -1, 149, -1, - 153, 117, 118, -1, 149, 82, 122, 149, 84, 86, - 149, 127, 128, 129, 130, 131, 160, 155, 161, 159, - 161, -1, 159, 159, 100, 101, 102, 159, 70, 71, - 106, 160, 30, 159, 159, 159, 159, 159, 159, 159, - 82, 117, 118, 159, 86, 122, 122, 163, 164, 159, - 159, 127, 128, 129, 130, 131, 159, 159, 159, 159, - 137, 159, 139, 140, 141, 142, 143, 144, 159, 161, - 160, 160, 160, 160, 151, 152, 161, 161, 161, 161, - 122, 161, 80, 159, 161, 163, 161, 163, 164, 166, - 167, 161, 161, 161, 161, 137, 161, 139, 140, 141, - 142, 143, 144, 161, 161, 161, 161, 161, 161, 151, - 152, 161, 161, 161, 74, 161, 161, 161, 116, 161, - 80, 161, 161, 161, 166, 167, 161, 87, 88, 89, - 161, 91, 161, 93, 161, 95, 161, 161, 98, 137, - 138, 161, 161, 103, 104, 105, 161, 161, 161, 109, - 110, 161, 163, 162, 162, 115, 116, 155, 156, 157, - 162, 162, 162, 161, 124, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, -1, 162, 162, 162, -1, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, -1, 164, - 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, - 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, - 164, 164, 164, 164, 164, 164, -1, 165, -1, 166, - -1, 167 + 122, 137, 138, 8, 126, 127, 128, 129, 14, 131, + 132, 133, 134, 135, 136, 8, 8, 139, 140, 141, + 142, 143, 144, 145, 70, 147, 148, 106, 160, 108, + 137, 138, 154, 155, 156, 167, 158, 160, 2, 3, + 4, 5, 6, 7, 166, 9, 10, 11, 12, 13, + 116, 8, 167, 119, 120, 121, 122, 123, 124, 125, + 9, 10, 11, 163, 51, 52, 53, 54, 55, 106, + 57, 108, 116, 37, 38, 141, 163, 9, 10, 11, + 159, 30, 69, 32, 33, 34, 35, 36, 37, 38, + 8, 137, 138, 57, 9, 10, 11, 141, 30, 165, + 32, 33, 34, 35, 36, 1, 8, 71, 72, 73, + 74, 75, 76, 77, 8, 30, 80, 32, 33, 34, + 35, 165, 8, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 122, 73, + 166, 166, 126, 127, 128, 129, 80, 131, 132, 133, + 134, 135, 136, 1, 166, 139, 140, 141, 142, 143, + 144, 145, 85, 147, 148, 163, 9, 10, 11, 167, + 154, 155, 156, 8, 158, 2, 3, 4, 5, 6, + 7, 97, 9, 10, 11, 12, 13, 30, 122, 32, + 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, + 53, 54, 55, 16, 57, 9, 10, 11, 44, 45, + 46, 47, 48, 49, 50, 9, 69, 150, 52, 8, + 57, 9, 10, 11, 82, 1, 30, 1, 32, 33, + 34, 8, 8, 1, 71, 72, 73, 74, 75, 76, + 77, 8, 30, 80, 32, 33, 80, 8, 1, 83, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, + 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, + 117, 118, 119, 120, 121, 122, 1, 80, 70, 126, + 127, 128, 129, 14, 131, 132, 133, 134, 135, 136, + 8, 8, 139, 140, 141, 142, 143, 144, 145, 167, + 147, 148, 80, 171, 8, 30, 101, 154, 155, 156, + 2, 3, 4, 5, 6, 7, 106, 101, 108, 82, + 12, 13, 106, 15, 108, 9, 10, 11, 1, 113, + 14, 126, 116, 117, 118, 119, 120, 121, 122, 123, + 124, 125, 126, 14, 167, 137, 138, 30, 117, 118, + 9, 10, 11, 122, 8, 30, 159, 160, 161, 51, + 52, 153, 9, 10, 56, 168, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 68, 140, 70, 71, + 72, 73, 74, 31, 168, 8, 78, 79, 80, 167, + 82, 116, 8, 171, 86, 87, 88, 89, 1, 91, + 1, 93, 165, 95, 70, 80, 98, 99, 171, 106, + 107, 103, 104, 105, 106, 107, 141, 109, 110, 116, + 117, 118, 8, 115, 116, 122, 1, 8, 31, 1, + 122, 37, 38, 116, 131, 127, 128, 129, 14, 1, + 165, 116, 16, 70, 80, 49, 50, 139, 140, 166, + 142, 143, 144, 145, 146, 147, 148, 149, 141, 31, + 132, 133, 134, 155, 156, 140, 141, 159, 160, 161, + 162, 137, 138, 165, 75, 76, 77, 169, 170, 171, + 116, 84, 165, 84, 159, 160, 161, 153, 116, 90, + 165, 92, 163, 94, 167, 96, 167, 14, 171, 165, + 14, 37, 38, 116, 140, 106, 106, 82, 108, 14, + 137, 138, 84, 141, 116, 14, 117, 118, 164, 167, + 166, 122, 84, 159, 160, 161, 153, 14, 141, 130, + 131, 132, 133, 134, 70, 71, 16, 165, 165, 141, + 51, 52, 117, 118, 75, 76, 82, 122, 16, 70, + 86, 75, 76, 101, 102, 16, 131, 106, 107, 16, + 163, 16, 163, 16, 167, 140, 167, 168, 16, 70, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 106, 107, 122, 162, 37, 38, + 165, 163, 16, 1, 16, 167, 171, 0, 1, 16, + 1, 163, 16, 139, 140, 167, 142, 143, 144, 145, + 146, 147, 148, 59, 60, 1, 137, 138, 70, 155, + 156, 37, 38, 31, 70, 74, 111, 112, 35, 165, + 31, 80, 153, 31, 170, 171, 137, 138, 87, 88, + 89, 31, 91, 31, 93, 31, 95, 31, 31, 98, + 31, 31, 153, 31, 103, 104, 105, 31, 74, 31, + 109, 110, 31, 31, 80, 31, 115, 116, 70, 71, + 31, 87, 88, 89, 31, 91, 84, 93, 127, 95, + 82, 84, 98, 84, 86, 137, 138, 103, 104, 105, + 31, 137, 138, 109, 110, 31, 31, 31, 84, 115, + 116, 153, 31, 106, 31, 108, 37, 153, 38, 158, + 113, 127, 35, 165, 117, 118, 35, 35, 35, 122, + 122, 70, 71, 35, 35, 57, 69, 130, 131, 132, + 133, 134, 37, 82, 37, 37, 80, 86, 140, 77, + 142, 143, 144, 145, 146, 147, 148, 80, 70, 89, + 92, 154, 97, 155, 156, 163, 82, 82, 97, 167, + 163, 85, 163, 165, 167, 168, 167, 83, 170, 171, + 31, 131, 100, 122, 94, 90, 97, 163, 131, 135, + 135, 167, 96, 150, 136, 150, 140, 100, 158, 153, + 153, 140, 163, 142, 143, 144, 145, 146, 147, 148, + 159, 163, 153, 31, 113, 153, 155, 156, 114, 167, + 157, 157, 162, 74, -1, -1, 165, -1, -1, 80, + -1, 170, 171, -1, -1, -1, 87, 88, 89, 166, + 91, -1, 93, -1, 95, -1, -1, 98, -1, -1, + -1, -1, 103, 104, 105, 1, 74, -1, 109, 110, + -1, -1, 80, 153, 115, 116, 163, 165, 168, 87, + 88, 89, 163, 91, 163, 93, 127, 95, 1, 163, + 98, 163, 163, 163, 163, 103, 104, 105, 163, 74, + 163, 109, 110, 163, 163, 80, 163, 115, 116, 163, + 163, 163, 87, 88, 89, 163, 91, 163, 93, 127, + 95, 164, 164, 98, 164, 164, 164, 102, 103, 104, + 105, 164, 74, 165, 109, 110, 165, 165, 80, 81, + 115, 116, 165, 165, 165, 87, 88, 89, 84, 91, + 165, 93, 127, 95, 165, 165, 98, 166, 165, 165, + 165, 103, 104, 105, 100, 101, 102, 109, 110, 165, + 106, 84, 165, 115, 116, 165, 165, 165, 1, 165, + 165, 117, 118, 165, 165, 127, 122, 100, 101, 102, + 166, 165, 165, 106, 130, 131, 132, 133, 134, 165, + 165, 165, 165, 165, 117, 118, 165, 165, 31, 122, + 165, 165, 165, 165, 165, 165, 165, 130, 131, 132, + 133, 134, 74, 166, 165, 165, 170, 163, 80, 166, + 168, 167, 168, 166, 166, 87, 88, 89, 166, 91, + 166, 93, 166, 95, 166, 166, 98, 166, 166, 166, + 163, 103, 104, 105, 167, 168, 166, 109, 110, 82, + 166, 166, 166, 115, 116, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 127, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, -1, 167, 117, 118, 167, 167, 167, 122, + 167, 167, 167, 167, 167, 167, 167, 167, 131, 167, + 167, -1, 168, 168, 168, 168, -1, 140, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 162, + 168, -1, 165, 169, 171, -1, -1, -1, 171 ); protected array $actionBase = array( - 0, -2, 152, 549, 727, 904, 944, 1022, 390, 497, - 560, 922, 500, 710, 710, 766, 710, 472, 701, 847, - -60, 305, 305, 847, 305, 783, 783, 783, 666, 666, - 666, 666, 700, 700, 860, 860, 892, 828, 794, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, 1060, - 1060, 1060, 1060, 1060, 18, 36, 79, 661, 1053, 1059, - 1055, 1061, 1051, 1050, 1054, 1056, 1062, 1097, 1098, 839, - 1099, 1100, 1096, 1101, 1057, 933, 1052, 1058, 289, 289, - 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 289, 289, 289, 289, 289, 195, 342, 43, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 495, 495, - 495, 578, 578, 354, 173, 978, 943, 978, 978, 978, - 978, 978, 978, 978, 978, 203, 665, 339, 164, 164, - 7, 7, 7, 7, 7, 50, 369, 704, 704, -23, - -23, -23, -23, 448, 877, 501, 260, 368, 434, 54, - 540, 640, 640, 316, 316, 512, 512, 316, 316, 316, - 442, 442, 252, 252, 252, 252, 318, 469, 599, 358, - 304, 823, 53, 53, 53, 53, 823, 823, 823, 823, - 854, 1103, 823, 823, 823, 439, 471, 471, 703, 539, - 539, 471, 536, -3, -3, 536, 63, -3, 67, 496, - 473, 829, 115, 9, 473, 673, 713, 657, 185, 882, - 659, 882, 1049, 376, 850, 850, 424, 808, 761, 929, - 1074, 1063, 836, 1094, 861, 1095, -66, -58, 748, 1048, - 1048, 1048, 1048, 1048, 1048, 1048, 1048, 1048, 1048, 1048, - 1104, 402, 1049, 130, 1104, 1104, 1104, 402, 402, 402, - 402, 402, 402, 402, 402, 402, 402, 718, 130, 561, - 620, 130, 858, 402, 18, 869, 18, 18, 18, 18, - 18, 18, 18, 18, 18, 18, 811, 157, 18, 36, - 124, 124, 196, 37, 124, 124, 124, 124, 18, 18, - 18, 18, 659, 838, 821, 706, 867, 143, 838, 838, - 838, 122, 135, 204, 139, 837, 840, 521, 834, 834, - 848, 950, 834, 846, 834, 848, 962, 834, 834, 950, - 950, 819, 950, 158, 544, 457, 524, 550, 950, 346, - 834, 834, 834, 834, 827, 950, 567, 834, 271, 171, - 834, 834, 827, 824, 820, 58, 866, 950, 950, 950, - 827, 502, 866, 866, 866, 884, 888, 865, 815, 443, - 349, 586, 138, 868, 815, 815, 834, 532, 865, 815, - 865, 815, 855, 815, 815, 815, 865, 815, 846, 492, - 815, 736, 579, 75, 815, 6, 963, 964, 695, 965, - 953, 966, 1007, 967, 970, 1065, 945, 976, 955, 971, - 1010, 952, 951, 832, 685, 693, 875, 833, 940, 842, - 842, 842, 936, 937, 842, 842, 842, 842, 842, 842, - 842, 842, 685, 876, 881, 831, 982, 720, 726, 1038, - 852, 1076, 1102, 981, 1040, 972, 880, 731, 1025, 985, - 1075, 1009, 989, 991, 1026, 1041, 894, 1042, 1077, 843, - 1078, 1079, 891, 995, 1066, 842, 963, 970, 746, 955, - 971, 952, 951, 803, 800, 792, 796, 787, 775, 765, - 771, 812, 1043, 935, 879, 930, 993, 938, 685, 931, - 1019, 942, 1027, 1028, 1064, 871, 841, 932, 1080, 996, - 1000, 1001, 1067, 1044, 1068, 883, 1020, 1011, 1029, 874, - 1081, 1030, 1031, 1032, 1033, 1069, 1082, 1070, 928, 1071, - 895, 851, 1012, 826, 1083, 299, 849, 853, 864, 1006, - 466, 980, 1072, 1084, 1085, 1034, 1035, 1036, 1086, 1087, - 974, 896, 1023, 856, 1024, 1018, 897, 898, 637, 863, - 1045, 844, 845, 859, 643, 656, 1088, 1089, 1090, 975, - 822, 835, 899, 900, 1046, 857, 1047, 1091, 658, 910, - 742, 1092, 1039, 747, 752, 603, 683, 681, 756, 862, - 1073, 878, 825, 870, 1005, 752, 830, 911, 1093, 917, - 918, 919, 1037, 920, 0, 0, 0, 0, 0, 0, + 0, -2, 156, 559, 757, 1004, 1027, 485, 292, 357, + -60, -12, 588, 759, 759, 774, 759, 557, 752, 892, + 598, 598, 598, 827, 313, 313, 827, 313, 711, 711, + 711, 711, 744, 744, 965, 965, 998, 932, 899, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, + 1088, 1088, 33, 20, 224, 1080, 673, 1056, 1062, 1058, + 1063, 1054, 1053, 1057, 1059, 1064, 1109, 1110, 833, 1108, + 1112, 1060, 907, 1055, 1061, 888, 297, 297, 297, 297, + 297, 297, 297, 297, 297, 297, 297, 297, 297, 297, + 297, 297, 297, 297, 297, 297, 297, 297, 297, 297, + 297, 297, 356, 476, 513, 501, 501, 501, 501, 501, + 501, 501, 501, 501, 501, 501, 501, 501, 501, 501, + 501, 501, 501, 501, 501, 624, 624, 22, 22, 22, + 362, 811, 758, 811, 811, 811, 811, 811, 811, 811, + 811, 346, 205, 188, 714, 171, 171, 7, 7, 7, + 7, 7, 376, 1117, 54, 585, 585, 314, 314, 314, + 314, 365, 554, 83, 435, 397, 556, 477, 463, 532, + 532, 558, 558, 76, 76, 558, 558, 558, 133, 133, + 547, 547, 547, 547, 41, 217, 806, 382, 382, 382, + 382, 806, 806, 806, 806, 795, 996, 806, 806, 806, + 494, 533, 708, 649, 649, 560, -70, -70, 560, 800, + -70, 487, 975, 316, 982, -102, 807, -40, 514, -102, + 1000, 368, 639, 639, 659, 639, 639, 639, 801, 611, + 801, 1052, 836, 836, 794, 776, 894, 1082, 1065, 832, + 1106, 847, 1107, 1083, 489, 488, -16, 13, 74, 772, + 1051, 1051, 1051, 1051, 1051, 1051, 1051, 1051, 1051, 1051, + 1051, 1051, 1113, 554, 1052, -3, 1104, 1105, 1113, 1113, + 1113, 554, 554, 554, 554, 554, 554, 554, 554, 799, + 554, 554, 675, -3, 629, 636, -3, 849, 554, 797, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 512, 33, 33, 20, 5, 5, 33, 142, 52, 5, + 5, 5, 337, 5, 33, 33, 33, 611, 828, 813, + 638, -18, 814, 443, 828, 828, 828, 115, 114, 128, + 753, 837, 370, 816, 816, 835, 929, 929, 816, 834, + 816, 835, 816, 816, 929, 929, 810, 929, 202, 506, + 373, 442, 537, 929, 234, 816, 816, 816, 816, 805, + 929, 72, 544, 816, 226, 218, 816, 816, 805, 804, + 824, 808, 929, 929, 929, 805, 389, 808, 808, 808, + 853, 859, 851, 819, 361, 305, 579, 163, 830, 819, + 819, 816, 456, 851, 819, 851, 819, 790, 819, 819, + 819, 851, 819, 834, 383, 819, 736, 574, 127, 819, + 816, 19, 944, 947, 762, 950, 934, 951, 991, 952, + 954, 1070, 925, 967, 935, 955, 999, 933, 930, 831, + 699, 703, 809, 796, 919, 817, 817, 817, 912, 917, + 817, 817, 817, 817, 817, 817, 817, 817, 699, 897, + 860, 820, 976, 705, 707, 1041, 793, 1085, 1114, 975, + 944, 954, 770, 935, 955, 933, 930, 792, 791, 786, + 788, 782, 780, 777, 779, 803, 1043, 958, 789, 712, + 1012, 977, 1084, 1066, 978, 981, 1016, 1044, 861, 1045, + 1086, 838, 1087, 1090, 898, 985, 1071, 817, 911, 852, + 900, 982, 918, 699, 901, 1046, 997, 802, 1018, 1019, + 1069, 821, 844, 902, 1091, 986, 987, 988, 1073, 1074, + 798, 1003, 823, 1021, 839, 850, 1022, 1023, 1030, 1034, + 1075, 1092, 1076, 908, 1077, 866, 845, 931, 846, 1093, + 429, 843, 848, 858, 990, 584, 974, 1078, 1002, 1094, + 1035, 1036, 1039, 1095, 1096, 959, 868, 1007, 840, 1008, + 964, 869, 870, 643, 857, 1047, 841, 842, 855, 646, + 655, 1097, 1098, 1099, 966, 825, 822, 871, 875, 1048, + 829, 1050, 1100, 661, 877, 1101, 1042, 738, 743, 586, + 692, 680, 746, 818, 1079, 812, 854, 815, 989, 743, + 826, 880, 1102, 881, 883, 886, 1040, 887, 1014, 1103, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 456, 456, 456, 456, 456, 456, - 305, 305, 305, 305, 305, 456, 456, 456, 456, 456, - 456, 456, 305, 305, 0, 0, 305, 0, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 456, 456, 456, 289, 289, 289, - 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 289, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 289, 289, - 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 289, 289, 289, 289, 594, 594, 289, 289, 594, 594, - 594, 594, 594, 594, 594, 594, 594, 594, 289, 0, - 289, 289, 289, 289, 289, 289, 289, 289, 594, 819, - 594, 594, 442, 442, 442, 442, 594, 594, 594, -88, - -88, 442, 594, 63, 594, 594, 594, 594, 594, 594, - 594, 594, 594, 0, 0, 594, 594, 594, 594, 0, - 0, 0, 130, -3, 594, 846, 846, 846, 846, 594, - 594, 594, 594, -3, -3, 594, 594, 594, 0, 0, - 0, 0, 442, 442, 0, 130, 0, 0, 130, 0, - 0, 846, 846, 594, 63, 819, 359, 594, 0, 0, - 0, 0, 130, 846, 130, 402, 834, -3, -3, 834, - 402, 402, 124, 18, 359, 605, 605, 605, 605, 0, - 0, 659, 819, 819, 819, 819, 819, 819, 819, 819, - 819, 819, 819, 846, 0, 819, 0, 846, 846, 846, + 0, 0, 0, 0, 468, 468, 468, 468, 468, 468, + 313, 313, 313, 313, 313, 468, 468, 468, 468, 468, + 468, 468, 313, 468, 468, 468, 313, 0, 0, 313, + 0, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 297, 297, 297, 297, 297, + 297, 297, 297, 297, 297, 297, 297, 297, 297, 297, + 297, 297, 297, 297, 297, 297, 297, 297, 297, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 846, 0, 0, 950, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 962, - 0, 0, 0, 0, 0, 0, 846, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 842, 871, 0, 871, - 0, 842, 842, 842, 0, 0, 0, 0, 863, 857 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 297, 297, 297, 297, 297, + 297, 297, 297, 297, 297, 297, 297, 297, 297, 297, + 297, 297, 297, 297, 297, 297, 297, 297, 524, 524, + 297, 297, 297, 297, 524, 524, 524, 524, 524, 524, + 524, 524, 524, 524, 297, 297, 297, 0, 297, 297, + 297, 297, 297, 297, 297, 810, 524, 524, 524, 524, + 133, 133, 133, 133, -95, -95, -95, 524, 524, 133, + 524, 810, 524, 524, 524, 524, 524, 524, 524, 524, + 524, 0, 0, 524, 524, 524, 524, -3, -70, 524, + 834, 834, 834, 834, 524, 524, 524, 524, -70, -70, + 524, 524, 524, 0, 0, 0, 133, 133, -3, 0, + 0, -3, 391, 0, 834, 206, 834, 206, 524, 391, + 810, 374, 524, 489, 0, 0, 0, 0, 0, 0, + 0, -3, 834, -3, 554, -70, -70, 554, 554, 5, + 33, 374, 612, 612, 612, 612, 33, 0, 0, 0, + 0, 0, 611, 810, 810, 810, 810, 810, 810, 810, + 810, 810, 810, 810, 810, 834, 0, 810, 0, 810, + 810, 834, 834, 834, 0, 0, 0, 0, 0, 0, + 0, 0, 929, 0, 0, 0, 0, 0, 0, 0, + 834, 0, 929, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 834, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 817, 821, 0, 0, 821, 0, 817, 817, 817, + 0, 0, 0, 857, 829 ); protected array $actionDefault = array( 3,32767, 102,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767, 100,32767,32767,32767,32767, 602, 602, - 602, 602,32767,32767, 254, 102,32767,32767, 470, 387, - 387, 387,32767,32767, 544, 544, 544, 544, 544, 544, - 32767,32767,32767,32767,32767,32767, 470,32767,32767,32767, + 32767,32767,32767,32767,32767,32767, 100,32767, 618, 618, + 618, 618,32767,32767, 255, 102,32767,32767, 489, 406, + 406, 406,32767,32767, 562, 562, 562, 562, 562,32767, + 32767,32767,32767,32767,32767, 489,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767,32767,32767, 100, - 32767,32767,32767, 36, 7, 8, 10, 11, 49, 17, - 324,32767,32767,32767,32767, 102,32767,32767,32767,32767, + 32767,32767,32767,32767,32767,32767, 36, 7, 8, 10, + 11, 49, 17, 328, 100,32767,32767,32767,32767,32767, + 32767,32767,32767, 102,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767, 595,32767,32767, + 32767,32767,32767,32767,32767, 393, 611,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767,32767, 474, 453, - 454, 456, 457, 386, 545, 601, 327, 598, 385, 145, - 339, 329, 242, 330, 258, 475, 259, 476, 479, 480, - 215, 287, 382, 149, 150, 417, 471, 419, 469, 473, - 418, 392, 398, 399, 400, 401, 402, 403, 404, 405, - 406, 407, 408, 409, 410, 390, 391, 472, 450, 449, - 448,32767,32767, 415, 416,32767,32767,32767,32767,32767, - 32767,32767,32767, 102,32767, 420, 389, 423, 421, 422, - 439, 440, 437, 438, 441,32767,32767,32767,32767, 442, - 443, 444, 445, 316,32767,32767, 366, 364, 424, 316, - 111,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 430, 431,32767,32767,32767,32767, 487, 538, 447,32767, + 32767,32767,32767,32767,32767,32767, 493, 472, 473, 475, + 476, 405, 563, 617, 331, 614, 333, 404, 145, 343, + 334, 243, 259, 494, 260, 495, 498, 499, 216, 390, + 149, 150, 436, 490, 438, 488, 492, 437, 411, 417, + 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, + 428, 429, 409, 410, 491,32767,32767, 469, 468, 467, + 434,32767,32767,32767,32767,32767,32767,32767,32767, 102, + 32767, 435, 439, 442, 408, 440, 441, 458, 459, 456, + 457, 460,32767,32767, 320,32767,32767, 461, 462, 463, + 464, 371, 195, 369,32767,32767, 443, 320, 111,32767, + 32767,32767,32767,32767,32767,32767,32767,32767, 449, 450, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767, 102,32767, 100, 540, 412, 414, 507, 425, - 426, 393,32767, 514,32767, 102,32767, 516,32767,32767, - 32767,32767,32767,32767,32767, 539,32767, 546, 546,32767, - 500, 100, 195,32767,32767, 515,32767, 195, 195,32767, - 32767,32767,32767,32767,32767,32767,32767, 609, 500, 110, + 32767,32767,32767,32767,32767,32767,32767, 102,32767, 100, + 506, 556, 466, 444, 445,32767, 531,32767, 102,32767, + 533,32767,32767,32767,32767,32767,32767,32767,32767,32767, + 32767, 558, 431, 433, 526, 612, 412, 615,32767, 519, + 100, 195,32767, 532, 195, 195,32767,32767,32767,32767, + 32767,32767,32767,32767,32767,32767, 557,32767, 625, 519, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, - 32767, 195, 110,32767,32767,32767, 100, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 190,32767, 268, - 270, 102, 563, 195,32767, 519,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767, 512,32767,32767,32767, + 110, 110,32767, 195, 110,32767, 110, 110,32767,32767, + 100, 195, 195, 195, 195, 195, 195, 195, 195, 534, + 195, 195, 190,32767, 269, 271, 102, 580, 195, 536, + 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, + 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, + 32767,32767, 393,32767,32767,32767,32767, 519, 454, 138, + 32767, 521, 138, 564, 446, 447, 448, 564, 564, 564, + 316, 293,32767,32767,32767,32767, 534, 534, 100, 100, + 100, 100,32767,32767,32767,32767, 111, 505, 99, 99, + 99, 99, 99, 103, 101,32767,32767,32767,32767, 224, + 32767, 101, 99,32767, 101, 101,32767,32767, 224, 226, + 213, 228,32767, 584, 585, 224, 101, 228, 228, 228, + 248, 248, 508, 322, 101, 99, 101, 101, 197, 322, + 322,32767, 101, 508, 322, 508, 322, 199, 322, 322, + 322, 508, 322,32767, 101, 322, 215, 99, 99, 322, + 32767,32767,32767,32767, 521,32767,32767,32767,32767,32767, + 32767,32767, 223,32767,32767,32767,32767,32767,32767,32767, + 32767, 551,32767, 569, 582, 452, 453, 455, 568, 566, + 477, 478, 479, 480, 481, 482, 483, 485, 613,32767, + 525,32767,32767,32767, 342,32767, 623,32767,32767,32767, + 9, 74, 514, 42, 43, 51, 57, 540, 541, 542, + 543, 537, 538, 544, 539,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767, 500, 435, 138,32767, 138, 546, 427, 428, - 429, 502, 546, 546, 546, 312, 289,32767,32767,32767, - 32767, 517, 100, 100, 100, 100, 512,32767,32767,32767, - 32767, 111, 486, 99, 99, 99, 99, 99, 103, 101, - 32767,32767,32767,32767, 223,32767, 99,32767, 101, 101, - 32767,32767, 223, 225, 212, 101, 227,32767, 567, 568, - 223, 101, 227, 227, 227, 247, 247, 489, 318, 101, - 99, 101, 101, 197, 318, 318,32767, 101, 489, 318, - 489, 318, 199, 318, 318, 318, 489, 318,32767, 101, - 318, 214, 99, 99, 318,32767,32767,32767, 502,32767, - 32767,32767,32767,32767,32767,32767, 222,32767,32767,32767, - 32767,32767,32767,32767,32767, 533,32767, 551, 565, 433, - 434, 436, 550, 548, 458, 459, 460, 461, 462, 463, - 464, 466, 597,32767, 506,32767,32767,32767, 338,32767, - 607,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767,32767, 608,32767, - 546,32767,32767,32767,32767, 432, 9, 74, 495, 42, - 43, 51, 57, 523, 524, 525, 526, 520, 521, 527, - 522,32767,32767, 528, 573,32767,32767, 547, 600,32767, - 32767,32767,32767,32767,32767, 138,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767, 533,32767, 136, - 32767,32767,32767,32767,32767,32767,32767,32767, 529,32767, - 32767,32767, 546,32767,32767,32767,32767, 314, 311,32767, + 624,32767, 564,32767,32767,32767,32767, 451, 546, 590, + 32767,32767, 565, 616,32767,32767,32767,32767,32767,32767, + 32767, 138,32767,32767,32767,32767,32767,32767,32767,32767, + 32767,32767, 551,32767, 136,32767,32767,32767,32767,32767, + 32767,32767,32767, 547,32767,32767,32767, 564,32767,32767, + 32767,32767, 318, 315,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767, 546,32767,32767,32767,32767, - 32767, 291,32767, 308,32767,32767,32767,32767,32767,32767, + 564,32767,32767,32767,32767,32767, 295,32767, 312,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 286,32767,32767, 381, 502, 294, 296, 297,32767,32767, - 32767,32767, 360,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767, 152, 152, 3, 3, 341, 152, - 152, 152, 341, 341, 152, 341, 341, 341, 152, 152, - 152, 152, 152, 152, 280, 185, 262, 265, 247, 247, - 152, 352, 152 + 32767,32767,32767,32767,32767,32767,32767, 389, 521, 298, + 300, 301,32767,32767,32767,32767, 365,32767,32767,32767, + 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, + 152, 152, 3, 3, 345, 152, 152, 152, 345, 345, + 152, 345, 345, 345, 152, 152, 152, 152, 152, 152, + 152, 281, 185, 263, 266, 248, 248, 152, 357, 152, + 391, 391, 400 ); protected array $goto = array( - 196, 196, 1038, 1069, 701, 353, 433, 665, 856, 710, - 427, 321, 316, 317, 337, 580, 432, 338, 434, 642, - 658, 659, 421, 676, 677, 678, 857, 167, 167, 167, - 167, 221, 197, 193, 193, 177, 179, 216, 193, 193, - 193, 193, 193, 194, 194, 194, 194, 194, 194, 188, - 189, 190, 191, 192, 218, 216, 219, 539, 540, 423, - 541, 544, 545, 546, 547, 548, 549, 550, 551, 1140, - 168, 169, 170, 195, 171, 172, 173, 166, 174, 175, - 176, 178, 215, 217, 220, 238, 243, 244, 255, 257, - 258, 259, 260, 261, 262, 263, 264, 269, 270, 271, - 272, 278, 290, 291, 319, 320, 428, 429, 430, 585, - 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, - 232, 233, 234, 235, 236, 180, 237, 181, 198, 199, - 200, 239, 188, 189, 190, 191, 192, 218, 1140, 201, - 182, 183, 184, 202, 198, 185, 240, 203, 201, 165, - 204, 205, 186, 206, 207, 208, 187, 209, 210, 211, - 212, 213, 214, 859, 613, 628, 631, 632, 633, 634, - 655, 656, 657, 712, 460, 979, 280, 280, 280, 280, - 479, 1321, 1322, 627, 627, 831, 604, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 398, 401, 564, - 605, 609, 890, 552, 552, 552, 552, 864, 608, 913, - 908, 909, 922, 865, 910, 862, 911, 912, 863, 465, - 441, 916, 1041, 1041, 685, 956, 1189, 357, 1033, 1049, - 1050, 1091, 1086, 1087, 1088, 1295, 1295, 357, 357, 1295, - 1295, 1295, 1295, 1295, 1295, 1295, 1295, 1295, 1295, 698, - 357, 357, 833, 917, 357, 918, 1363, 354, 355, 577, - 1244, 698, 1244, 1244, 426, 698, 615, 558, 1038, 1038, - 1244, 357, 357, 5, 1038, 6, 1038, 1038, 1038, 1038, - 1038, 1038, 1038, 1038, 1038, 625, 662, 1038, 1038, 1038, - 1038, 1328, 1328, 1328, 1328, 351, 1244, 356, 356, 356, - 356, 1244, 1244, 1244, 1244, 1111, 1112, 1244, 1244, 1244, - 344, 563, 556, 897, 855, 897, 897, 1336, 554, 1307, - 554, 554, 482, 603, 1104, 930, 713, 1000, 554, 931, - 484, 396, 946, 345, 344, 946, 511, 704, 872, 1102, - 690, 343, 556, 563, 572, 573, 346, 583, 606, 620, - 621, 575, 852, 884, 458, 664, 871, 22, 1137, 973, - 973, 973, 973, 1044, 1043, 458, 967, 974, 1292, 1292, - 558, 1062, 1292, 1292, 1292, 1292, 1292, 1292, 1292, 1292, - 1292, 1292, 543, 543, 1047, 1048, 543, 543, 543, 543, - 543, 543, 543, 543, 543, 543, 570, 469, 469, 440, - 737, 641, 643, 670, 852, 663, 469, 327, 311, 687, - 691, 1014, 699, 708, 1010, 686, 1017, 1017, 1220, 948, - 1323, 1324, 1221, 1224, 949, 1225, 849, 557, 567, 581, - 618, 557, 339, 567, 877, 1237, 399, 464, 451, 451, - 451, 451, 405, 1318, 837, 1318, 1318, 251, 251, 472, - 584, 473, 474, 1318, 962, 1022, 882, 542, 542, 1354, - 1355, 542, 874, 542, 542, 542, 542, 542, 542, 542, - 542, 971, 412, 709, 249, 249, 249, 249, 246, 252, - 1330, 1330, 1330, 1330, 837, 880, 837, 410, 411, 635, - 637, 639, 674, 619, 675, 1075, 414, 415, 416, 1235, - 688, 740, 886, 417, 1079, 0, 1314, 349, 435, 984, - 885, 873, 1074, 1078, 435, 1122, 503, 0, 504, 1239, - 1045, 1045, 982, 852, 510, 0, 0, 669, 1056, 1052, - 1053, 0, 451, 451, 451, 451, 451, 451, 451, 451, - 451, 451, 451, 935, 1127, 451, 972, 0, 1077, 0, - 623, 0, 1316, 1316, 1077, 0, 1019, 0, 0, 326, - 276, 326, 326, 0, 876, 1261, 668, 998, 1120, 889, - 1346, 1346, 870, 1240, 1241, 1003, 0, 0, 975, 0, - 736, 0, 847, 0, 1234, 0, 0, 1346, 555, 1012, - 1007, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1242, 1304, 1305, 1349, 1349, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 254, 254 + 194, 194, 1052, 487, 705, 278, 278, 278, 278, 990, + 489, 548, 548, 907, 865, 907, 907, 548, 714, 548, + 548, 548, 548, 548, 548, 548, 548, 166, 166, 166, + 166, 218, 195, 191, 191, 176, 178, 213, 191, 191, + 191, 191, 191, 192, 192, 192, 192, 192, 186, 187, + 188, 189, 190, 215, 213, 216, 545, 546, 428, 547, + 550, 551, 552, 553, 554, 555, 556, 557, 1169, 167, + 168, 169, 193, 170, 171, 172, 164, 173, 174, 175, + 177, 212, 214, 217, 237, 240, 251, 252, 253, 255, + 256, 257, 258, 259, 260, 261, 267, 268, 269, 270, + 276, 288, 289, 313, 314, 434, 435, 436, 607, 219, + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, + 230, 231, 232, 233, 234, 186, 187, 188, 189, 190, + 215, 1169, 196, 197, 198, 199, 238, 179, 180, 200, + 181, 201, 197, 182, 239, 196, 163, 202, 203, 183, + 204, 205, 206, 184, 207, 208, 165, 209, 210, 211, + 185, 869, 560, 1083, 560, 560, 592, 1100, 475, 475, + 744, 646, 648, 609, 560, 668, 432, 475, 621, 692, + 695, 1025, 703, 712, 1021, 719, 558, 558, 558, 558, + 470, 613, 866, 663, 664, 463, 681, 682, 683, 1218, + 984, 984, 984, 984, 247, 247, 463, 978, 985, 355, + 355, 355, 355, 867, 923, 918, 919, 932, 875, 920, + 872, 921, 922, 873, 350, 926, 879, 1126, 1154, 1127, + 878, 245, 245, 245, 245, 242, 248, 841, 1106, 1102, + 1103, 438, 670, 402, 405, 610, 614, 433, 336, 332, + 333, 335, 602, 437, 337, 439, 647, 426, 1273, 1052, + 1273, 1273, 342, 900, 456, 456, 348, 456, 456, 1052, + 1273, 882, 1052, 520, 1052, 1052, 1052, 1052, 1052, 1052, + 1052, 1052, 1052, 343, 342, 1052, 1052, 1052, 1052, 894, + 465, 1273, 881, 508, 599, 509, 1273, 1273, 1273, 1273, + 358, 515, 1273, 1273, 1273, 1354, 1354, 1354, 1354, 862, + 358, 358, 1372, 1372, 630, 667, 895, 883, 1088, 1092, + 940, 358, 358, 1362, 941, 358, 1011, 1372, 1389, 993, + 956, 447, 956, 619, 633, 636, 637, 638, 639, 660, + 661, 662, 716, 718, 564, 569, 562, 358, 358, 1375, + 1375, 400, 983, 1055, 1055, 690, 967, 597, 862, 1047, + 1063, 1064, 456, 456, 456, 456, 456, 456, 456, 456, + 456, 456, 456, 456, 1138, 899, 456, 669, 456, 456, + 1058, 1057, 322, 562, 569, 594, 595, 324, 605, 611, + 1166, 626, 627, 1028, 1028, 1061, 1062, 632, 632, 25, + 320, 306, 1334, 1304, 1304, 1304, 1304, 1304, 1304, 1304, + 1304, 1304, 1304, 702, 1349, 1350, 1014, 843, 5, 986, + 6, 743, 445, 422, 561, 1023, 1018, 1076, 1345, 702, + 1345, 1345, 702, 603, 624, 1323, 1323, 691, 250, 250, + 1345, 1323, 1323, 1323, 1323, 1323, 1323, 1323, 1323, 1323, + 1323, 563, 589, 927, 564, 928, 563, 675, 589, 859, + 403, 469, 1356, 1356, 1356, 1356, 338, 887, 271, 319, + 625, 319, 319, 478, 606, 479, 480, 973, 351, 352, + 409, 892, 1320, 1320, 1380, 1381, 1341, 862, 1320, 1320, + 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 982, 417, + 713, 1268, 1264, 414, 415, 1033, 884, 440, 679, 890, + 680, 1149, 419, 420, 421, 1089, 693, 847, 1266, 423, + 440, 747, 1043, 346, 485, 1093, 1059, 1059, 330, 484, + 1347, 1348, 1140, 674, 1070, 1066, 1067, 1091, 896, 995, + 549, 549, 377, 1343, 1343, 1091, 549, 549, 549, 549, + 549, 549, 549, 549, 549, 549, 1269, 1270, 0, 1256, + 0, 847, 0, 847, 615, 857, 0, 945, 1156, 640, + 642, 644, 1256, 0, 0, 0, 0, 608, 1119, 1030, + 0, 0, 752, 752, 1271, 1331, 1332, 886, 717, 673, + 1009, 0, 0, 516, 708, 880, 1117, 1249, 959, 0, + 0, 0, 1250, 1253, 960, 0, 1254, 1263 ); protected array $gotoCheck = array( - 42, 42, 73, 127, 73, 97, 66, 66, 26, 9, - 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, - 86, 86, 43, 86, 86, 86, 27, 42, 42, 42, + 42, 42, 73, 84, 73, 23, 23, 23, 23, 49, + 84, 162, 162, 25, 25, 25, 25, 162, 9, 162, + 162, 162, 162, 162, 162, 162, 162, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, @@ -935,103 +940,97 @@ class Php8 extends \PhpParser\ParserAbstract 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 15, 81, 81, 81, 81, 81, 81, - 81, 81, 81, 81, 83, 49, 23, 23, 23, 23, - 178, 178, 178, 108, 108, 6, 130, 108, 108, 108, - 108, 108, 108, 108, 108, 108, 108, 59, 59, 59, - 59, 59, 45, 107, 107, 107, 107, 15, 107, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 151, - 83, 15, 89, 89, 89, 89, 151, 14, 89, 89, - 89, 15, 15, 15, 15, 172, 172, 14, 14, 172, - 172, 172, 172, 172, 172, 172, 172, 172, 172, 7, - 14, 14, 7, 65, 14, 65, 14, 97, 97, 174, - 73, 7, 73, 73, 13, 7, 13, 14, 73, 73, - 73, 14, 14, 46, 73, 46, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 56, 56, 73, 73, 73, - 73, 9, 9, 9, 9, 181, 73, 24, 24, 24, - 24, 73, 73, 73, 73, 144, 144, 73, 73, 73, - 170, 76, 76, 25, 25, 25, 25, 183, 19, 14, - 19, 19, 84, 8, 8, 73, 8, 103, 19, 73, - 84, 62, 9, 170, 170, 9, 8, 8, 35, 8, - 14, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 104, 22, 35, 19, 64, 35, 76, 150, 19, - 19, 19, 19, 118, 118, 19, 19, 19, 173, 173, - 14, 114, 173, 173, 173, 173, 173, 173, 173, 173, - 173, 173, 175, 175, 119, 119, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 48, 149, 149, 113, - 48, 48, 48, 120, 22, 48, 149, 171, 171, 48, - 48, 48, 48, 48, 48, 116, 107, 107, 79, 79, - 180, 180, 79, 79, 79, 79, 18, 9, 9, 2, - 2, 9, 29, 9, 39, 14, 9, 9, 23, 23, - 23, 23, 28, 130, 12, 130, 130, 5, 5, 9, - 9, 9, 9, 130, 92, 110, 9, 158, 158, 9, - 9, 158, 37, 158, 158, 158, 158, 158, 158, 158, - 158, 93, 93, 93, 5, 5, 5, 5, 5, 5, - 130, 130, 130, 130, 12, 9, 12, 82, 82, 85, - 85, 85, 82, 80, 82, 129, 82, 82, 82, 162, - 82, 99, 41, 82, 132, -1, 130, 82, 117, 96, - 16, 16, 16, 16, 117, 147, 155, -1, 155, 20, - 117, 117, 16, 22, 155, -1, -1, 117, 117, 117, - 117, -1, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 23, 17, 17, 23, 16, -1, 130, -1, - 17, -1, 130, 130, 130, -1, 17, -1, -1, 24, - 24, 24, 24, -1, 17, 20, 17, 17, 16, 16, - 184, 184, 17, 20, 20, 50, -1, -1, 50, -1, - 50, -1, 20, -1, 17, -1, -1, 184, 50, 50, - 50, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 20, 20, 20, 184, 184, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 5, 5 + 42, 15, 19, 128, 19, 19, 48, 15, 154, 154, + 48, 48, 48, 131, 19, 48, 13, 154, 13, 48, + 48, 48, 48, 48, 48, 48, 107, 107, 107, 107, + 156, 107, 26, 86, 86, 19, 86, 86, 86, 156, + 19, 19, 19, 19, 5, 5, 19, 19, 19, 24, + 24, 24, 24, 27, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 97, 15, 15, 146, 146, 146, + 15, 5, 5, 5, 5, 5, 5, 6, 15, 15, + 15, 66, 66, 59, 59, 59, 59, 66, 66, 66, + 66, 66, 66, 66, 66, 66, 66, 43, 73, 73, + 73, 73, 174, 45, 23, 23, 185, 23, 23, 73, + 73, 35, 73, 76, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 174, 174, 73, 73, 73, 73, 35, + 83, 73, 35, 160, 178, 160, 73, 73, 73, 73, + 14, 160, 73, 73, 73, 9, 9, 9, 9, 22, + 14, 14, 188, 188, 56, 56, 16, 16, 16, 16, + 73, 14, 14, 187, 73, 14, 103, 188, 14, 16, + 9, 83, 9, 81, 81, 81, 81, 81, 81, 81, + 81, 81, 81, 81, 14, 76, 76, 14, 14, 188, + 188, 62, 16, 89, 89, 89, 89, 104, 22, 89, + 89, 89, 23, 23, 23, 23, 23, 23, 23, 23, + 23, 23, 23, 23, 16, 16, 23, 64, 23, 23, + 119, 119, 76, 76, 76, 76, 76, 76, 76, 76, + 155, 76, 76, 107, 107, 120, 120, 108, 108, 76, + 175, 175, 14, 108, 108, 108, 108, 108, 108, 108, + 108, 108, 108, 7, 184, 184, 50, 7, 46, 50, + 46, 50, 113, 14, 50, 50, 50, 115, 131, 7, + 131, 131, 7, 2, 2, 176, 176, 117, 5, 5, + 131, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 9, 9, 65, 14, 65, 9, 121, 9, 18, + 9, 9, 131, 131, 131, 131, 29, 39, 24, 24, + 80, 24, 24, 9, 9, 9, 9, 92, 97, 97, + 28, 9, 177, 177, 9, 9, 131, 22, 177, 177, + 177, 177, 177, 177, 177, 177, 177, 177, 93, 93, + 93, 20, 166, 82, 82, 110, 37, 118, 82, 9, + 82, 153, 82, 82, 82, 130, 82, 12, 14, 82, + 118, 99, 114, 82, 157, 133, 118, 118, 9, 182, + 182, 182, 149, 118, 118, 118, 118, 131, 41, 96, + 179, 179, 138, 131, 131, 131, 179, 179, 179, 179, + 179, 179, 179, 179, 179, 179, 20, 20, -1, 20, + -1, 12, -1, 12, 17, 20, -1, 17, 17, 85, + 85, 85, 20, -1, -1, -1, -1, 8, 8, 17, + -1, -1, 24, 24, 20, 20, 20, 17, 8, 17, + 17, -1, -1, 8, 8, 17, 8, 79, 79, -1, + -1, -1, 79, 79, 79, -1, 79, 17 ); protected array $gotoBase = array( - 0, 0, -287, 0, 0, 446, 165, 242, 315, -11, - 0, 0, 145, -75, -73, -187, 56, 75, 114, 53, - 124, 0, 72, 173, 294, 310, 4, 22, 103, 133, - 0, 0, 0, 0, 0, -35, 0, 121, 0, 109, - 0, 60, -1, 3, 0, 179, -467, 0, -319, 157, - 563, 0, 0, 0, 0, 0, 245, 0, 0, 152, - 0, 0, 289, 0, 113, 239, -235, 0, 0, 0, - 0, 0, 0, -5, 0, 0, -36, 0, 0, 8, - 147, -196, -7, -106, -150, 7, -702, 0, 0, -59, - 0, 0, 123, 164, 0, 0, 65, -481, 0, 92, - 0, 0, 0, 292, 308, 0, 0, 175, -58, 0, - 83, 0, 0, 120, 97, 0, 132, 235, 82, 99, - 111, 0, 0, 0, 0, 0, 0, 1, 0, 119, - 178, 0, 61, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 29, 0, 0, 70, 0, 363, - 112, -49, 0, 0, 0, 18, 0, 0, 216, 0, - 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, - 10, 84, -6, 127, 230, 141, 0, 0, -123, 0, - 46, 265, 0, 286, 260, 0, 0 + 0, 0, -289, 0, 0, 203, 227, 406, 569, 8, + 0, 0, 223, -162, 5, -186, -143, 93, 152, -101, + 102, 0, 31, 2, 206, 10, 188, 209, 142, 172, + 0, 0, 0, 0, 0, -104, 0, 166, 0, 149, + 0, 90, -1, 234, 0, 237, -329, 0, -555, -9, + 404, 0, 0, 0, 0, 0, 274, 0, 0, 198, + 0, 0, 309, 0, 141, 439, 6, 0, 0, 0, + 0, 0, 0, -5, 0, 0, 1, 0, 0, 183, + 146, -28, 4, 12, -475, 82, -535, 0, 0, 74, + 0, 0, 151, 196, 0, 0, 89, -267, 0, 108, + 0, 0, 0, 291, 314, 0, 0, 158, 162, 0, + 131, 0, 0, 145, 100, 153, 0, 156, 243, 101, + 112, 167, 0, 0, 0, 0, 0, 0, 161, 0, + 135, 165, 0, 76, 0, 0, 0, 0, -209, 0, + 0, 0, 0, 0, 0, 0, -44, 0, 0, 81, + 0, 0, 0, 157, 134, 148, -76, 77, 0, 0, + -210, 0, -224, 0, 0, 0, 129, 0, 0, 0, + 0, 0, 0, 0, -33, 84, 200, 247, 265, 305, + 0, 0, 231, 0, 36, 236, 0, 292, 7, 0, + 0 ); protected array $gotoDefault = array( - -32768, 515, 744, 4, 745, 939, 820, 829, 601, 533, - 711, 350, 629, 424, 1312, 915, 1126, 582, 848, 1253, - 1227, 459, 851, 332, 734, 927, 898, 899, 402, 388, - 394, 400, 653, 630, 497, 883, 455, 875, 489, 878, - 454, 887, 164, 420, 513, 891, 3, 894, 561, 925, - 977, 389, 902, 390, 681, 904, 566, 906, 907, 397, - 403, 404, 1131, 574, 626, 919, 256, 568, 920, 387, - 921, 929, 392, 395, 692, 468, 508, 502, 413, 1106, - 569, 612, 650, 448, 476, 624, 636, 622, 483, 436, - 418, 331, 961, 969, 490, 466, 983, 352, 991, 742, - 1139, 644, 492, 999, 645, 1006, 1009, 534, 535, 481, - 1021, 273, 1024, 493, 19, 671, 1035, 1036, 672, 646, - 1058, 647, 673, 648, 1060, 475, 602, 1068, 456, 1076, - 1300, 457, 1080, 266, 1083, 279, 419, 437, 1089, 1090, - 9, 1096, 702, 703, 11, 277, 512, 1121, 693, 453, - 1138, 452, 1208, 1210, 562, 494, 1228, 480, 296, 1231, - 684, 509, 1236, 449, 1303, 450, 536, 477, 318, 537, - 1347, 310, 335, 315, 553, 297, 336, 538, 478, 1309, - 1317, 333, 31, 1337, 1348, 579, 617 + -32768, 521, 754, 4, 755, 949, 830, 839, 585, 539, + 715, 347, 634, 429, 1339, 925, 1155, 604, 858, 1282, + 1288, 464, 861, 327, 741, 937, 908, 909, 406, 393, + 874, 404, 658, 635, 502, 893, 460, 885, 494, 888, + 459, 897, 162, 425, 518, 901, 3, 904, 567, 935, + 988, 394, 912, 395, 686, 914, 588, 916, 917, 401, + 407, 408, 1160, 596, 631, 929, 254, 590, 930, 392, + 931, 939, 397, 399, 696, 474, 513, 507, 418, 1121, + 591, 618, 655, 453, 481, 629, 641, 628, 488, 441, + 424, 326, 972, 980, 495, 472, 994, 349, 1002, 749, + 1168, 649, 497, 1010, 650, 1017, 1020, 540, 541, 486, + 1032, 264, 1035, 498, 1044, 23, 676, 1049, 1050, 677, + 651, 1072, 652, 678, 653, 1074, 471, 586, 1082, 461, + 1090, 1328, 462, 1094, 262, 1097, 277, 353, 376, 442, + 1104, 1105, 9, 1111, 706, 707, 19, 273, 517, 1139, + 697, 1145, 272, 1148, 458, 1167, 457, 1237, 1239, 568, + 499, 1257, 310, 1260, 689, 514, 1265, 454, 1330, 455, + 542, 482, 334, 543, 1373, 305, 356, 331, 559, 311, + 357, 544, 483, 1336, 1344, 328, 31, 1363, 1374, 601, + 623 ); protected array $ruleToNonTerminal = array( @@ -1055,25 +1054,27 @@ class Php8 extends \PhpParser\ParserAbstract 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 25, 25, 50, 69, 69, 72, 72, 71, 70, 70, 63, 75, 75, 76, 76, 77, 77, 78, - 78, 79, 79, 80, 80, 26, 26, 27, 27, 27, - 27, 27, 88, 88, 90, 90, 83, 83, 91, 91, - 92, 92, 92, 84, 84, 87, 87, 85, 85, 93, - 94, 94, 57, 57, 65, 65, 68, 68, 68, 67, - 95, 95, 96, 58, 58, 58, 58, 97, 97, 98, - 98, 99, 99, 100, 101, 101, 102, 102, 103, 103, - 55, 55, 51, 51, 105, 53, 53, 106, 52, 52, - 54, 54, 64, 64, 64, 64, 81, 81, 109, 109, - 111, 111, 112, 112, 112, 112, 110, 110, 110, 114, - 114, 114, 114, 89, 89, 117, 117, 117, 118, 118, - 115, 115, 119, 119, 121, 121, 122, 122, 116, 123, - 123, 120, 124, 124, 124, 124, 113, 113, 82, 82, - 82, 20, 20, 20, 126, 125, 125, 127, 127, 127, - 127, 60, 128, 128, 129, 61, 131, 131, 132, 132, - 133, 133, 86, 134, 134, 134, 134, 134, 134, 134, - 139, 139, 140, 140, 141, 141, 141, 141, 141, 142, - 143, 143, 138, 138, 135, 135, 137, 137, 145, 145, - 144, 144, 144, 144, 144, 144, 144, 136, 146, 146, - 148, 147, 147, 62, 104, 149, 149, 56, 56, 42, + 78, 79, 79, 80, 80, 80, 26, 26, 27, 27, + 27, 27, 27, 88, 88, 90, 90, 83, 83, 91, + 91, 92, 92, 92, 84, 84, 87, 87, 85, 85, + 93, 94, 94, 57, 57, 65, 65, 68, 68, 68, + 67, 95, 95, 96, 58, 58, 58, 58, 97, 97, + 98, 98, 99, 99, 100, 101, 101, 102, 102, 103, + 103, 55, 55, 51, 51, 105, 53, 53, 106, 52, + 52, 54, 54, 64, 64, 64, 64, 81, 81, 109, + 109, 111, 111, 112, 112, 112, 112, 112, 112, 112, + 110, 110, 110, 115, 115, 115, 115, 89, 89, 118, + 118, 118, 119, 119, 116, 116, 120, 120, 122, 122, + 123, 123, 117, 124, 124, 121, 125, 125, 125, 125, + 113, 113, 82, 82, 82, 20, 20, 20, 127, 126, + 126, 128, 128, 128, 128, 60, 129, 129, 130, 61, + 132, 132, 133, 133, 134, 134, 86, 135, 135, 135, + 135, 135, 135, 135, 135, 141, 141, 142, 142, 143, + 143, 143, 143, 143, 144, 145, 145, 140, 140, 136, + 136, 139, 139, 147, 147, 146, 146, 146, 146, 146, + 146, 146, 146, 146, 146, 137, 148, 148, 150, 149, + 149, 138, 138, 114, 114, 151, 151, 153, 153, 153, + 152, 152, 62, 104, 154, 154, 56, 56, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, @@ -1083,21 +1084,20 @@ class Php8 extends \PhpParser\ParserAbstract 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 156, 158, 158, 159, 150, 150, 155, - 155, 160, 161, 161, 162, 163, 164, 164, 164, 164, - 19, 19, 73, 73, 73, 73, 151, 151, 151, 151, - 166, 166, 152, 152, 154, 154, 154, 157, 157, 172, - 172, 172, 172, 172, 172, 172, 172, 172, 173, 173, - 173, 108, 175, 175, 175, 175, 153, 153, 153, 153, - 153, 153, 153, 153, 59, 59, 169, 169, 169, 169, - 169, 176, 176, 165, 165, 165, 165, 177, 177, 177, - 177, 177, 177, 74, 74, 66, 66, 66, 66, 130, - 130, 130, 130, 180, 179, 168, 168, 168, 168, 168, - 168, 168, 167, 167, 167, 178, 178, 178, 178, 107, - 174, 182, 182, 181, 181, 183, 183, 183, 183, 183, - 183, 183, 183, 171, 171, 171, 171, 170, 185, 184, - 184, 184, 184, 184, 184, 184, 184, 186, 186, 186, - 186 + 42, 42, 161, 162, 162, 163, 155, 155, 160, 160, + 164, 165, 165, 166, 167, 168, 168, 168, 168, 19, + 19, 73, 73, 73, 73, 156, 156, 156, 156, 170, + 170, 159, 159, 159, 157, 157, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 177, 177, 177, 108, + 179, 179, 179, 179, 158, 158, 158, 158, 158, 158, + 158, 158, 59, 59, 173, 173, 173, 173, 173, 180, + 180, 169, 169, 169, 169, 181, 181, 181, 181, 181, + 74, 74, 66, 66, 66, 66, 131, 131, 131, 131, + 184, 183, 172, 172, 172, 172, 172, 172, 171, 171, + 171, 182, 182, 182, 182, 107, 178, 186, 186, 185, + 185, 187, 187, 187, 187, 187, 187, 187, 187, 175, + 175, 175, 175, 174, 189, 188, 188, 188, 188, 188, + 188, 188, 188, 190, 190, 190, 190 ); protected array $ruleToLength = array( @@ -1113,7 +1113,7 @@ class Php8 extends \PhpParser\ParserAbstract 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 2, 1, 3, 4, 1, 2, 0, 1, 1, 1, 1, 4, 3, 5, 4, 3, - 4, 2, 3, 1, 1, 7, 6, 2, 3, 1, + 4, 1, 3, 1, 1, 8, 7, 2, 3, 1, 2, 3, 1, 2, 3, 1, 1, 3, 1, 3, 1, 2, 2, 3, 1, 3, 2, 3, 1, 3, 3, 2, 0, 1, 1, 1, 1, 1, 3, 7, @@ -1121,49 +1121,50 @@ class Php8 extends \PhpParser\ParserAbstract 3, 1, 2, 5, 7, 9, 6, 5, 6, 3, 2, 1, 1, 1, 1, 0, 2, 1, 3, 8, 0, 4, 2, 1, 3, 0, 1, 0, 1, 0, - 1, 3, 1, 1, 1, 8, 9, 7, 8, 7, - 6, 8, 0, 2, 0, 2, 1, 2, 1, 2, - 1, 1, 1, 0, 2, 0, 2, 0, 2, 2, - 1, 3, 1, 4, 1, 4, 1, 1, 4, 2, - 1, 3, 3, 3, 4, 4, 5, 0, 2, 4, - 3, 1, 1, 7, 0, 2, 1, 3, 3, 4, - 1, 4, 0, 2, 5, 0, 2, 6, 0, 2, - 0, 3, 1, 2, 1, 1, 2, 0, 1, 3, - 0, 2, 1, 1, 1, 1, 6, 8, 6, 1, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 3, - 3, 3, 1, 3, 3, 3, 3, 3, 1, 3, - 3, 1, 1, 2, 1, 1, 0, 1, 0, 2, - 2, 2, 4, 3, 1, 1, 3, 1, 2, 2, - 3, 2, 3, 1, 1, 2, 3, 1, 1, 3, - 2, 0, 1, 5, 5, 6, 10, 3, 5, 1, - 1, 3, 0, 2, 4, 5, 4, 4, 4, 3, - 1, 1, 1, 1, 1, 1, 0, 1, 1, 2, - 1, 1, 1, 1, 1, 1, 1, 2, 1, 3, - 1, 1, 3, 2, 2, 3, 1, 0, 1, 1, - 3, 3, 3, 4, 4, 1, 1, 2, 3, 3, + 1, 3, 1, 1, 1, 1, 8, 9, 7, 8, + 7, 6, 8, 0, 2, 0, 2, 1, 2, 1, + 2, 1, 1, 1, 0, 2, 0, 2, 0, 2, + 2, 1, 3, 1, 4, 1, 4, 1, 1, 4, + 2, 1, 3, 3, 3, 4, 4, 5, 0, 2, + 4, 3, 1, 1, 7, 0, 2, 1, 3, 3, + 4, 1, 4, 0, 2, 5, 0, 2, 6, 0, + 2, 0, 3, 1, 2, 1, 1, 2, 0, 1, + 3, 0, 2, 1, 1, 1, 1, 1, 1, 1, + 7, 9, 6, 1, 2, 1, 1, 1, 1, 1, + 1, 1, 1, 3, 3, 3, 1, 3, 3, 3, + 3, 3, 1, 3, 3, 1, 1, 2, 1, 1, + 0, 1, 0, 2, 2, 2, 4, 3, 1, 1, + 3, 1, 2, 2, 3, 2, 3, 1, 1, 2, + 3, 1, 1, 3, 2, 0, 1, 5, 7, 5, + 6, 10, 3, 5, 1, 1, 3, 0, 2, 4, + 5, 4, 4, 4, 3, 1, 1, 1, 1, 1, + 1, 0, 1, 1, 2, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 1, 3, 1, 1, + 3, 0, 2, 0, 3, 5, 8, 1, 3, 3, + 0, 2, 2, 2, 3, 1, 0, 1, 1, 3, + 3, 3, 4, 4, 1, 1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, + 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 5, 4, - 3, 4, 4, 2, 2, 4, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 1, 3, 2, - 1, 2, 4, 2, 2, 8, 9, 8, 9, 9, - 10, 9, 10, 8, 3, 2, 2, 1, 1, 0, - 4, 2, 1, 3, 2, 1, 2, 2, 2, 4, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, - 1, 1, 0, 3, 0, 1, 1, 0, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 5, - 3, 3, 4, 1, 1, 3, 1, 1, 1, 1, - 1, 3, 2, 3, 0, 1, 1, 3, 1, 1, - 1, 1, 1, 1, 3, 1, 1, 1, 4, 4, - 1, 4, 4, 0, 1, 1, 1, 3, 3, 1, - 4, 2, 2, 1, 3, 1, 4, 4, 3, 3, - 3, 3, 1, 3, 1, 1, 3, 1, 1, 4, - 1, 1, 1, 3, 1, 1, 2, 1, 3, 4, - 3, 2, 0, 2, 2, 1, 2, 1, 1, 1, - 4, 3, 3, 3, 3, 6, 3, 1, 1, 2, - 1 + 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 5, 4, 3, + 4, 4, 2, 2, 4, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 3, 2, 1, + 2, 4, 2, 2, 8, 9, 8, 9, 9, 10, + 9, 10, 8, 3, 2, 2, 1, 1, 0, 4, + 2, 1, 3, 2, 1, 2, 2, 2, 4, 1, + 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, + 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 3, 5, 3, 3, + 4, 1, 1, 3, 1, 1, 1, 1, 1, 3, + 2, 3, 0, 1, 1, 3, 1, 1, 1, 1, + 1, 1, 3, 1, 1, 1, 4, 1, 4, 4, + 0, 1, 1, 1, 3, 3, 1, 4, 2, 2, + 1, 3, 1, 4, 3, 3, 3, 3, 1, 3, + 1, 1, 3, 1, 1, 4, 1, 1, 1, 3, + 1, 1, 2, 1, 3, 4, 3, 2, 0, 2, + 2, 1, 2, 1, 1, 1, 4, 3, 3, 3, + 3, 6, 3, 1, 1, 2, 1 ); protected function initReduceCallbacks(): void { @@ -1375,10 +1376,10 @@ protected function initReduceCallbacks(): void { $self->semValue = Stmt\Use_::TYPE_CONSTANT; }, 125 => static function ($self, $stackPos) { - $self->semValue = new Stmt\GroupUse($self->semStack[$stackPos-(7-3)], $self->semStack[$stackPos-(7-6)], $self->semStack[$stackPos-(7-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(7-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Stmt\GroupUse($self->semStack[$stackPos-(8-3)], $self->semStack[$stackPos-(8-6)], $self->semStack[$stackPos-(8-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); }, 126 => static function ($self, $stackPos) { - $self->semValue = new Stmt\GroupUse($self->semStack[$stackPos-(6-2)], $self->semStack[$stackPos-(6-5)], Stmt\Use_::TYPE_UNKNOWN, $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Stmt\GroupUse($self->semStack[$stackPos-(7-2)], $self->semStack[$stackPos-(7-5)], Stmt\Use_::TYPE_UNKNOWN, $self->getAttributes($self->tokenStartStack[$stackPos-(7-1)], $self->tokenEndStack[$stackPos])); }, 127 => null, 128 => static function ($self, $stackPos) { @@ -1597,273 +1598,275 @@ protected function initReduceCallbacks(): void { $self->semValue = new Node\Identifier($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, 205 => static function ($self, $stackPos) { - $self->semValue = new Stmt\Function_($self->semStack[$stackPos-(8-3)], ['byRef' => $self->semStack[$stackPos-(8-2)], 'params' => $self->semStack[$stackPos-(8-5)], 'returnType' => $self->semStack[$stackPos-(8-7)], 'stmts' => $self->semStack[$stackPos-(8-8)], 'attrGroups' => []], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Node\Identifier($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, 206 => static function ($self, $stackPos) { - $self->semValue = new Stmt\Function_($self->semStack[$stackPos-(9-4)], ['byRef' => $self->semStack[$stackPos-(9-3)], 'params' => $self->semStack[$stackPos-(9-6)], 'returnType' => $self->semStack[$stackPos-(9-8)], 'stmts' => $self->semStack[$stackPos-(9-9)], 'attrGroups' => $self->semStack[$stackPos-(9-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(9-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Stmt\Function_($self->semStack[$stackPos-(8-3)], ['byRef' => $self->semStack[$stackPos-(8-2)], 'params' => $self->semStack[$stackPos-(8-5)], 'returnType' => $self->semStack[$stackPos-(8-7)], 'stmts' => $self->semStack[$stackPos-(8-8)], 'attrGroups' => []], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); }, 207 => static function ($self, $stackPos) { + $self->semValue = new Stmt\Function_($self->semStack[$stackPos-(9-4)], ['byRef' => $self->semStack[$stackPos-(9-3)], 'params' => $self->semStack[$stackPos-(9-6)], 'returnType' => $self->semStack[$stackPos-(9-8)], 'stmts' => $self->semStack[$stackPos-(9-9)], 'attrGroups' => $self->semStack[$stackPos-(9-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(9-1)], $self->tokenEndStack[$stackPos])); + }, + 208 => static function ($self, $stackPos) { $self->semValue = new Stmt\Class_($self->semStack[$stackPos-(7-2)], ['type' => $self->semStack[$stackPos-(7-1)], 'extends' => $self->semStack[$stackPos-(7-3)], 'implements' => $self->semStack[$stackPos-(7-4)], 'stmts' => $self->semStack[$stackPos-(7-6)], 'attrGroups' => []], $self->getAttributes($self->tokenStartStack[$stackPos-(7-1)], $self->tokenEndStack[$stackPos])); $self->checkClass($self->semValue, $stackPos-(7-2)); }, - 208 => static function ($self, $stackPos) { + 209 => static function ($self, $stackPos) { $self->semValue = new Stmt\Class_($self->semStack[$stackPos-(8-3)], ['type' => $self->semStack[$stackPos-(8-2)], 'extends' => $self->semStack[$stackPos-(8-4)], 'implements' => $self->semStack[$stackPos-(8-5)], 'stmts' => $self->semStack[$stackPos-(8-7)], 'attrGroups' => $self->semStack[$stackPos-(8-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); $self->checkClass($self->semValue, $stackPos-(8-3)); }, - 209 => static function ($self, $stackPos) { + 210 => static function ($self, $stackPos) { $self->semValue = new Stmt\Interface_($self->semStack[$stackPos-(7-3)], ['extends' => $self->semStack[$stackPos-(7-4)], 'stmts' => $self->semStack[$stackPos-(7-6)], 'attrGroups' => $self->semStack[$stackPos-(7-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(7-1)], $self->tokenEndStack[$stackPos])); $self->checkInterface($self->semValue, $stackPos-(7-3)); }, - 210 => static function ($self, $stackPos) { + 211 => static function ($self, $stackPos) { $self->semValue = new Stmt\Trait_($self->semStack[$stackPos-(6-3)], ['stmts' => $self->semStack[$stackPos-(6-5)], 'attrGroups' => $self->semStack[$stackPos-(6-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos])); }, - 211 => static function ($self, $stackPos) { + 212 => static function ($self, $stackPos) { $self->semValue = new Stmt\Enum_($self->semStack[$stackPos-(8-3)], ['scalarType' => $self->semStack[$stackPos-(8-4)], 'implements' => $self->semStack[$stackPos-(8-5)], 'stmts' => $self->semStack[$stackPos-(8-7)], 'attrGroups' => $self->semStack[$stackPos-(8-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); $self->checkEnum($self->semValue, $stackPos-(8-3)); }, - 212 => static function ($self, $stackPos) { + 213 => static function ($self, $stackPos) { $self->semValue = null; }, - 213 => static function ($self, $stackPos) { + 214 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(2-2)]; }, - 214 => static function ($self, $stackPos) { + 215 => static function ($self, $stackPos) { $self->semValue = null; }, - 215 => static function ($self, $stackPos) { + 216 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(2-2)]; }, - 216 => static function ($self, $stackPos) { + 217 => static function ($self, $stackPos) { $self->semValue = 0; }, - 217 => null, 218 => null, - 219 => static function ($self, $stackPos) { + 219 => null, + 220 => static function ($self, $stackPos) { $self->checkClassModifier($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $self->semValue = $self->semStack[$stackPos-(2-1)] | $self->semStack[$stackPos-(2-2)]; }, - 220 => static function ($self, $stackPos) { + 221 => static function ($self, $stackPos) { $self->semValue = Modifiers::ABSTRACT; }, - 221 => static function ($self, $stackPos) { + 222 => static function ($self, $stackPos) { $self->semValue = Modifiers::FINAL; }, - 222 => static function ($self, $stackPos) { + 223 => static function ($self, $stackPos) { $self->semValue = Modifiers::READONLY; }, - 223 => static function ($self, $stackPos) { + 224 => static function ($self, $stackPos) { $self->semValue = null; }, - 224 => static function ($self, $stackPos) { + 225 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(2-2)]; }, - 225 => static function ($self, $stackPos) { + 226 => static function ($self, $stackPos) { $self->semValue = array(); }, - 226 => static function ($self, $stackPos) { + 227 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(2-2)]; }, - 227 => static function ($self, $stackPos) { + 228 => static function ($self, $stackPos) { $self->semValue = array(); }, - 228 => static function ($self, $stackPos) { + 229 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(2-2)]; }, - 229 => null, - 230 => static function ($self, $stackPos) { + 230 => null, + 231 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 231 => static function ($self, $stackPos) { + 232 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 232 => null, - 233 => static function ($self, $stackPos) { + 233 => null, + 234 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-2)]; }, - 234 => null, - 235 => static function ($self, $stackPos) { + 235 => null, + 236 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-2)]; }, - 236 => static function ($self, $stackPos) { + 237 => static function ($self, $stackPos) { if ($self->semStack[$stackPos-(1-1)] instanceof Stmt\Block) { $self->semValue = $self->semStack[$stackPos-(1-1)]->stmts; } else if ($self->semStack[$stackPos-(1-1)] === null) { $self->semValue = []; } else { $self->semValue = [$self->semStack[$stackPos-(1-1)]]; }; }, - 237 => static function ($self, $stackPos) { + 238 => static function ($self, $stackPos) { $self->semValue = null; }, - 238 => static function ($self, $stackPos) { + 239 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-2)]; }, - 239 => null, - 240 => static function ($self, $stackPos) { + 240 => null, + 241 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 241 => static function ($self, $stackPos) { + 242 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 242 => static function ($self, $stackPos) { + 243 => static function ($self, $stackPos) { $self->semValue = new Node\DeclareItem($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 243 => static function ($self, $stackPos) { + 244 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 244 => static function ($self, $stackPos) { + 245 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-3)]; }, - 245 => static function ($self, $stackPos) { + 246 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-2)]; }, - 246 => static function ($self, $stackPos) { + 247 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(5-3)]; }, - 247 => static function ($self, $stackPos) { + 248 => static function ($self, $stackPos) { $self->semValue = array(); }, - 248 => static function ($self, $stackPos) { + 249 => static function ($self, $stackPos) { $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; }, - 249 => static function ($self, $stackPos) { + 250 => static function ($self, $stackPos) { $self->semValue = new Stmt\Case_($self->semStack[$stackPos-(4-2)], $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 250 => static function ($self, $stackPos) { + 251 => static function ($self, $stackPos) { $self->semValue = new Stmt\Case_(null, $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 251 => null, 252 => null, - 253 => static function ($self, $stackPos) { + 253 => null, + 254 => static function ($self, $stackPos) { $self->semValue = new Expr\Match_($self->semStack[$stackPos-(7-3)], $self->semStack[$stackPos-(7-6)], $self->getAttributes($self->tokenStartStack[$stackPos-(7-1)], $self->tokenEndStack[$stackPos])); }, - 254 => static function ($self, $stackPos) { + 255 => static function ($self, $stackPos) { $self->semValue = []; }, - 255 => null, - 256 => static function ($self, $stackPos) { + 256 => null, + 257 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 257 => static function ($self, $stackPos) { + 258 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 258 => static function ($self, $stackPos) { + 259 => static function ($self, $stackPos) { $self->semValue = new Node\MatchArm($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 259 => static function ($self, $stackPos) { + 260 => static function ($self, $stackPos) { $self->semValue = new Node\MatchArm(null, $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 260 => static function ($self, $stackPos) { + 261 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(1-1)]; }, - 261 => static function ($self, $stackPos) { + 262 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-2)]; }, - 262 => static function ($self, $stackPos) { + 263 => static function ($self, $stackPos) { $self->semValue = array(); }, - 263 => static function ($self, $stackPos) { + 264 => static function ($self, $stackPos) { $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; }, - 264 => static function ($self, $stackPos) { + 265 => static function ($self, $stackPos) { $self->semValue = new Stmt\ElseIf_($self->semStack[$stackPos-(5-3)], $self->semStack[$stackPos-(5-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos])); }, - 265 => static function ($self, $stackPos) { + 266 => static function ($self, $stackPos) { $self->semValue = array(); }, - 266 => static function ($self, $stackPos) { + 267 => static function ($self, $stackPos) { $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; }, - 267 => static function ($self, $stackPos) { + 268 => static function ($self, $stackPos) { $self->semValue = new Stmt\ElseIf_($self->semStack[$stackPos-(6-3)], $self->semStack[$stackPos-(6-6)], $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos])); $self->fixupAlternativeElse($self->semValue); }, - 268 => static function ($self, $stackPos) { + 269 => static function ($self, $stackPos) { $self->semValue = null; }, - 269 => static function ($self, $stackPos) { + 270 => static function ($self, $stackPos) { $self->semValue = new Stmt\Else_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 270 => static function ($self, $stackPos) { + 271 => static function ($self, $stackPos) { $self->semValue = null; }, - 271 => static function ($self, $stackPos) { + 272 => static function ($self, $stackPos) { $self->semValue = new Stmt\Else_($self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); $self->fixupAlternativeElse($self->semValue); }, - 272 => static function ($self, $stackPos) { + 273 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)], false); }, - 273 => static function ($self, $stackPos) { + 274 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(2-2)], true); }, - 274 => static function ($self, $stackPos) { + 275 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)], false); }, - 275 => static function ($self, $stackPos) { + 276 => static function ($self, $stackPos) { $self->semValue = array($self->fixupArrayDestructuring($self->semStack[$stackPos-(1-1)]), false); }, - 276 => null, - 277 => static function ($self, $stackPos) { - $self->semValue = array(); - }, + 277 => null, 278 => static function ($self, $stackPos) { - $self->semValue = array($self->semStack[$stackPos-(1-1)]); + $self->semValue = array(); }, 279 => static function ($self, $stackPos) { - $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; + $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, 280 => static function ($self, $stackPos) { - $self->semValue = 0; + $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, 281 => static function ($self, $stackPos) { - $self->checkModifier($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $self->semValue = $self->semStack[$stackPos-(2-1)] | $self->semStack[$stackPos-(2-2)]; + $self->semValue = 0; }, 282 => static function ($self, $stackPos) { - $self->semValue = Modifiers::PUBLIC; + $self->checkModifier($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $self->semValue = $self->semStack[$stackPos-(2-1)] | $self->semStack[$stackPos-(2-2)]; }, 283 => static function ($self, $stackPos) { - $self->semValue = Modifiers::PROTECTED; + $self->semValue = Modifiers::PUBLIC; }, 284 => static function ($self, $stackPos) { - $self->semValue = Modifiers::PRIVATE; + $self->semValue = Modifiers::PROTECTED; }, 285 => static function ($self, $stackPos) { - $self->semValue = Modifiers::READONLY; + $self->semValue = Modifiers::PRIVATE; }, 286 => static function ($self, $stackPos) { - $self->semValue = new Node\Param($self->semStack[$stackPos-(6-6)], null, $self->semStack[$stackPos-(6-3)], $self->semStack[$stackPos-(6-4)], $self->semStack[$stackPos-(6-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(6-2)], $self->semStack[$stackPos-(6-1)]); - $self->checkParam($self->semValue); + $self->semValue = Modifiers::PUBLIC_SET; }, 287 => static function ($self, $stackPos) { - $self->semValue = new Node\Param($self->semStack[$stackPos-(8-6)], $self->semStack[$stackPos-(8-8)], $self->semStack[$stackPos-(8-3)], $self->semStack[$stackPos-(8-4)], $self->semStack[$stackPos-(8-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(8-2)], $self->semStack[$stackPos-(8-1)]); - $self->checkParam($self->semValue); + $self->semValue = Modifiers::PROTECTED_SET; }, 288 => static function ($self, $stackPos) { - $self->semValue = new Node\Param(new Expr\Error($self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos])), null, $self->semStack[$stackPos-(6-3)], $self->semStack[$stackPos-(6-4)], $self->semStack[$stackPos-(6-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(6-2)], $self->semStack[$stackPos-(6-1)]); + $self->semValue = Modifiers::PRIVATE_SET; + }, + 289 => static function ($self, $stackPos) { + $self->semValue = Modifiers::READONLY; }, - 289 => null, 290 => static function ($self, $stackPos) { - $self->semValue = new Node\NullableType($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Node\Param($self->semStack[$stackPos-(7-6)], null, $self->semStack[$stackPos-(7-3)], $self->semStack[$stackPos-(7-4)], $self->semStack[$stackPos-(7-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(7-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(7-2)], $self->semStack[$stackPos-(7-1)], $self->semStack[$stackPos-(7-7)]); + $self->checkParam($self->semValue); }, 291 => static function ($self, $stackPos) { - $self->semValue = new Node\UnionType($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Node\Param($self->semStack[$stackPos-(9-6)], $self->semStack[$stackPos-(9-8)], $self->semStack[$stackPos-(9-3)], $self->semStack[$stackPos-(9-4)], $self->semStack[$stackPos-(9-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(9-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(9-2)], $self->semStack[$stackPos-(9-1)], $self->semStack[$stackPos-(9-9)]); + $self->checkParam($self->semValue); + }, + 292 => static function ($self, $stackPos) { + $self->semValue = new Node\Param(new Expr\Error($self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos])), null, $self->semStack[$stackPos-(6-3)], $self->semStack[$stackPos-(6-4)], $self->semStack[$stackPos-(6-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(6-2)], $self->semStack[$stackPos-(6-1)]); }, - 292 => null, 293 => null, 294 => static function ($self, $stackPos) { - $self->semValue = new Node\Name('static', $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Node\NullableType($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, 295 => static function ($self, $stackPos) { - $self->semValue = $self->handleBuiltinTypes($self->semStack[$stackPos-(1-1)]); - }, - 296 => static function ($self, $stackPos) { - $self->semValue = new Node\Identifier('array', $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = new Node\UnionType($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 297 => static function ($self, $stackPos) { - $self->semValue = new Node\Identifier('callable', $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); + 296 => null, + 297 => null, + 298 => static function ($self, $stackPos) { + $self->semValue = new Node\Name('static', $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 298 => null, 299 => static function ($self, $stackPos) { - $self->semValue = $self->semStack[$stackPos-(3-2)]; + $self->semValue = $self->handleBuiltinTypes($self->semStack[$stackPos-(1-1)]); }, 300 => static function ($self, $stackPos) { - $self->semValue = array($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)]); + $self->semValue = new Node\Identifier('array', $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, 301 => static function ($self, $stackPos) { - $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; + $self->semValue = new Node\Identifier('callable', $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, 302 => null, 303 => static function ($self, $stackPos) { @@ -1875,863 +1878,909 @@ protected function initReduceCallbacks(): void { 305 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 306 => static function ($self, $stackPos) { - $self->semValue = array($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)]); - }, + 306 => null, 307 => static function ($self, $stackPos) { - $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; + $self->semValue = $self->semStack[$stackPos-(3-2)]; }, 308 => static function ($self, $stackPos) { - $self->semValue = new Node\IntersectionType($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = array($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)]); }, 309 => static function ($self, $stackPos) { - $self->semValue = array($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)]); + $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, 310 => static function ($self, $stackPos) { - $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; + $self->semValue = array($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)]); }, 311 => static function ($self, $stackPos) { + $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; + }, + 312 => static function ($self, $stackPos) { $self->semValue = new Node\IntersectionType($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 312 => null, 313 => static function ($self, $stackPos) { - $self->semValue = new Node\NullableType($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); + $self->semValue = array($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)]); }, 314 => static function ($self, $stackPos) { + $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; + }, + 315 => static function ($self, $stackPos) { + $self->semValue = new Node\IntersectionType($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); + }, + 316 => null, + 317 => static function ($self, $stackPos) { + $self->semValue = new Node\NullableType($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); + }, + 318 => static function ($self, $stackPos) { $self->semValue = new Node\UnionType($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 315 => null, - 316 => static function ($self, $stackPos) { + 319 => null, + 320 => static function ($self, $stackPos) { $self->semValue = null; }, - 317 => null, - 318 => static function ($self, $stackPos) { + 321 => null, + 322 => static function ($self, $stackPos) { $self->semValue = null; }, - 319 => static function ($self, $stackPos) { + 323 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(2-2)]; }, - 320 => static function ($self, $stackPos) { + 324 => static function ($self, $stackPos) { $self->semValue = null; }, - 321 => static function ($self, $stackPos) { + 325 => static function ($self, $stackPos) { $self->semValue = array(); }, - 322 => static function ($self, $stackPos) { + 326 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-2)]; }, - 323 => static function ($self, $stackPos) { + 327 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(3-2)]); }, - 324 => static function ($self, $stackPos) { + 328 => static function ($self, $stackPos) { $self->semValue = new Node\VariadicPlaceholder($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 325 => static function ($self, $stackPos) { + 329 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 326 => static function ($self, $stackPos) { + 330 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 327 => static function ($self, $stackPos) { + 331 => static function ($self, $stackPos) { $self->semValue = new Node\Arg($self->semStack[$stackPos-(1-1)], false, false, $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 328 => static function ($self, $stackPos) { + 332 => static function ($self, $stackPos) { $self->semValue = new Node\Arg($self->semStack[$stackPos-(2-2)], true, false, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 329 => static function ($self, $stackPos) { + 333 => static function ($self, $stackPos) { $self->semValue = new Node\Arg($self->semStack[$stackPos-(2-2)], false, true, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 330 => static function ($self, $stackPos) { + 334 => static function ($self, $stackPos) { $self->semValue = new Node\Arg($self->semStack[$stackPos-(3-3)], false, false, $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(3-1)]); }, - 331 => null, - 332 => static function ($self, $stackPos) { + 335 => null, + 336 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 333 => static function ($self, $stackPos) { + 337 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 334 => null, - 335 => null, - 336 => static function ($self, $stackPos) { + 338 => null, + 339 => null, + 340 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 337 => static function ($self, $stackPos) { + 341 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 338 => static function ($self, $stackPos) { + 342 => static function ($self, $stackPos) { $self->semValue = new Node\StaticVar($self->semStack[$stackPos-(1-1)], null, $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 339 => static function ($self, $stackPos) { + 343 => static function ($self, $stackPos) { $self->semValue = new Node\StaticVar($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 340 => static function ($self, $stackPos) { + 344 => static function ($self, $stackPos) { if ($self->semStack[$stackPos-(2-2)] !== null) { $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; } else { $self->semValue = $self->semStack[$stackPos-(2-1)]; } }, - 341 => static function ($self, $stackPos) { + 345 => static function ($self, $stackPos) { $self->semValue = array(); }, - 342 => static function ($self, $stackPos) { + 346 => static function ($self, $stackPos) { $nop = $self->maybeCreateZeroLengthNop($self->tokenPos);; if ($nop !== null) { $self->semStack[$stackPos-(1-1)][] = $nop; } $self->semValue = $self->semStack[$stackPos-(1-1)]; }, - 343 => static function ($self, $stackPos) { + 347 => static function ($self, $stackPos) { $self->semValue = new Stmt\Property($self->semStack[$stackPos-(5-2)], $self->semStack[$stackPos-(5-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(5-3)], $self->semStack[$stackPos-(5-1)]); - $self->checkProperty($self->semValue, $stackPos-(5-2)); }, - 344 => static function ($self, $stackPos) { + 348 => static function ($self, $stackPos) { + $self->semValue = new Stmt\Property($self->semStack[$stackPos-(7-2)], $self->semStack[$stackPos-(7-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(7-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(7-3)], $self->semStack[$stackPos-(7-1)], $self->semStack[$stackPos-(7-6)]); + $self->checkPropertyHookList($self->semStack[$stackPos-(7-6)], $stackPos-(7-5)); + }, + 349 => static function ($self, $stackPos) { $self->semValue = new Stmt\ClassConst($self->semStack[$stackPos-(5-4)], $self->semStack[$stackPos-(5-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(5-1)]); $self->checkClassConst($self->semValue, $stackPos-(5-2)); }, - 345 => static function ($self, $stackPos) { + 350 => static function ($self, $stackPos) { $self->semValue = new Stmt\ClassConst($self->semStack[$stackPos-(6-5)], $self->semStack[$stackPos-(6-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos]), $self->semStack[$stackPos-(6-1)], $self->semStack[$stackPos-(6-4)]); $self->checkClassConst($self->semValue, $stackPos-(6-2)); }, - 346 => static function ($self, $stackPos) { + 351 => static function ($self, $stackPos) { $self->semValue = new Stmt\ClassMethod($self->semStack[$stackPos-(10-5)], ['type' => $self->semStack[$stackPos-(10-2)], 'byRef' => $self->semStack[$stackPos-(10-4)], 'params' => $self->semStack[$stackPos-(10-7)], 'returnType' => $self->semStack[$stackPos-(10-9)], 'stmts' => $self->semStack[$stackPos-(10-10)], 'attrGroups' => $self->semStack[$stackPos-(10-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(10-1)], $self->tokenEndStack[$stackPos])); $self->checkClassMethod($self->semValue, $stackPos-(10-2)); }, - 347 => static function ($self, $stackPos) { + 352 => static function ($self, $stackPos) { $self->semValue = new Stmt\TraitUse($self->semStack[$stackPos-(3-2)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 348 => static function ($self, $stackPos) { + 353 => static function ($self, $stackPos) { $self->semValue = new Stmt\EnumCase($self->semStack[$stackPos-(5-3)], $self->semStack[$stackPos-(5-4)], $self->semStack[$stackPos-(5-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos])); }, - 349 => static function ($self, $stackPos) { + 354 => static function ($self, $stackPos) { $self->semValue = null; /* will be skipped */ }, - 350 => static function ($self, $stackPos) { + 355 => static function ($self, $stackPos) { $self->semValue = array(); }, - 351 => static function ($self, $stackPos) { + 356 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 352 => static function ($self, $stackPos) { + 357 => static function ($self, $stackPos) { $self->semValue = array(); }, - 353 => static function ($self, $stackPos) { + 358 => static function ($self, $stackPos) { $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; }, - 354 => static function ($self, $stackPos) { + 359 => static function ($self, $stackPos) { $self->semValue = new Stmt\TraitUseAdaptation\Precedence($self->semStack[$stackPos-(4-1)][0], $self->semStack[$stackPos-(4-1)][1], $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 355 => static function ($self, $stackPos) { + 360 => static function ($self, $stackPos) { $self->semValue = new Stmt\TraitUseAdaptation\Alias($self->semStack[$stackPos-(5-1)][0], $self->semStack[$stackPos-(5-1)][1], $self->semStack[$stackPos-(5-3)], $self->semStack[$stackPos-(5-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos])); }, - 356 => static function ($self, $stackPos) { + 361 => static function ($self, $stackPos) { $self->semValue = new Stmt\TraitUseAdaptation\Alias($self->semStack[$stackPos-(4-1)][0], $self->semStack[$stackPos-(4-1)][1], $self->semStack[$stackPos-(4-3)], null, $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 357 => static function ($self, $stackPos) { + 362 => static function ($self, $stackPos) { $self->semValue = new Stmt\TraitUseAdaptation\Alias($self->semStack[$stackPos-(4-1)][0], $self->semStack[$stackPos-(4-1)][1], null, $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 358 => static function ($self, $stackPos) { + 363 => static function ($self, $stackPos) { $self->semValue = new Stmt\TraitUseAdaptation\Alias($self->semStack[$stackPos-(4-1)][0], $self->semStack[$stackPos-(4-1)][1], null, $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 359 => static function ($self, $stackPos) { + 364 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)]); }, - 360 => null, - 361 => static function ($self, $stackPos) { + 365 => null, + 366 => static function ($self, $stackPos) { $self->semValue = array(null, $self->semStack[$stackPos-(1-1)]); }, - 362 => static function ($self, $stackPos) { + 367 => static function ($self, $stackPos) { $self->semValue = null; }, - 363 => null, - 364 => null, - 365 => static function ($self, $stackPos) { + 368 => null, + 369 => null, + 370 => static function ($self, $stackPos) { $self->semValue = 0; }, - 366 => static function ($self, $stackPos) { + 371 => static function ($self, $stackPos) { $self->semValue = 0; }, - 367 => null, - 368 => null, - 369 => static function ($self, $stackPos) { + 372 => null, + 373 => null, + 374 => static function ($self, $stackPos) { $self->checkModifier($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $self->semValue = $self->semStack[$stackPos-(2-1)] | $self->semStack[$stackPos-(2-2)]; }, - 370 => static function ($self, $stackPos) { + 375 => static function ($self, $stackPos) { $self->semValue = Modifiers::PUBLIC; }, - 371 => static function ($self, $stackPos) { + 376 => static function ($self, $stackPos) { $self->semValue = Modifiers::PROTECTED; }, - 372 => static function ($self, $stackPos) { + 377 => static function ($self, $stackPos) { $self->semValue = Modifiers::PRIVATE; }, - 373 => static function ($self, $stackPos) { + 378 => static function ($self, $stackPos) { + $self->semValue = Modifiers::PUBLIC_SET; + }, + 379 => static function ($self, $stackPos) { + $self->semValue = Modifiers::PROTECTED_SET; + }, + 380 => static function ($self, $stackPos) { + $self->semValue = Modifiers::PRIVATE_SET; + }, + 381 => static function ($self, $stackPos) { $self->semValue = Modifiers::STATIC; }, - 374 => static function ($self, $stackPos) { + 382 => static function ($self, $stackPos) { $self->semValue = Modifiers::ABSTRACT; }, - 375 => static function ($self, $stackPos) { + 383 => static function ($self, $stackPos) { $self->semValue = Modifiers::FINAL; }, - 376 => static function ($self, $stackPos) { + 384 => static function ($self, $stackPos) { $self->semValue = Modifiers::READONLY; }, - 377 => null, - 378 => static function ($self, $stackPos) { + 385 => null, + 386 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 379 => static function ($self, $stackPos) { + 387 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 380 => static function ($self, $stackPos) { + 388 => static function ($self, $stackPos) { $self->semValue = new Node\VarLikeIdentifier(substr($self->semStack[$stackPos-(1-1)], 1), $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 381 => static function ($self, $stackPos) { + 389 => static function ($self, $stackPos) { $self->semValue = new Node\PropertyItem($self->semStack[$stackPos-(1-1)], null, $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 382 => static function ($self, $stackPos) { + 390 => static function ($self, $stackPos) { $self->semValue = new Node\PropertyItem($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 383 => null, - 384 => null, - 385 => static function ($self, $stackPos) { + 391 => static function ($self, $stackPos) { + $self->semValue = []; + }, + 392 => static function ($self, $stackPos) { + $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; + }, + 393 => static function ($self, $stackPos) { + $self->semValue = []; + }, + 394 => static function ($self, $stackPos) { + $self->semValue = $self->semStack[$stackPos-(3-2)]; $self->checkPropertyHookList($self->semStack[$stackPos-(3-2)], $stackPos-(3-1)); + }, + 395 => static function ($self, $stackPos) { + $self->semValue = new Node\PropertyHook($self->semStack[$stackPos-(5-4)], $self->semStack[$stackPos-(5-5)], ['flags' => $self->semStack[$stackPos-(5-2)], 'byRef' => $self->semStack[$stackPos-(5-3)], 'params' => [], 'attrGroups' => $self->semStack[$stackPos-(5-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos])); + $self->checkPropertyHook($self->semValue, null); + }, + 396 => static function ($self, $stackPos) { + $self->semValue = new Node\PropertyHook($self->semStack[$stackPos-(8-4)], $self->semStack[$stackPos-(8-8)], ['flags' => $self->semStack[$stackPos-(8-2)], 'byRef' => $self->semStack[$stackPos-(8-3)], 'params' => $self->semStack[$stackPos-(8-6)], 'attrGroups' => $self->semStack[$stackPos-(8-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); + $self->checkPropertyHook($self->semValue, $stackPos-(8-5)); + }, + 397 => static function ($self, $stackPos) { + $self->semValue = null; + }, + 398 => static function ($self, $stackPos) { + $self->semValue = $self->semStack[$stackPos-(3-2)]; + }, + 399 => static function ($self, $stackPos) { + $self->semValue = $self->semStack[$stackPos-(3-2)]; + }, + 400 => static function ($self, $stackPos) { + $self->semValue = 0; + }, + 401 => static function ($self, $stackPos) { + $self->checkPropertyHookModifiers($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $self->semValue = $self->semStack[$stackPos-(2-1)] | $self->semStack[$stackPos-(2-2)]; + }, + 402 => null, + 403 => null, + 404 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 386 => static function ($self, $stackPos) { + 405 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 387 => static function ($self, $stackPos) { + 406 => static function ($self, $stackPos) { $self->semValue = array(); }, - 388 => null, - 389 => null, - 390 => static function ($self, $stackPos) { + 407 => null, + 408 => null, + 409 => static function ($self, $stackPos) { $self->semValue = new Expr\Assign($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 391 => static function ($self, $stackPos) { + 410 => static function ($self, $stackPos) { $self->semValue = new Expr\Assign($self->fixupArrayDestructuring($self->semStack[$stackPos-(3-1)]), $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 392 => static function ($self, $stackPos) { + 411 => static function ($self, $stackPos) { $self->semValue = new Expr\Assign($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 393 => static function ($self, $stackPos) { + 412 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignRef($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 394 => static function ($self, $stackPos) { + 413 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignRef($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); if (!$self->phpVersion->allowsAssignNewByReference()) { $self->emitError(new Error('Cannot assign new by reference', $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos]))); } }, - 395 => null, - 396 => null, - 397 => static function ($self, $stackPos) { + 414 => null, + 415 => null, + 416 => static function ($self, $stackPos) { $self->semValue = new Expr\Clone_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 398 => static function ($self, $stackPos) { + 417 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Plus($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 399 => static function ($self, $stackPos) { + 418 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Minus($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 400 => static function ($self, $stackPos) { + 419 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Mul($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 401 => static function ($self, $stackPos) { + 420 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Div($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 402 => static function ($self, $stackPos) { + 421 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Concat($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 403 => static function ($self, $stackPos) { + 422 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Mod($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 404 => static function ($self, $stackPos) { + 423 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\BitwiseAnd($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 405 => static function ($self, $stackPos) { + 424 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\BitwiseOr($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 406 => static function ($self, $stackPos) { + 425 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\BitwiseXor($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 407 => static function ($self, $stackPos) { + 426 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\ShiftLeft($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 408 => static function ($self, $stackPos) { + 427 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\ShiftRight($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 409 => static function ($self, $stackPos) { + 428 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Pow($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 410 => static function ($self, $stackPos) { + 429 => static function ($self, $stackPos) { $self->semValue = new Expr\AssignOp\Coalesce($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 411 => static function ($self, $stackPos) { + 430 => static function ($self, $stackPos) { $self->semValue = new Expr\PostInc($self->semStack[$stackPos-(2-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 412 => static function ($self, $stackPos) { + 431 => static function ($self, $stackPos) { $self->semValue = new Expr\PreInc($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 413 => static function ($self, $stackPos) { + 432 => static function ($self, $stackPos) { $self->semValue = new Expr\PostDec($self->semStack[$stackPos-(2-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 414 => static function ($self, $stackPos) { + 433 => static function ($self, $stackPos) { $self->semValue = new Expr\PreDec($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 415 => static function ($self, $stackPos) { + 434 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\BooleanOr($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 416 => static function ($self, $stackPos) { + 435 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\BooleanAnd($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 417 => static function ($self, $stackPos) { + 436 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\LogicalOr($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 418 => static function ($self, $stackPos) { + 437 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\LogicalAnd($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 419 => static function ($self, $stackPos) { + 438 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\LogicalXor($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 420 => static function ($self, $stackPos) { + 439 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\BitwiseOr($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 421 => static function ($self, $stackPos) { + 440 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\BitwiseAnd($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 422 => static function ($self, $stackPos) { + 441 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\BitwiseAnd($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 423 => static function ($self, $stackPos) { + 442 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\BitwiseXor($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 424 => static function ($self, $stackPos) { + 443 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Concat($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 425 => static function ($self, $stackPos) { + 444 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Plus($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 426 => static function ($self, $stackPos) { + 445 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Minus($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 427 => static function ($self, $stackPos) { + 446 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Mul($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 428 => static function ($self, $stackPos) { + 447 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Div($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 429 => static function ($self, $stackPos) { + 448 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Mod($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 430 => static function ($self, $stackPos) { + 449 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\ShiftLeft($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 431 => static function ($self, $stackPos) { + 450 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\ShiftRight($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 432 => static function ($self, $stackPos) { + 451 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Pow($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 433 => static function ($self, $stackPos) { + 452 => static function ($self, $stackPos) { $self->semValue = new Expr\UnaryPlus($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 434 => static function ($self, $stackPos) { + 453 => static function ($self, $stackPos) { $self->semValue = new Expr\UnaryMinus($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 435 => static function ($self, $stackPos) { + 454 => static function ($self, $stackPos) { $self->semValue = new Expr\BooleanNot($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 436 => static function ($self, $stackPos) { + 455 => static function ($self, $stackPos) { $self->semValue = new Expr\BitwiseNot($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 437 => static function ($self, $stackPos) { + 456 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Identical($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 438 => static function ($self, $stackPos) { + 457 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\NotIdentical($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 439 => static function ($self, $stackPos) { + 458 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Equal($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 440 => static function ($self, $stackPos) { + 459 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\NotEqual($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 441 => static function ($self, $stackPos) { + 460 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Spaceship($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 442 => static function ($self, $stackPos) { + 461 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Smaller($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 443 => static function ($self, $stackPos) { + 462 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\SmallerOrEqual($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 444 => static function ($self, $stackPos) { + 463 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Greater($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 445 => static function ($self, $stackPos) { + 464 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\GreaterOrEqual($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 446 => static function ($self, $stackPos) { + 465 => static function ($self, $stackPos) { $self->semValue = new Expr\Instanceof_($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 447 => static function ($self, $stackPos) { + 466 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 448 => static function ($self, $stackPos) { + 467 => static function ($self, $stackPos) { $self->semValue = new Expr\Ternary($self->semStack[$stackPos-(5-1)], $self->semStack[$stackPos-(5-3)], $self->semStack[$stackPos-(5-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos])); }, - 449 => static function ($self, $stackPos) { + 468 => static function ($self, $stackPos) { $self->semValue = new Expr\Ternary($self->semStack[$stackPos-(4-1)], null, $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 450 => static function ($self, $stackPos) { + 469 => static function ($self, $stackPos) { $self->semValue = new Expr\BinaryOp\Coalesce($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 451 => static function ($self, $stackPos) { + 470 => static function ($self, $stackPos) { $self->semValue = new Expr\Isset_($self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 452 => static function ($self, $stackPos) { + 471 => static function ($self, $stackPos) { $self->semValue = new Expr\Empty_($self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 453 => static function ($self, $stackPos) { + 472 => static function ($self, $stackPos) { $self->semValue = new Expr\Include_($self->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 454 => static function ($self, $stackPos) { + 473 => static function ($self, $stackPos) { $self->semValue = new Expr\Include_($self->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 455 => static function ($self, $stackPos) { + 474 => static function ($self, $stackPos) { $self->semValue = new Expr\Eval_($self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 456 => static function ($self, $stackPos) { + 475 => static function ($self, $stackPos) { $self->semValue = new Expr\Include_($self->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 457 => static function ($self, $stackPos) { + 476 => static function ($self, $stackPos) { $self->semValue = new Expr\Include_($self->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 458 => static function ($self, $stackPos) { + 477 => static function ($self, $stackPos) { $self->semValue = new Expr\Cast\Int_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 459 => static function ($self, $stackPos) { + 478 => static function ($self, $stackPos) { $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos]); $attrs['kind'] = $self->getFloatCastKind($self->semStack[$stackPos-(2-1)]); $self->semValue = new Expr\Cast\Double($self->semStack[$stackPos-(2-2)], $attrs); }, - 460 => static function ($self, $stackPos) { + 479 => static function ($self, $stackPos) { $self->semValue = new Expr\Cast\String_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 461 => static function ($self, $stackPos) { + 480 => static function ($self, $stackPos) { $self->semValue = new Expr\Cast\Array_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 462 => static function ($self, $stackPos) { + 481 => static function ($self, $stackPos) { $self->semValue = new Expr\Cast\Object_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 463 => static function ($self, $stackPos) { + 482 => static function ($self, $stackPos) { $self->semValue = new Expr\Cast\Bool_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 464 => static function ($self, $stackPos) { + 483 => static function ($self, $stackPos) { $self->semValue = new Expr\Cast\Unset_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 465 => static function ($self, $stackPos) { - $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos]); - $attrs['kind'] = strtolower($self->semStack[$stackPos-(2-1)]) === 'exit' ? Expr\Exit_::KIND_EXIT : Expr\Exit_::KIND_DIE; - $self->semValue = new Expr\Exit_($self->semStack[$stackPos-(2-2)], $attrs); + 484 => static function ($self, $stackPos) { + $self->semValue = $self->createExitExpr($self->semStack[$stackPos-(2-1)], $stackPos-(2-1), $self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 466 => static function ($self, $stackPos) { + 485 => static function ($self, $stackPos) { $self->semValue = new Expr\ErrorSuppress($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 467 => null, - 468 => static function ($self, $stackPos) { + 486 => null, + 487 => static function ($self, $stackPos) { $self->semValue = new Expr\ShellExec($self->semStack[$stackPos-(3-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 469 => static function ($self, $stackPos) { + 488 => static function ($self, $stackPos) { $self->semValue = new Expr\Print_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 470 => static function ($self, $stackPos) { + 489 => static function ($self, $stackPos) { $self->semValue = new Expr\Yield_(null, null, $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 471 => static function ($self, $stackPos) { + 490 => static function ($self, $stackPos) { $self->semValue = new Expr\Yield_($self->semStack[$stackPos-(2-2)], null, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 472 => static function ($self, $stackPos) { + 491 => static function ($self, $stackPos) { $self->semValue = new Expr\Yield_($self->semStack[$stackPos-(4-4)], $self->semStack[$stackPos-(4-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 473 => static function ($self, $stackPos) { + 492 => static function ($self, $stackPos) { $self->semValue = new Expr\YieldFrom($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 474 => static function ($self, $stackPos) { + 493 => static function ($self, $stackPos) { $self->semValue = new Expr\Throw_($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 475 => static function ($self, $stackPos) { + 494 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrowFunction(['static' => false, 'byRef' => $self->semStack[$stackPos-(8-2)], 'params' => $self->semStack[$stackPos-(8-4)], 'returnType' => $self->semStack[$stackPos-(8-6)], 'expr' => $self->semStack[$stackPos-(8-8)], 'attrGroups' => []], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); }, - 476 => static function ($self, $stackPos) { + 495 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrowFunction(['static' => true, 'byRef' => $self->semStack[$stackPos-(9-3)], 'params' => $self->semStack[$stackPos-(9-5)], 'returnType' => $self->semStack[$stackPos-(9-7)], 'expr' => $self->semStack[$stackPos-(9-9)], 'attrGroups' => []], $self->getAttributes($self->tokenStartStack[$stackPos-(9-1)], $self->tokenEndStack[$stackPos])); }, - 477 => static function ($self, $stackPos) { + 496 => static function ($self, $stackPos) { $self->semValue = new Expr\Closure(['static' => false, 'byRef' => $self->semStack[$stackPos-(8-2)], 'params' => $self->semStack[$stackPos-(8-4)], 'uses' => $self->semStack[$stackPos-(8-6)], 'returnType' => $self->semStack[$stackPos-(8-7)], 'stmts' => $self->semStack[$stackPos-(8-8)], 'attrGroups' => []], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])); }, - 478 => static function ($self, $stackPos) { + 497 => static function ($self, $stackPos) { $self->semValue = new Expr\Closure(['static' => true, 'byRef' => $self->semStack[$stackPos-(9-3)], 'params' => $self->semStack[$stackPos-(9-5)], 'uses' => $self->semStack[$stackPos-(9-7)], 'returnType' => $self->semStack[$stackPos-(9-8)], 'stmts' => $self->semStack[$stackPos-(9-9)], 'attrGroups' => []], $self->getAttributes($self->tokenStartStack[$stackPos-(9-1)], $self->tokenEndStack[$stackPos])); }, - 479 => static function ($self, $stackPos) { + 498 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrowFunction(['static' => false, 'byRef' => $self->semStack[$stackPos-(9-3)], 'params' => $self->semStack[$stackPos-(9-5)], 'returnType' => $self->semStack[$stackPos-(9-7)], 'expr' => $self->semStack[$stackPos-(9-9)], 'attrGroups' => $self->semStack[$stackPos-(9-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(9-1)], $self->tokenEndStack[$stackPos])); }, - 480 => static function ($self, $stackPos) { + 499 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrowFunction(['static' => true, 'byRef' => $self->semStack[$stackPos-(10-4)], 'params' => $self->semStack[$stackPos-(10-6)], 'returnType' => $self->semStack[$stackPos-(10-8)], 'expr' => $self->semStack[$stackPos-(10-10)], 'attrGroups' => $self->semStack[$stackPos-(10-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(10-1)], $self->tokenEndStack[$stackPos])); }, - 481 => static function ($self, $stackPos) { + 500 => static function ($self, $stackPos) { $self->semValue = new Expr\Closure(['static' => false, 'byRef' => $self->semStack[$stackPos-(9-3)], 'params' => $self->semStack[$stackPos-(9-5)], 'uses' => $self->semStack[$stackPos-(9-7)], 'returnType' => $self->semStack[$stackPos-(9-8)], 'stmts' => $self->semStack[$stackPos-(9-9)], 'attrGroups' => $self->semStack[$stackPos-(9-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(9-1)], $self->tokenEndStack[$stackPos])); }, - 482 => static function ($self, $stackPos) { + 501 => static function ($self, $stackPos) { $self->semValue = new Expr\Closure(['static' => true, 'byRef' => $self->semStack[$stackPos-(10-4)], 'params' => $self->semStack[$stackPos-(10-6)], 'uses' => $self->semStack[$stackPos-(10-8)], 'returnType' => $self->semStack[$stackPos-(10-9)], 'stmts' => $self->semStack[$stackPos-(10-10)], 'attrGroups' => $self->semStack[$stackPos-(10-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(10-1)], $self->tokenEndStack[$stackPos])); }, - 483 => static function ($self, $stackPos) { + 502 => static function ($self, $stackPos) { $self->semValue = array(new Stmt\Class_(null, ['type' => $self->semStack[$stackPos-(8-2)], 'extends' => $self->semStack[$stackPos-(8-4)], 'implements' => $self->semStack[$stackPos-(8-5)], 'stmts' => $self->semStack[$stackPos-(8-7)], 'attrGroups' => $self->semStack[$stackPos-(8-1)]], $self->getAttributes($self->tokenStartStack[$stackPos-(8-1)], $self->tokenEndStack[$stackPos])), $self->semStack[$stackPos-(8-3)]); $self->checkClass($self->semValue[0], -1); }, - 484 => static function ($self, $stackPos) { + 503 => static function ($self, $stackPos) { $self->semValue = new Expr\New_($self->semStack[$stackPos-(3-2)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 485 => static function ($self, $stackPos) { + 504 => static function ($self, $stackPos) { list($class, $ctorArgs) = $self->semStack[$stackPos-(2-2)]; $self->semValue = new Expr\New_($class, $ctorArgs, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 486 => static function ($self, $stackPos) { + 505 => static function ($self, $stackPos) { $self->semValue = new Expr\New_($self->semStack[$stackPos-(2-2)], [], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 487 => null, - 488 => null, - 489 => static function ($self, $stackPos) { + 506 => null, + 507 => null, + 508 => static function ($self, $stackPos) { $self->semValue = array(); }, - 490 => static function ($self, $stackPos) { + 509 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(4-3)]; }, - 491 => null, - 492 => static function ($self, $stackPos) { + 510 => null, + 511 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 493 => static function ($self, $stackPos) { + 512 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 494 => static function ($self, $stackPos) { + 513 => static function ($self, $stackPos) { $self->semValue = new Node\ClosureUse($self->semStack[$stackPos-(2-2)], $self->semStack[$stackPos-(2-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 495 => static function ($self, $stackPos) { + 514 => static function ($self, $stackPos) { $self->semValue = new Name($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 496 => static function ($self, $stackPos) { + 515 => static function ($self, $stackPos) { $self->semValue = new Expr\FuncCall($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 497 => static function ($self, $stackPos) { + 516 => static function ($self, $stackPos) { $self->semValue = new Expr\FuncCall($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 498 => static function ($self, $stackPos) { + 517 => static function ($self, $stackPos) { $self->semValue = new Expr\FuncCall($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 499 => static function ($self, $stackPos) { + 518 => static function ($self, $stackPos) { $self->semValue = new Expr\StaticCall($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 500 => static function ($self, $stackPos) { + 519 => static function ($self, $stackPos) { $self->semValue = new Name($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 501 => null, - 502 => static function ($self, $stackPos) { + 520 => null, + 521 => static function ($self, $stackPos) { $self->semValue = new Name($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 503 => static function ($self, $stackPos) { + 522 => static function ($self, $stackPos) { $self->semValue = new Name($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 504 => static function ($self, $stackPos) { + 523 => static function ($self, $stackPos) { $self->semValue = new Name\FullyQualified(substr($self->semStack[$stackPos-(1-1)], 1), $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 505 => static function ($self, $stackPos) { + 524 => static function ($self, $stackPos) { $self->semValue = new Name\Relative(substr($self->semStack[$stackPos-(1-1)], 10), $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 506 => null, - 507 => null, - 508 => static function ($self, $stackPos) { + 525 => null, + 526 => null, + 527 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 509 => static function ($self, $stackPos) { + 528 => static function ($self, $stackPos) { $self->semValue = new Expr\Error($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); $self->errorState = 2; }, - 510 => null, - 511 => null, - 512 => static function ($self, $stackPos) { - $self->semValue = null; - }, - 513 => static function ($self, $stackPos) { - $self->semValue = $self->semStack[$stackPos-(3-2)]; - }, - 514 => static function ($self, $stackPos) { + 529 => null, + 530 => null, + 531 => static function ($self, $stackPos) { $self->semValue = array(); }, - 515 => static function ($self, $stackPos) { + 532 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); foreach ($self->semValue as $s) { if ($s instanceof Node\InterpolatedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', $self->phpVersion->supportsUnicodeEscapes()); } }; }, - 516 => static function ($self, $stackPos) { + 533 => static function ($self, $stackPos) { foreach ($self->semStack[$stackPos-(1-1)] as $s) { if ($s instanceof Node\InterpolatedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', $self->phpVersion->supportsUnicodeEscapes()); } }; $self->semValue = $self->semStack[$stackPos-(1-1)]; }, - 517 => static function ($self, $stackPos) { + 534 => static function ($self, $stackPos) { $self->semValue = array(); }, - 518 => null, - 519 => static function ($self, $stackPos) { + 535 => null, + 536 => static function ($self, $stackPos) { $self->semValue = new Expr\ConstFetch($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 520 => static function ($self, $stackPos) { + 537 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\Line($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 521 => static function ($self, $stackPos) { + 538 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\File($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 522 => static function ($self, $stackPos) { + 539 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\Dir($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 523 => static function ($self, $stackPos) { + 540 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\Class_($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 524 => static function ($self, $stackPos) { + 541 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\Trait_($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 525 => static function ($self, $stackPos) { + 542 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\Method($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 526 => static function ($self, $stackPos) { + 543 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\Function_($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 527 => static function ($self, $stackPos) { + 544 => static function ($self, $stackPos) { $self->semValue = new Scalar\MagicConst\Namespace_($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 528 => static function ($self, $stackPos) { + 545 => static function ($self, $stackPos) { + $self->semValue = new Scalar\MagicConst\Property($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); + }, + 546 => static function ($self, $stackPos) { $self->semValue = new Expr\ClassConstFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 529 => static function ($self, $stackPos) { + 547 => static function ($self, $stackPos) { $self->semValue = new Expr\ClassConstFetch($self->semStack[$stackPos-(5-1)], $self->semStack[$stackPos-(5-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos])); }, - 530 => static function ($self, $stackPos) { + 548 => static function ($self, $stackPos) { $self->semValue = new Expr\ClassConstFetch($self->semStack[$stackPos-(3-1)], new Expr\Error($self->getAttributes($self->tokenStartStack[$stackPos-(3-3)], $self->tokenEndStack[$stackPos-(3-3)])), $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); $self->errorState = 2; }, - 531 => static function ($self, $stackPos) { + 549 => static function ($self, $stackPos) { $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]); $attrs['kind'] = Expr\Array_::KIND_SHORT; $self->semValue = new Expr\Array_($self->semStack[$stackPos-(3-2)], $attrs); }, - 532 => static function ($self, $stackPos) { + 550 => static function ($self, $stackPos) { $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos]); $attrs['kind'] = Expr\Array_::KIND_LONG; $self->semValue = new Expr\Array_($self->semStack[$stackPos-(4-3)], $attrs); $self->createdArrays->attach($self->semValue); }, - 533 => static function ($self, $stackPos) { + 551 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(1-1)]; $self->createdArrays->attach($self->semValue); }, - 534 => static function ($self, $stackPos) { + 552 => static function ($self, $stackPos) { $self->semValue = Scalar\String_::fromString($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos]), $self->phpVersion->supportsUnicodeEscapes()); }, - 535 => static function ($self, $stackPos) { + 553 => static function ($self, $stackPos) { $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]); $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED; foreach ($self->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\InterpolatedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', $self->phpVersion->supportsUnicodeEscapes()); } }; $self->semValue = new Scalar\InterpolatedString($self->semStack[$stackPos-(3-2)], $attrs); }, - 536 => static function ($self, $stackPos) { + 554 => static function ($self, $stackPos) { $self->semValue = $self->parseLNumber($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos]), $self->phpVersion->allowsInvalidOctals()); }, - 537 => static function ($self, $stackPos) { + 555 => static function ($self, $stackPos) { $self->semValue = Scalar\Float_::fromString($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 538 => null, - 539 => null, - 540 => null, - 541 => static function ($self, $stackPos) { + 556 => null, + 557 => null, + 558 => null, + 559 => static function ($self, $stackPos) { $self->semValue = $self->parseDocString($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-2)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]), $self->getAttributes($self->tokenStartStack[$stackPos-(3-3)], $self->tokenEndStack[$stackPos-(3-3)]), true); }, - 542 => static function ($self, $stackPos) { + 560 => static function ($self, $stackPos) { $self->semValue = $self->parseDocString($self->semStack[$stackPos-(2-1)], '', $self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos]), $self->getAttributes($self->tokenStartStack[$stackPos-(2-2)], $self->tokenEndStack[$stackPos-(2-2)]), true); }, - 543 => static function ($self, $stackPos) { + 561 => static function ($self, $stackPos) { $self->semValue = $self->parseDocString($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-2)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]), $self->getAttributes($self->tokenStartStack[$stackPos-(3-3)], $self->tokenEndStack[$stackPos-(3-3)]), true); }, - 544 => static function ($self, $stackPos) { + 562 => static function ($self, $stackPos) { $self->semValue = null; }, - 545 => null, - 546 => null, - 547 => static function ($self, $stackPos) { + 563 => null, + 564 => null, + 565 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 548 => null, - 549 => null, - 550 => null, - 551 => null, - 552 => null, - 553 => null, - 554 => static function ($self, $stackPos) { + 566 => null, + 567 => null, + 568 => null, + 569 => null, + 570 => null, + 571 => null, + 572 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 555 => null, - 556 => null, - 557 => null, - 558 => static function ($self, $stackPos) { - $self->semValue = new Expr\ArrayDimFetch($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); - }, - 559 => static function ($self, $stackPos) { + 573 => null, + 574 => null, + 575 => null, + 576 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrayDimFetch($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 560 => null, - 561 => static function ($self, $stackPos) { + 577 => null, + 578 => static function ($self, $stackPos) { $self->semValue = new Expr\MethodCall($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 562 => static function ($self, $stackPos) { + 579 => static function ($self, $stackPos) { $self->semValue = new Expr\NullsafeMethodCall($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->semStack[$stackPos-(4-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 563 => static function ($self, $stackPos) { + 580 => static function ($self, $stackPos) { $self->semValue = null; }, - 564 => null, - 565 => null, - 566 => null, - 567 => static function ($self, $stackPos) { + 581 => null, + 582 => null, + 583 => null, + 584 => static function ($self, $stackPos) { $self->semValue = new Expr\PropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 568 => static function ($self, $stackPos) { + 585 => static function ($self, $stackPos) { $self->semValue = new Expr\NullsafePropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 569 => null, - 570 => static function ($self, $stackPos) { + 586 => null, + 587 => static function ($self, $stackPos) { $self->semValue = new Expr\Variable($self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 571 => static function ($self, $stackPos) { + 588 => static function ($self, $stackPos) { $self->semValue = new Expr\Variable($self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 572 => static function ($self, $stackPos) { + 589 => static function ($self, $stackPos) { $self->semValue = new Expr\Variable(new Expr\Error($self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])), $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); $self->errorState = 2; }, - 573 => static function ($self, $stackPos) { + 590 => static function ($self, $stackPos) { $var = $self->semStack[$stackPos-(1-1)]->name; $self->semValue = \is_string($var) ? new Node\VarLikeIdentifier($var, $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])) : $var; }, - 574 => static function ($self, $stackPos) { + 591 => static function ($self, $stackPos) { $self->semValue = new Expr\StaticPropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 575 => null, - 576 => static function ($self, $stackPos) { - $self->semValue = new Expr\ArrayDimFetch($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); - }, - 577 => static function ($self, $stackPos) { + 592 => null, + 593 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrayDimFetch($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 578 => static function ($self, $stackPos) { + 594 => static function ($self, $stackPos) { $self->semValue = new Expr\PropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 579 => static function ($self, $stackPos) { + 595 => static function ($self, $stackPos) { $self->semValue = new Expr\NullsafePropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 580 => static function ($self, $stackPos) { + 596 => static function ($self, $stackPos) { $self->semValue = new Expr\StaticPropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 581 => static function ($self, $stackPos) { + 597 => static function ($self, $stackPos) { $self->semValue = new Expr\StaticPropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 582 => null, - 583 => static function ($self, $stackPos) { + 598 => null, + 599 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 584 => null, - 585 => null, - 586 => static function ($self, $stackPos) { + 600 => null, + 601 => null, + 602 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 587 => null, - 588 => static function ($self, $stackPos) { + 603 => null, + 604 => static function ($self, $stackPos) { $self->semValue = new Expr\Error($self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); $self->errorState = 2; }, - 589 => static function ($self, $stackPos) { + 605 => static function ($self, $stackPos) { $self->semValue = new Expr\List_($self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); $self->semValue->setAttribute('kind', Expr\List_::KIND_LIST); $self->postprocessList($self->semValue); }, - 590 => static function ($self, $stackPos) { + 606 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(1-1)]; $end = count($self->semValue)-1; if ($self->semValue[$end]->value instanceof Expr\Error) array_pop($self->semValue); }, - 591 => null, - 592 => static function ($self, $stackPos) { + 607 => null, + 608 => static function ($self, $stackPos) { /* do nothing -- prevent default action of $$=$self->semStack[$1]. See $551. */ }, - 593 => static function ($self, $stackPos) { + 609 => static function ($self, $stackPos) { $self->semStack[$stackPos-(3-1)][] = $self->semStack[$stackPos-(3-3)]; $self->semValue = $self->semStack[$stackPos-(3-1)]; }, - 594 => static function ($self, $stackPos) { + 610 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 595 => static function ($self, $stackPos) { + 611 => static function ($self, $stackPos) { $self->semValue = new Node\ArrayItem($self->semStack[$stackPos-(1-1)], null, false, $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 596 => static function ($self, $stackPos) { + 612 => static function ($self, $stackPos) { $self->semValue = new Node\ArrayItem($self->semStack[$stackPos-(2-2)], null, true, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 597 => static function ($self, $stackPos) { + 613 => static function ($self, $stackPos) { $self->semValue = new Node\ArrayItem($self->semStack[$stackPos-(1-1)], null, false, $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 598 => static function ($self, $stackPos) { + 614 => static function ($self, $stackPos) { $self->semValue = new Node\ArrayItem($self->semStack[$stackPos-(3-3)], $self->semStack[$stackPos-(3-1)], false, $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 599 => static function ($self, $stackPos) { + 615 => static function ($self, $stackPos) { $self->semValue = new Node\ArrayItem($self->semStack[$stackPos-(4-4)], $self->semStack[$stackPos-(4-1)], true, $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 600 => static function ($self, $stackPos) { + 616 => static function ($self, $stackPos) { $self->semValue = new Node\ArrayItem($self->semStack[$stackPos-(3-3)], $self->semStack[$stackPos-(3-1)], false, $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 601 => static function ($self, $stackPos) { + 617 => static function ($self, $stackPos) { $self->semValue = new Node\ArrayItem($self->semStack[$stackPos-(2-2)], null, false, $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos]), true); }, - 602 => static function ($self, $stackPos) { + 618 => static function ($self, $stackPos) { /* Create an Error node now to remember the position. We'll later either report an error, or convert this into a null element, depending on whether this is a creation or destructuring context. */ $attrs = $self->createEmptyElemAttributes($self->tokenPos); $self->semValue = new Node\ArrayItem(new Expr\Error($attrs), null, false, $attrs); }, - 603 => static function ($self, $stackPos) { + 619 => static function ($self, $stackPos) { $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; }, - 604 => static function ($self, $stackPos) { + 620 => static function ($self, $stackPos) { $self->semStack[$stackPos-(2-1)][] = $self->semStack[$stackPos-(2-2)]; $self->semValue = $self->semStack[$stackPos-(2-1)]; }, - 605 => static function ($self, $stackPos) { + 621 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(1-1)]); }, - 606 => static function ($self, $stackPos) { + 622 => static function ($self, $stackPos) { $self->semValue = array($self->semStack[$stackPos-(2-1)], $self->semStack[$stackPos-(2-2)]); }, - 607 => static function ($self, $stackPos) { + 623 => static function ($self, $stackPos) { $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos]); $attrs['rawValue'] = $self->semStack[$stackPos-(1-1)]; $self->semValue = new Node\InterpolatedStringPart($self->semStack[$stackPos-(1-1)], $attrs); }, - 608 => static function ($self, $stackPos) { + 624 => static function ($self, $stackPos) { $self->semValue = new Expr\Variable($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 609 => null, - 610 => static function ($self, $stackPos) { + 625 => null, + 626 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrayDimFetch($self->semStack[$stackPos-(4-1)], $self->semStack[$stackPos-(4-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos])); }, - 611 => static function ($self, $stackPos) { + 627 => static function ($self, $stackPos) { $self->semValue = new Expr\PropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 612 => static function ($self, $stackPos) { + 628 => static function ($self, $stackPos) { $self->semValue = new Expr\NullsafePropertyFetch($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 613 => static function ($self, $stackPos) { + 629 => static function ($self, $stackPos) { $self->semValue = new Expr\Variable($self->semStack[$stackPos-(3-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 614 => static function ($self, $stackPos) { + 630 => static function ($self, $stackPos) { $self->semValue = new Expr\Variable($self->semStack[$stackPos-(3-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); }, - 615 => static function ($self, $stackPos) { + 631 => static function ($self, $stackPos) { $self->semValue = new Expr\ArrayDimFetch($self->semStack[$stackPos-(6-2)], $self->semStack[$stackPos-(6-4)], $self->getAttributes($self->tokenStartStack[$stackPos-(6-1)], $self->tokenEndStack[$stackPos])); }, - 616 => static function ($self, $stackPos) { + 632 => static function ($self, $stackPos) { $self->semValue = $self->semStack[$stackPos-(3-2)]; }, - 617 => static function ($self, $stackPos) { + 633 => static function ($self, $stackPos) { $self->semValue = new Scalar\String_($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 618 => static function ($self, $stackPos) { + 634 => static function ($self, $stackPos) { $self->semValue = $self->parseNumString($self->semStack[$stackPos-(1-1)], $self->getAttributes($self->tokenStartStack[$stackPos-(1-1)], $self->tokenEndStack[$stackPos])); }, - 619 => static function ($self, $stackPos) { + 635 => static function ($self, $stackPos) { $self->semValue = $self->parseNumString('-' . $self->semStack[$stackPos-(2-2)], $self->getAttributes($self->tokenStartStack[$stackPos-(2-1)], $self->tokenEndStack[$stackPos])); }, - 620 => null, + 636 => null, ]; } } diff --git a/vendor/nikic/php-parser/lib/PhpParser/ParserAbstract.php b/vendor/nikic/php-parser/lib/PhpParser/ParserAbstract.php index 42723313..3d1e4eed 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/ParserAbstract.php +++ b/vendor/nikic/php-parser/lib/PhpParser/ParserAbstract.php @@ -7,6 +7,7 @@ * turn is based on work by Masato Bito. */ +use PhpParser\Node\Arg; use PhpParser\Node\Expr; use PhpParser\Node\Expr\Array_; use PhpParser\Node\Expr\Cast\Double; @@ -14,6 +15,7 @@ use PhpParser\Node\InterpolatedStringPart; use PhpParser\Node\Name; use PhpParser\Node\Param; +use PhpParser\Node\PropertyHook; use PhpParser\Node\Scalar\InterpolatedString; use PhpParser\Node\Scalar\Int_; use PhpParser\Node\Scalar\String_; @@ -1137,45 +1139,87 @@ protected function checkClassMethod(ClassMethod $node, int $modifierPos): void { } protected function checkClassConst(ClassConst $node, int $modifierPos): void { - if ($node->flags & Modifiers::STATIC) { + foreach ([Modifiers::STATIC, Modifiers::ABSTRACT, Modifiers::READONLY] as $modifier) { + if ($node->flags & $modifier) { + $this->emitError(new Error( + "Cannot use '" . Modifiers::toString($modifier) . "' as constant modifier", + $this->getAttributesAt($modifierPos))); + } + } + } + + protected function checkUseUse(UseItem $node, int $namePos): void { + if ($node->alias && $node->alias->isSpecialClassName()) { $this->emitError(new Error( - "Cannot use 'static' as constant modifier", - $this->getAttributesAt($modifierPos))); + sprintf( + 'Cannot use %s as %s because \'%2$s\' is a special class name', + $node->name, $node->alias + ), + $this->getAttributesAt($namePos) + )); } - if ($node->flags & Modifiers::ABSTRACT) { + } + + /** @param PropertyHook[] $hooks */ + protected function checkPropertyHookList(array $hooks, int $hookPos): void { + if (empty($hooks)) { $this->emitError(new Error( - "Cannot use 'abstract' as constant modifier", - $this->getAttributesAt($modifierPos))); + 'Property hook list cannot be empty', $this->getAttributesAt($hookPos))); } - if ($node->flags & Modifiers::READONLY) { + } + + protected function checkPropertyHook(PropertyHook $hook, ?int $paramListPos): void { + $name = $hook->name->toLowerString(); + if ($name !== 'get' && $name !== 'set') { $this->emitError(new Error( - "Cannot use 'readonly' as constant modifier", - $this->getAttributesAt($modifierPos))); + 'Unknown hook "' . $hook->name . '", expected "get" or "set"', + $hook->name->getAttributes())); + } + if ($name === 'get' && $paramListPos !== null) { + $this->emitError(new Error( + 'get hook must not have a parameter list', $this->getAttributesAt($paramListPos))); } } - protected function checkProperty(Property $node, int $modifierPos): void { - if ($node->flags & Modifiers::ABSTRACT) { - $this->emitError(new Error('Properties cannot be declared abstract', - $this->getAttributesAt($modifierPos))); + protected function checkPropertyHookModifiers(int $a, int $b, int $modifierPos): void { + try { + Modifiers::verifyModifier($a, $b); + } catch (Error $error) { + $error->setAttributes($this->getAttributesAt($modifierPos)); + $this->emitError($error); } - if ($node->flags & Modifiers::FINAL) { - $this->emitError(new Error('Properties cannot be declared final', + if ($b != Modifiers::FINAL) { + $this->emitError(new Error( + 'Cannot use the ' . Modifiers::toString($b) . ' modifier on a property hook', $this->getAttributesAt($modifierPos))); } } - protected function checkUseUse(UseItem $node, int $namePos): void { - if ($node->alias && $node->alias->isSpecialClassName()) { - $this->emitError(new Error( - sprintf( - 'Cannot use %s as %s because \'%2$s\' is a special class name', - $node->name, $node->alias - ), - $this->getAttributesAt($namePos) - )); + /** @param array $args */ + private function isSimpleExit(array $args): bool { + if (\count($args) === 0) { + return true; + } + if (\count($args) === 1) { + $arg = $args[0]; + return $arg instanceof Arg && $arg->name === null && + $arg->byRef === false && $arg->unpack === false; + } + return false; + } + + /** + * @param array $args + * @param array $attrs + */ + protected function createExitExpr(string $name, int $namePos, array $args, array $attrs): Expr { + if ($this->isSimpleExit($args)) { + // Create Exit node for backwards compatibility. + $attrs['kind'] = strtolower($name) === 'exit' ? Expr\Exit_::KIND_EXIT : Expr\Exit_::KIND_DIE; + return new Expr\Exit_(\count($args) === 1 ? $args[0]->value : null, $attrs); } + return new Expr\FuncCall(new Name($name, $this->getAttributesAt($namePos)), $args, $attrs); } /** @@ -1190,42 +1234,23 @@ protected function checkUseUse(UseItem $node, int $namePos): void { protected function createTokenMap(): array { $tokenMap = []; - for ($i = 0; $i < 1000; ++$i) { - if ($i < 256) { - // Single-char tokens use an identity mapping. - $tokenMap[$i] = $i; - } elseif (\T_DOUBLE_COLON === $i) { - // T_DOUBLE_COLON is equivalent to T_PAAMAYIM_NEKUDOTAYIM - $tokenMap[$i] = static::T_PAAMAYIM_NEKUDOTAYIM; - } elseif (\T_OPEN_TAG_WITH_ECHO === $i) { - // T_OPEN_TAG_WITH_ECHO with dropped T_OPEN_TAG results in T_ECHO - $tokenMap[$i] = static::T_ECHO; - } elseif (\T_CLOSE_TAG === $i) { - // T_CLOSE_TAG is equivalent to ';' - $tokenMap[$i] = ord(';'); - } elseif ('UNKNOWN' !== $name = token_name($i)) { - if (defined($name = static::class . '::' . $name)) { - // Other tokens can be mapped directly - $tokenMap[$i] = constant($name); - } + // Single-char tokens use an identity mapping. + for ($i = 0; $i < 256; ++$i) { + $tokenMap[$i] = $i; + } + + foreach ($this->symbolToName as $name) { + if ($name[0] === 'T') { + $tokenMap[\constant($name)] = constant(static::class . '::' . $name); } } - // Assign tokens for which we define compatibility constants, as token_name() does not know them. - $tokenMap[\T_FN] = static::T_FN; - $tokenMap[\T_COALESCE_EQUAL] = static::T_COALESCE_EQUAL; - $tokenMap[\T_NAME_QUALIFIED] = static::T_NAME_QUALIFIED; - $tokenMap[\T_NAME_FULLY_QUALIFIED] = static::T_NAME_FULLY_QUALIFIED; - $tokenMap[\T_NAME_RELATIVE] = static::T_NAME_RELATIVE; - $tokenMap[\T_MATCH] = static::T_MATCH; - $tokenMap[\T_NULLSAFE_OBJECT_OPERATOR] = static::T_NULLSAFE_OBJECT_OPERATOR; - $tokenMap[\T_ATTRIBUTE] = static::T_ATTRIBUTE; - $tokenMap[\T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG] = static::T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG; - $tokenMap[\T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG] = static::T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG; - $tokenMap[\T_ENUM] = static::T_ENUM; - $tokenMap[\T_READONLY] = static::T_READONLY; - - // We have create a map from PHP token IDs to external symbol IDs. + // T_OPEN_TAG_WITH_ECHO with dropped T_OPEN_TAG results in T_ECHO + $tokenMap[\T_OPEN_TAG_WITH_ECHO] = static::T_ECHO; + // T_CLOSE_TAG is equivalent to ';' + $tokenMap[\T_CLOSE_TAG] = ord(';'); + + // We have created a map from PHP token IDs to external symbol IDs. // Now map them to the internal symbol ID. $fullTokenMap = []; foreach ($tokenMap as $phpToken => $extSymbol) { diff --git a/vendor/nikic/php-parser/lib/PhpParser/PhpVersion.php b/vendor/nikic/php-parser/lib/PhpParser/PhpVersion.php index db85b1e5..04ff6ddc 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/PhpVersion.php +++ b/vendor/nikic/php-parser/lib/PhpParser/PhpVersion.php @@ -43,7 +43,7 @@ public static function fromComponents(int $major, int $minor): self { * if it is still under development. */ public static function getNewestSupported(): self { - return self::fromComponents(8, 3); + return self::fromComponents(8, 4); } /** diff --git a/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php b/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php index 6a0349c7..51c54f7d 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php +++ b/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php @@ -23,7 +23,8 @@ protected function pParam(Node\Param $node): string { . ($node->byRef ? '&' : '') . ($node->variadic ? '...' : '') . $this->p($node->var) - . ($node->default ? ' = ' . $this->p($node->default) : ''); + . ($node->default ? ' = ' . $this->p($node->default) : '') + . ($node->hooks ? ' {' . $this->pStmts($node->hooks) . $this->nl . '}' : ''); } protected function pArg(Node\Arg $node): string { @@ -125,6 +126,10 @@ protected function pScalar_MagicConst_Trait(MagicConst\Trait_ $node): string { return '__TRAIT__'; } + protected function pScalar_MagicConst_Property(MagicConst\Property $node): string { + return '__PROPERTY__'; + } + // Scalars private function indentString(string $str): string { @@ -827,7 +832,8 @@ protected function pStmt_Property(Stmt\Property $node): string { return $this->pAttrGroups($node->attrGroups) . (0 === $node->flags ? 'var ' : $this->pModifiers($node->flags)) . ($node->type ? $this->p($node->type) . ' ' : '') - . $this->pCommaSeparated($node->props) . ';'; + . $this->pCommaSeparated($node->props) + . ($node->hooks ? ' {' . $this->pStmts($node->hooks) . $this->nl . '}' : ';'); } protected function pPropertyItem(Node\PropertyItem $node): string { @@ -835,6 +841,15 @@ protected function pPropertyItem(Node\PropertyItem $node): string { . (null !== $node->default ? ' = ' . $this->p($node->default) : ''); } + protected function pPropertyHook(Node\PropertyHook $node): string { + return $this->pAttrGroups($node->attrGroups) + . $this->pModifiers($node->flags) + . ($node->byRef ? '&' : '') . $node->name + . ($node->params ? '(' . $this->pMaybeMultiline($node->params, $this->phpVersion->supportsTrailingCommaInParamList()) . ')' : '') + . (\is_array($node->body) ? ' {' . $this->pStmts($node->body) . $this->nl . '}' + : ($node->body !== null ? ' => ' . $this->p($node->body) : '') . ';'); + } + protected function pStmt_ClassMethod(Stmt\ClassMethod $node): string { return $this->pAttrGroups($node->attrGroups) . $this->pModifiers($node->flags) diff --git a/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php b/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php index 17f27a15..d32be248 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php +++ b/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php @@ -14,6 +14,7 @@ use PhpParser\Node\IntersectionType; use PhpParser\Node\MatchArm; use PhpParser\Node\Param; +use PhpParser\Node\PropertyHook; use PhpParser\Node\Scalar; use PhpParser\Node\Stmt; use PhpParser\Node\UnionType; @@ -105,6 +106,15 @@ abstract class PrettyPrinterAbstract implements PrettyPrinter { /** @var int Current indentation level. */ protected int $indentLevel; + /** @var string String for single level of indentation */ + private string $indent; + /** @var int Width in spaces to indent by. */ + private int $indentWidth; + /** @var bool Whether to use tab indentation. */ + private bool $useTabs; + /** @var int Width in spaces of one tab. */ + private int $tabWidth = 4; + /** @var string Newline style. Does not include current indentation. */ protected string $newline; /** @var string Newline including current indentation. */ @@ -169,12 +179,14 @@ abstract class PrettyPrinterAbstract implements PrettyPrinter { * PHP version while specifying an older target (but the result will * of course not be compatible with the older version in that case). * * string $newline: The newline style to use. Should be "\n" (default) or "\r\n". + * * string $indent: The indentation to use. Should either be all spaces or a single + * tab. Defaults to four spaces (" "). * * bool $shortArraySyntax: Whether to use [] instead of array() as the default array * syntax, if the node does not specify a format. Defaults to whether * the phpVersion support short array syntax. * * @param array{ - * phpVersion?: PhpVersion, newline?: string, shortArraySyntax?: bool + * phpVersion?: PhpVersion, newline?: string, indent?: string, shortArraySyntax?: bool * } $options Dictionary of formatting options */ public function __construct(array $options = []) { @@ -189,6 +201,17 @@ public function __construct(array $options = []) { $options['shortArraySyntax'] ?? $this->phpVersion->supportsShortArraySyntax(); $this->docStringEndToken = $this->phpVersion->supportsFlexibleHeredoc() ? null : '_DOC_STRING_END_' . mt_rand(); + + $this->indent = $indent = $options['indent'] ?? ' '; + if ($indent === "\t") { + $this->useTabs = true; + $this->indentWidth = $this->tabWidth; + } elseif ($indent === \str_repeat(' ', \strlen($indent))) { + $this->useTabs = false; + $this->indentWidth = \strlen($indent); + } else { + throw new \LogicException('Option "indent" must either be all spaces or a single tab'); + } } /** @@ -207,24 +230,29 @@ protected function resetState(): void { */ protected function setIndentLevel(int $level): void { $this->indentLevel = $level; - $this->nl = $this->newline . \str_repeat(' ', $level); + if ($this->useTabs) { + $tabs = \intdiv($level, $this->tabWidth); + $spaces = $level % $this->tabWidth; + $this->nl = $this->newline . \str_repeat("\t", $tabs) . \str_repeat(' ', $spaces); + } else { + $this->nl = $this->newline . \str_repeat(' ', $level); + } } /** * Increase indentation level. */ protected function indent(): void { - $this->indentLevel += 4; - $this->nl .= ' '; + $this->indentLevel += $this->indentWidth; + $this->nl .= $this->indent; } /** * Decrease indentation level. */ protected function outdent(): void { - assert($this->indentLevel >= 4); - $this->indentLevel -= 4; - $this->nl = $this->newline . str_repeat(' ', $this->indentLevel); + assert($this->indentLevel >= $this->indentWidth); + $this->setIndentLevel($this->indentLevel - $this->indentWidth); } /** @@ -536,7 +564,7 @@ public function printFormatPreserving(array $stmts, array $origStmts, array $ori $this->initializeModifierChangeMap(); $this->resetState(); - $this->origTokens = new TokenStream($origTokens); + $this->origTokens = new TokenStream($origTokens, $this->tabWidth); $this->preprocessNodes($stmts); @@ -708,7 +736,7 @@ protected function p( $result .= $extraLeft; $origIndentLevel = $this->indentLevel; - $this->setIndentLevel($this->origTokens->getIndentationBefore($subStartPos) + $indentAdjustment); + $this->setIndentLevel(max($this->origTokens->getIndentationBefore($subStartPos) + $indentAdjustment, 0)); // If it's the same node that was previously in this position, it certainly doesn't // need fixup. It's important to check this here, because our fixup checks are more @@ -811,7 +839,7 @@ protected function pArray( \assert($itemStartPos >= 0 && $itemEndPos >= 0 && $itemStartPos >= $pos); $origIndentLevel = $this->indentLevel; - $lastElemIndentLevel = $this->origTokens->getIndentationBefore($itemStartPos) + $indentAdjustment; + $lastElemIndentLevel = max($this->origTokens->getIndentationBefore($itemStartPos) + $indentAdjustment, 0); $this->setIndentLevel($lastElemIndentLevel); $comments = $arrItem->getComments(); @@ -1195,6 +1223,9 @@ protected function pModifiers(int $modifiers): string { . ($modifiers & Modifiers::PUBLIC ? 'public ' : '') . ($modifiers & Modifiers::PROTECTED ? 'protected ' : '') . ($modifiers & Modifiers::PRIVATE ? 'private ' : '') + . ($modifiers & Modifiers::PUBLIC_SET ? 'public(set) ' : '') + . ($modifiers & Modifiers::PROTECTED_SET ? 'protected(set) ' : '') + . ($modifiers & Modifiers::PRIVATE_SET ? 'private(set) ' : '') . ($modifiers & Modifiers::STATIC ? 'static ' : '') . ($modifiers & Modifiers::READONLY ? 'readonly ' : ''); } @@ -1517,6 +1548,7 @@ protected function initializeListInsertionMap(): void { Stmt\UseUse::class . '->uses' => ', ', MatchArm::class . '->conds' => ', ', AttributeGroup::class . '->attrs' => ', ', + PropertyHook::class . '->params' => ', ', // statement lists Expr\Closure::class . '->stmts' => "\n", @@ -1554,10 +1586,15 @@ protected function initializeListInsertionMap(): void { Expr\Closure::class . '->attrGroups' => ' ', Expr\ArrowFunction::class . '->attrGroups' => ' ', Param::class . '->attrGroups' => ' ', + PropertyHook::class . '->attrGroups' => ' ', + Stmt\Switch_::class . '->cases' => "\n", Stmt\TraitUse::class . '->adaptations' => "\n", Stmt\TryCatch::class . '->stmts' => "\n", Stmt\While_::class . '->stmts' => "\n", + PropertyHook::class . '->body' => "\n", + Stmt\Property::class . '->hooks' => "\n", + Param::class . '->hooks' => "\n", // dummy for top-level context 'File->stmts' => "\n", @@ -1641,6 +1678,7 @@ protected function initializeModifierChangeMap(): void { Stmt\Property::class . '->flags' => ['pModifiers', \T_VARIABLE], PrintableNewAnonClassNode::class . '->flags' => ['pModifiers', \T_CLASS], Param::class . '->flags' => ['pModifiers', \T_VARIABLE], + PropertyHook::class . '->flags' => ['pModifiers', \T_STRING], Expr\Closure::class . '->static' => ['pStatic', \T_FUNCTION], Expr\ArrowFunction::class . '->static' => ['pStatic', \T_FN], //Stmt\TraitUseAdaptation\Alias::class . '->newModifier' => 0, // TODO diff --git a/vendor/nikic/php-parser/lib/PhpParser/compatibility_tokens.php b/vendor/nikic/php-parser/lib/PhpParser/compatibility_tokens.php index 273271dd..13576c42 100644 --- a/vendor/nikic/php-parser/lib/PhpParser/compatibility_tokens.php +++ b/vendor/nikic/php-parser/lib/PhpParser/compatibility_tokens.php @@ -17,6 +17,11 @@ function defineCompatibilityTokens(): void { 'T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG', 'T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG', 'T_READONLY', + // PHP 8.4 + 'T_PROPERTY_C', + 'T_PUBLIC_SET', + 'T_PROTECTED_SET', + 'T_PRIVATE_SET', ]; // PHP-Parser might be used together with another library that also emulates some or all diff --git a/vendor/nunomaduro/collision/composer.json b/vendor/nunomaduro/collision/composer.json index 7bedd235..f2fa08e5 100644 --- a/vendor/nunomaduro/collision/composer.json +++ b/vendor/nunomaduro/collision/composer.json @@ -15,26 +15,26 @@ ], "require": { "php": "^8.1.0", - "filp/whoops": "^2.15.3", + "filp/whoops": "^2.16.0", "nunomaduro/termwind": "^1.15.1", - "symfony/console": "^6.3.4" + "symfony/console": "^6.4.12" }, "conflict": { "laravel/framework": ">=11.0.0" }, "require-dev": { - "brianium/paratest": "^7.3.0", - "laravel/framework": "^10.28.0", - "laravel/pint": "^1.13.3", - "laravel/sail": "^1.25.0", - "laravel/sanctum": "^3.3.1", - "laravel/tinker": "^2.8.2", - "nunomaduro/larastan": "^2.6.4", - "orchestra/testbench-core": "^8.13.0", - "pestphp/pest": "^2.23.2", - "phpunit/phpunit": "^10.4.1", - "sebastian/environment": "^6.0.1", - "spatie/laravel-ignition": "^2.3.1" + "brianium/paratest": "^7.3.1", + "laravel/framework": "^10.48.22", + "laravel/pint": "^1.18.1", + "laravel/sail": "^1.36.0", + "laravel/sanctum": "^3.3.3", + "laravel/tinker": "^2.10.0", + "nunomaduro/larastan": "^2.9.8", + "orchestra/testbench-core": "^8.28.3", + "pestphp/pest": "^2.35.1", + "phpunit/phpunit": "^10.5.36", + "sebastian/environment": "^6.1.0", + "spatie/laravel-ignition": "^2.8.0" }, "autoload-dev": { "psr-4": { diff --git a/vendor/nunomaduro/collision/src/Adapters/Laravel/CollisionServiceProvider.php b/vendor/nunomaduro/collision/src/Adapters/Laravel/CollisionServiceProvider.php index 87c73bd2..cacd8698 100644 --- a/vendor/nunomaduro/collision/src/Adapters/Laravel/CollisionServiceProvider.php +++ b/vendor/nunomaduro/collision/src/Adapters/Laravel/CollisionServiceProvider.php @@ -48,7 +48,7 @@ public function register(): void $solutionsRepository = new IgnitionSolutionsRepository($solutionProviderRepository); } else { - $solutionsRepository = new NullSolutionsRepository(); + $solutionsRepository = new NullSolutionsRepository; } $writer = new Writer($solutionsRepository); diff --git a/vendor/nunomaduro/collision/src/Adapters/Laravel/Commands/TestCommand.php b/vendor/nunomaduro/collision/src/Adapters/Laravel/Commands/TestCommand.php index 1309714f..95fe01d7 100644 --- a/vendor/nunomaduro/collision/src/Adapters/Laravel/Commands/TestCommand.php +++ b/vendor/nunomaduro/collision/src/Adapters/Laravel/Commands/TestCommand.php @@ -195,7 +195,7 @@ protected function commonArguments() if ($this->option('ansi')) { $arguments[] = '--colors=always'; - } elseif ($this->option('no-ansi')) { // @phpstan-ignore-line + } elseif ($this->option('no-ansi')) { $arguments[] = '--colors=never'; } elseif ((new Console)->hasColorSupport()) { $arguments[] = '--colors=always'; @@ -281,7 +281,7 @@ protected function paratestArguments($options) "--runner=\Illuminate\Testing\ParallelRunner", ], $options); - $inputDefinition = new InputDefinition(); + $inputDefinition = new InputDefinition; Options::setInputDefinition($inputDefinition); $input = new ArgvInput($options, $inputDefinition); @@ -379,7 +379,7 @@ protected static function getEnvironmentVariables($path, $file) $vars = []; - foreach ((new Parser())->parse($content) as $entry) { + foreach ((new Parser)->parse($content) as $entry) { $vars[] = $entry->getName(); } diff --git a/vendor/nunomaduro/collision/src/Adapters/Laravel/Exceptions/NotSupportedYetException.php b/vendor/nunomaduro/collision/src/Adapters/Laravel/Exceptions/NotSupportedYetException.php index 18989a19..d73530ba 100644 --- a/vendor/nunomaduro/collision/src/Adapters/Laravel/Exceptions/NotSupportedYetException.php +++ b/vendor/nunomaduro/collision/src/Adapters/Laravel/Exceptions/NotSupportedYetException.php @@ -11,6 +11,4 @@ /** * @internal */ -final class NotSupportedYetException extends RuntimeException implements RenderlessEditor, RenderlessTrace -{ -} +final class NotSupportedYetException extends RuntimeException implements RenderlessEditor, RenderlessTrace {} diff --git a/vendor/nunomaduro/collision/src/Adapters/Laravel/Exceptions/RequirementsException.php b/vendor/nunomaduro/collision/src/Adapters/Laravel/Exceptions/RequirementsException.php index b13b9c29..3827e711 100644 --- a/vendor/nunomaduro/collision/src/Adapters/Laravel/Exceptions/RequirementsException.php +++ b/vendor/nunomaduro/collision/src/Adapters/Laravel/Exceptions/RequirementsException.php @@ -11,6 +11,4 @@ /** * @internal */ -final class RequirementsException extends RuntimeException implements RenderlessEditor, RenderlessTrace -{ -} +final class RequirementsException extends RuntimeException implements RenderlessEditor, RenderlessTrace {} diff --git a/vendor/nunomaduro/collision/src/Adapters/Phpunit/ConfigureIO.php b/vendor/nunomaduro/collision/src/Adapters/Phpunit/ConfigureIO.php index 6ced9814..d382302b 100644 --- a/vendor/nunomaduro/collision/src/Adapters/Phpunit/ConfigureIO.php +++ b/vendor/nunomaduro/collision/src/Adapters/Phpunit/ConfigureIO.php @@ -31,7 +31,7 @@ final class ConfigureIO */ public static function of(InputInterface $input, Output $output): void { - $application = new Application(); + $application = new Application; $reflector = new ReflectionObject($application); $method = $reflector->getMethod('configureIO'); $method->setAccessible(true); diff --git a/vendor/nunomaduro/collision/src/Adapters/Phpunit/Printers/DefaultPrinter.php b/vendor/nunomaduro/collision/src/Adapters/Phpunit/Printers/DefaultPrinter.php index 0725e223..85678d25 100644 --- a/vendor/nunomaduro/collision/src/Adapters/Phpunit/Printers/DefaultPrinter.php +++ b/vendor/nunomaduro/collision/src/Adapters/Phpunit/Printers/DefaultPrinter.php @@ -98,19 +98,19 @@ public function __construct(bool $colors) { $this->output = new ConsoleOutput(OutputInterface::VERBOSITY_NORMAL, $colors); - ConfigureIO::of(new ArgvInput(), $this->output); + ConfigureIO::of(new ArgvInput, $this->output); self::$verbose = $this->output->isVerbose(); $this->style = new Style($this->output); - $this->state = new State(); + $this->state = new State; } /** * If the printer instances should be compact. */ - public static function compact(bool $value = null): bool + public static function compact(?bool $value = null): bool { if (! is_null($value)) { self::$compact = $value; @@ -122,7 +122,7 @@ public static function compact(bool $value = null): bool /** * If the printer instances should profile. */ - public static function profile(bool $value = null): bool + public static function profile(?bool $value = null): bool { if (! is_null($value)) { self::$profile = $value; @@ -165,7 +165,7 @@ public function testFinished(Finished $event): void $test = $event->test(); if (! $test instanceof TestMethod) { - throw new ShouldNotHappen(); + throw new ShouldNotHappen; } if (! $this->state->existsInTestCase($event->test())) { @@ -196,7 +196,7 @@ public function testPreparationStarted(PreparationStarted $event): void $test = $event->test(); if (! $test instanceof TestMethod) { - throw new ShouldNotHappen(); + throw new ShouldNotHappen; } if ($this->state->testCaseHasChanged($test)) { diff --git a/vendor/nunomaduro/collision/src/Adapters/Phpunit/Style.php b/vendor/nunomaduro/collision/src/Adapters/Phpunit/Style.php index c78ca812..5b58a12d 100644 --- a/vendor/nunomaduro/collision/src/Adapters/Phpunit/Style.php +++ b/vendor/nunomaduro/collision/src/Adapters/Phpunit/Style.php @@ -55,7 +55,7 @@ final class Style public function __construct(ConsoleOutputInterface $output) { if (! $output instanceof ConsoleOutput) { - throw new ShouldNotHappen(); + throw new ShouldNotHappen; } $this->terminal = terminal(); @@ -173,7 +173,7 @@ public function writeErrorsSummary(State $state): void array_map(function (TestResult $testResult): void { if (! $testResult->throwable instanceof Throwable) { - throw new ShouldNotHappen(); + throw new ShouldNotHappen; } renderUsing($this->output); @@ -327,7 +327,7 @@ public function writeSlowTests(array $slowTests, Info $telemetry): void */ public function writeError(Throwable $throwable): void { - $writer = (new Writer())->setOutput($this->output); + $writer = (new Writer)->setOutput($this->output); $throwable = new TestException($throwable, $this->output->isVerbose()); diff --git a/vendor/nunomaduro/collision/src/Adapters/Phpunit/Subscribers/EnsurePrinterIsRegisteredSubscriber.php b/vendor/nunomaduro/collision/src/Adapters/Phpunit/Subscribers/EnsurePrinterIsRegisteredSubscriber.php index 97adf303..e51c7116 100644 --- a/vendor/nunomaduro/collision/src/Adapters/Phpunit/Subscribers/EnsurePrinterIsRegisteredSubscriber.php +++ b/vendor/nunomaduro/collision/src/Adapters/Phpunit/Subscribers/EnsurePrinterIsRegisteredSubscriber.php @@ -303,7 +303,7 @@ public static function register(): void if ($shouldRegister) { self::$registered = true; - Facade::instance()->registerSubscriber(new self()); + Facade::instance()->registerSubscriber(new self); } } } diff --git a/vendor/nunomaduro/collision/src/Adapters/Phpunit/TestResult.php b/vendor/nunomaduro/collision/src/Adapters/Phpunit/TestResult.php index 29060510..c02e27fc 100644 --- a/vendor/nunomaduro/collision/src/Adapters/Phpunit/TestResult.php +++ b/vendor/nunomaduro/collision/src/Adapters/Phpunit/TestResult.php @@ -63,7 +63,7 @@ final class TestResult /** * Creates a new TestResult instance. */ - private function __construct(string $id, string $testCaseName, string $description, string $type, string $icon, string $compactIcon, string $color, string $compactColor, Throwable $throwable = null) + private function __construct(string $id, string $testCaseName, string $description, string $type, string $icon, string $compactIcon, string $color, string $compactColor, ?Throwable $throwable = null) { $this->id = $id; $this->testCaseName = $testCaseName; @@ -114,10 +114,10 @@ public function setDuration(float $duration): void /** * Creates a new test from the given test case. */ - public static function fromTestCase(Test $test, string $type, Throwable $throwable = null): self + public static function fromTestCase(Test $test, string $type, ?Throwable $throwable = null): self { if (! $test instanceof TestMethod) { - throw new ShouldNotHappen(); + throw new ShouldNotHappen; } if (is_subclass_of($test->className(), HasPrintableTestCaseName::class)) { @@ -142,10 +142,10 @@ public static function fromTestCase(Test $test, string $type, Throwable $throwab /** * Creates a new test from the given Pest Parallel Test Case. */ - public static function fromPestParallelTestCase(Test $test, string $type, Throwable $throwable = null): self + public static function fromPestParallelTestCase(Test $test, string $type, ?Throwable $throwable = null): self { if (! $test instanceof TestMethod) { - throw new ShouldNotHappen(); + throw new ShouldNotHappen; } if (is_subclass_of($test->className(), HasPrintableTestCaseName::class)) { diff --git a/vendor/nunomaduro/collision/src/ConsoleColor.php b/vendor/nunomaduro/collision/src/ConsoleColor.php index c7736db0..c5b007f7 100644 --- a/vendor/nunomaduro/collision/src/ConsoleColor.php +++ b/vendor/nunomaduro/collision/src/ConsoleColor.php @@ -102,7 +102,7 @@ public function apply(array|string $style, string $text): string } elseif ($this->isValidStyle($s)) { $sequences[] = $this->styleSequence($s); } else { - throw new ShouldNotHappen(); + throw new ShouldNotHappen; } } @@ -218,7 +218,10 @@ private function styleSequence(string $style): ?string preg_match(self::COLOR256_REGEXP, $style, $matches); + // @phpstan-ignore-next-line $type = $matches[1] === 'bg_' ? self::BACKGROUND : self::FOREGROUND; + + // @phpstan-ignore-next-line $value = $matches[2]; return "$type;5;$value"; diff --git a/vendor/nunomaduro/collision/src/Contracts/RenderlessEditor.php b/vendor/nunomaduro/collision/src/Contracts/RenderlessEditor.php index abc50df0..00882433 100644 --- a/vendor/nunomaduro/collision/src/Contracts/RenderlessEditor.php +++ b/vendor/nunomaduro/collision/src/Contracts/RenderlessEditor.php @@ -7,6 +7,4 @@ /** * @internal */ -interface RenderlessEditor -{ -} +interface RenderlessEditor {} diff --git a/vendor/nunomaduro/collision/src/Contracts/RenderlessTrace.php b/vendor/nunomaduro/collision/src/Contracts/RenderlessTrace.php index dc3e69f8..cae0c239 100644 --- a/vendor/nunomaduro/collision/src/Contracts/RenderlessTrace.php +++ b/vendor/nunomaduro/collision/src/Contracts/RenderlessTrace.php @@ -7,6 +7,4 @@ /** * @internal */ -interface RenderlessTrace -{ -} +interface RenderlessTrace {} diff --git a/vendor/nunomaduro/collision/src/Contracts/SolutionsRepository.php b/vendor/nunomaduro/collision/src/Contracts/SolutionsRepository.php index fa43731e..cdc02ba2 100644 --- a/vendor/nunomaduro/collision/src/Contracts/SolutionsRepository.php +++ b/vendor/nunomaduro/collision/src/Contracts/SolutionsRepository.php @@ -4,7 +4,7 @@ namespace NunoMaduro\Collision\Contracts; -use Spatie\Ignition\Contracts\Solution; +use Spatie\ErrorSolutions\Contracts\Solution; use Throwable; /** diff --git a/vendor/nunomaduro/collision/src/Coverage.php b/vendor/nunomaduro/collision/src/Coverage.php index 9a9fe00a..9eba3df9 100644 --- a/vendor/nunomaduro/collision/src/Coverage.php +++ b/vendor/nunomaduro/collision/src/Coverage.php @@ -36,7 +36,7 @@ public static function getPath(): string */ public static function isAvailable(): bool { - $runtime = new Runtime(); + $runtime = new Runtime; if (! $runtime->canCollectCodeCoverage()) { return false; @@ -60,7 +60,7 @@ public static function isAvailable(): bool */ public static function usingXdebug(): bool { - return (new Runtime())->hasXdebug(); + return (new Runtime)->hasXdebug(); } /** diff --git a/vendor/nunomaduro/collision/src/Handler.php b/vendor/nunomaduro/collision/src/Handler.php index 705645d8..f50faba6 100644 --- a/vendor/nunomaduro/collision/src/Handler.php +++ b/vendor/nunomaduro/collision/src/Handler.php @@ -22,9 +22,9 @@ final class Handler extends AbstractHandler /** * Creates an instance of the Handler. */ - public function __construct(Writer $writer = null) + public function __construct(?Writer $writer = null) { - $this->writer = $writer ?: new Writer(); + $this->writer = $writer ?: new Writer; } /** diff --git a/vendor/nunomaduro/collision/src/Highlighter.php b/vendor/nunomaduro/collision/src/Highlighter.php index e6625753..a51062f1 100644 --- a/vendor/nunomaduro/collision/src/Highlighter.php +++ b/vendor/nunomaduro/collision/src/Highlighter.php @@ -77,9 +77,9 @@ final class Highlighter /** * Creates an instance of the Highlighter. */ - public function __construct(ConsoleColor $color = null, bool $UTF8 = true) + public function __construct(?ConsoleColor $color = null, bool $UTF8 = true) { - $this->color = $color ?: new ConsoleColor(); + $this->color = $color ?: new ConsoleColor; foreach (self::DEFAULT_THEME as $name => $styles) { if (! $this->color->hasTheme($name)) { @@ -249,7 +249,7 @@ private function colorLines(array $tokenLines): array return $lines; } - private function lineNumbers(array $lines, int $markLine = null): string + private function lineNumbers(array $lines, ?int $markLine = null): string { $lineStrlen = strlen((string) ((int) array_key_last($lines) + 1)); $lineStrlen = $lineStrlen < self::WIDTH ? self::WIDTH : $lineStrlen; diff --git a/vendor/nunomaduro/collision/src/Provider.php b/vendor/nunomaduro/collision/src/Provider.php index 18b60f73..2d5e2935 100644 --- a/vendor/nunomaduro/collision/src/Provider.php +++ b/vendor/nunomaduro/collision/src/Provider.php @@ -27,10 +27,10 @@ final class Provider /** * Creates a new instance of the Provider. */ - public function __construct(RunInterface $run = null, Handler $handler = null) + public function __construct(?RunInterface $run = null, ?Handler $handler = null) { - $this->run = $run ?: new Run(); - $this->handler = $handler ?: new Handler(); + $this->run = $run ?: new Run; + $this->handler = $handler ?: new Handler; } /** diff --git a/vendor/nunomaduro/collision/src/Writer.php b/vendor/nunomaduro/collision/src/Writer.php index 50752472..9ed8a6e8 100644 --- a/vendor/nunomaduro/collision/src/Writer.php +++ b/vendor/nunomaduro/collision/src/Writer.php @@ -76,15 +76,15 @@ final class Writer * Creates an instance of the writer. */ public function __construct( - SolutionsRepository $solutionsRepository = null, - OutputInterface $output = null, - ArgumentFormatter $argumentFormatter = null, - Highlighter $highlighter = null + ?SolutionsRepository $solutionsRepository = null, + ?OutputInterface $output = null, + ?ArgumentFormatter $argumentFormatter = null, + ?Highlighter $highlighter = null ) { - $this->solutionsRepository = $solutionsRepository ?: new NullSolutionsRepository(); - $this->output = $output ?: new ConsoleOutput(); - $this->argumentFormatter = $argumentFormatter ?: new ArgumentFormatter(); - $this->highlighter = $highlighter ?: new Highlighter(); + $this->solutionsRepository = $solutionsRepository ?: new NullSolutionsRepository; + $this->output = $output ?: new ConsoleOutput; + $this->argumentFormatter = $argumentFormatter ?: new ArgumentFormatter; + $this->highlighter = $highlighter ?: new Highlighter; } public function write(Inspector $inspector): void diff --git a/vendor/nunomaduro/laravel-console-task/README.md b/vendor/nunomaduro/laravel-console-task/README.md index 2499f1b2..8dae021e 100644 --- a/vendor/nunomaduro/laravel-console-task/README.md +++ b/vendor/nunomaduro/laravel-console-task/README.md @@ -17,7 +17,7 @@ Laravel Console Task was created by, and is maintained by [Nuno Maduro](https:// > **Requires:** > - **[PHP 8.1+](https://php.net/releases)** -> - **[Laravel 9.0+](https://github.com/laravel/laravel)** +> - **[Laravel 10.0+](https://github.com/laravel/laravel)** Require Laravel Console Task using [Composer](https://getcomposer.org): diff --git a/vendor/nunomaduro/laravel-console-task/composer.json b/vendor/nunomaduro/laravel-console-task/composer.json index b583f616..a78b19aa 100644 --- a/vendor/nunomaduro/laravel-console-task/composer.json +++ b/vendor/nunomaduro/laravel-console-task/composer.json @@ -15,17 +15,22 @@ ], "require": { "php": "^8.1", - "illuminate/console": "^9.0|^10.0", - "illuminate/support": "^9.0|^10.0" + "illuminate/console": "^10.0|^11.0", + "illuminate/support": "^10.0|^11.0" }, "require-dev": { - "pestphp/pest": "^1.22.3" + "pestphp/pest": "^2.34" }, "autoload": { "psr-4": { "NunoMaduro\\LaravelConsoleTask\\": "src/" } }, + "autoload-dev": { + "psr-4": { + "NunoMaduro\\Tests\\LaravelConsoleTask\\": "tests/" + } + }, "config": { "preferred-install": "dist", "sort-packages": true, diff --git a/vendor/nunomaduro/termwind/Makefile b/vendor/nunomaduro/termwind/Makefile deleted file mode 100644 index a71576bf..00000000 --- a/vendor/nunomaduro/termwind/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Well documented Makefiles -DEFAULT_GOAL := help -help: - @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf " \033[36m%-40s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) - -##@ [Docker] -start: ## Spin up the container - docker-compose up -d - -stop: ## Shut down the containers - docker-compose down - -build: ## Build all docker images - docker-compose build - -##@ [Application] -composer: ## Run composer commands. Specify the command e.g. via "make composer ARGS="install|update|require " - docker-compose run --rm app composer $(ARGS) - -lint: ## Run the Linter - docker-compose run --rm app ./vendor/bin/pint -v - -test-lint: ## Run the Linter Test - docker-compose run --rm app ./vendor/bin/pint --test -v - -test-types: ## Run the PHPStan analysis - docker-compose run --rm app ./vendor/bin/phpstan analyse --ansi - -test-unit: ## Run the Pest Test Suite - docker-compose run --rm app ./vendor/bin/pest --colors=always - -test: ## Run the tests. Apply arguments via make test ARGS="--init" - make test-lint && make test-types && make test-unit diff --git a/vendor/nunomaduro/termwind/composer.json b/vendor/nunomaduro/termwind/composer.json index 6c4f59b6..cd29e6cc 100644 --- a/vendor/nunomaduro/termwind/composer.json +++ b/vendor/nunomaduro/termwind/composer.json @@ -10,20 +10,19 @@ } ], "require": { - "php": "^8.0", + "php": "^8.1", "ext-mbstring": "*", - "symfony/console": "^5.3.0|^6.0.0" + "symfony/console": "^6.4.15" }, "require-dev": { - "ergebnis/phpstan-rules": "^1.0.", - "illuminate/console": "^8.0|^9.0", - "illuminate/support": "^8.0|^9.0", - "laravel/pint": "^1.0.0", - "pestphp/pest": "^1.21.0", - "pestphp/pest-plugin-mock": "^1.0", - "phpstan/phpstan": "^1.4.6", - "phpstan/phpstan-strict-rules": "^1.1.0", - "symfony/var-dumper": "^5.2.7|^6.0.0", + "illuminate/console": "^10.48.24", + "illuminate/support": "^10.48.24", + "laravel/pint": "^1.18.2", + "pestphp/pest": "^2.36.0", + "pestphp/pest-plugin-mock": "2.0.0", + "phpstan/phpstan": "^1.12.11", + "phpstan/phpstan-strict-rules": "^1.6.1", + "symfony/var-dumper": "^6.4.15", "thecodingmachine/phpstan-strict-rules": "^1.0.0" }, "autoload": { diff --git a/vendor/nunomaduro/termwind/docker-compose.yml b/vendor/nunomaduro/termwind/docker-compose.yml deleted file mode 100644 index 693b0081..00000000 --- a/vendor/nunomaduro/termwind/docker-compose.yml +++ /dev/null @@ -1,13 +0,0 @@ -version: '3' - -services: - app: - image: termwind-docker - container_name: termwind-docker - stdin_open: true - tty: true - build: - context: . - dockerfile: docker/Dockerfile - volumes: - - .:/usr/src/app diff --git a/vendor/nunomaduro/termwind/docker/Dockerfile b/vendor/nunomaduro/termwind/docker/Dockerfile deleted file mode 100644 index 53732e73..00000000 --- a/vendor/nunomaduro/termwind/docker/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM php:8.2-cli-alpine - -# INSTALL AND UPDATE COMPOSER -COPY --from=composer /usr/bin/composer /usr/bin/composer -RUN composer self-update - -WORKDIR /usr/src/app -COPY . . - -# INSTALL YOUR DEPENDENCIES -RUN composer install --prefer-dist diff --git a/vendor/nunomaduro/termwind/playground.php b/vendor/nunomaduro/termwind/playground.php index 9e6b8100..3f94c391 100644 --- a/vendor/nunomaduro/termwind/playground.php +++ b/vendor/nunomaduro/termwind/playground.php @@ -5,10 +5,18 @@ use function Termwind\render; render(<<<'HTML' -
-
- Lorem ipsum dolor, sit amet consectetur adipisicing elit. Sunt illo et nisi omnis porro at, mollitia harum quas esse, aperiam dolorem ab recusandae fugiat nesciunt doloribus rem eaque nostrum itaque. - DONE -
+
+ 
+  ─                   ─        ─    ─
+│ │                 │ │      │ │  │ │
+│ │     ──,         │ │  ──, │ │  │ │  ─
+│/ \   /  │  │   │  │/  /  │ │/ \─│/  │/
+│   │─/\─/│─/ \─/│─/│──/\─/│─/\─/ │──/│──/
+
+
by ⚙️ Configured
+
{{ $version }}
+ + Create portable PHP CLI applications w/ PHP Micro +
HTML); diff --git a/vendor/nunomaduro/termwind/src/Actions/StyleToMethod.php b/vendor/nunomaduro/termwind/src/Actions/StyleToMethod.php index 6debb8fd..b17bfbf6 100644 --- a/vendor/nunomaduro/termwind/src/Actions/StyleToMethod.php +++ b/vendor/nunomaduro/termwind/src/Actions/StyleToMethod.php @@ -59,8 +59,6 @@ public static function multiple(Styles $styles, string $stylesString): Styles /** * Converts the given style to a method name. - * - * @return Styles */ public function __invoke(string|int ...$arguments): Styles { @@ -98,6 +96,7 @@ public function __invoke(string|int ...$arguments): Styles return $this->__invoke(...$arguments); } + // @phpstan-ignore-next-line return $this->styles ->setStyle($this->style) ->$methodName(...array_reverse($arguments)); diff --git a/vendor/nunomaduro/termwind/src/Components/Anchor.php b/vendor/nunomaduro/termwind/src/Components/Anchor.php index aa29fa20..2a61731a 100644 --- a/vendor/nunomaduro/termwind/src/Components/Anchor.php +++ b/vendor/nunomaduro/termwind/src/Components/Anchor.php @@ -4,6 +4,4 @@ namespace Termwind\Components; -final class Anchor extends Element -{ -} +final class Anchor extends Element {} diff --git a/vendor/nunomaduro/termwind/src/Components/Element.php b/vendor/nunomaduro/termwind/src/Components/Element.php index 9ec8fbfc..9becdb8d 100644 --- a/vendor/nunomaduro/termwind/src/Components/Element.php +++ b/vendor/nunomaduro/termwind/src/Components/Element.php @@ -70,7 +70,7 @@ final public static function fromStyles(OutputInterface $output, array|string $c public function toString(): string { if (is_array($this->content)) { - $inheritance = new InheritStyles(); + $inheritance = new InheritStyles; $this->content = implode('', $inheritance($this->content, $this->styles)); } @@ -83,6 +83,7 @@ public function toString(): string public function __call(string $name, array $arguments): mixed { if (method_exists($this->styles, $name)) { + // @phpstan-ignore-next-line $result = $this->styles->{$name}(...$arguments); if (str_starts_with($name, 'get') || str_starts_with($name, 'has')) { diff --git a/vendor/nunomaduro/termwind/src/Exceptions/ColorNotFound.php b/vendor/nunomaduro/termwind/src/Exceptions/ColorNotFound.php index 0f753dd0..73b4f444 100644 --- a/vendor/nunomaduro/termwind/src/Exceptions/ColorNotFound.php +++ b/vendor/nunomaduro/termwind/src/Exceptions/ColorNotFound.php @@ -9,6 +9,4 @@ /** * @internal */ -final class ColorNotFound extends InvalidArgumentException -{ -} +final class ColorNotFound extends InvalidArgumentException {} diff --git a/vendor/nunomaduro/termwind/src/Exceptions/InvalidChild.php b/vendor/nunomaduro/termwind/src/Exceptions/InvalidChild.php index cb32e996..c75fc87d 100644 --- a/vendor/nunomaduro/termwind/src/Exceptions/InvalidChild.php +++ b/vendor/nunomaduro/termwind/src/Exceptions/InvalidChild.php @@ -9,6 +9,4 @@ /** * @internal */ -final class InvalidChild extends InvalidArgumentException -{ -} +final class InvalidChild extends InvalidArgumentException {} diff --git a/vendor/nunomaduro/termwind/src/Exceptions/InvalidColor.php b/vendor/nunomaduro/termwind/src/Exceptions/InvalidColor.php index d45afa1f..c09e332b 100644 --- a/vendor/nunomaduro/termwind/src/Exceptions/InvalidColor.php +++ b/vendor/nunomaduro/termwind/src/Exceptions/InvalidColor.php @@ -9,6 +9,4 @@ /** * @internal */ -final class InvalidColor extends InvalidArgumentException -{ -} +final class InvalidColor extends InvalidArgumentException {} diff --git a/vendor/nunomaduro/termwind/src/Exceptions/InvalidStyle.php b/vendor/nunomaduro/termwind/src/Exceptions/InvalidStyle.php index 6bcc6dd7..5000f857 100644 --- a/vendor/nunomaduro/termwind/src/Exceptions/InvalidStyle.php +++ b/vendor/nunomaduro/termwind/src/Exceptions/InvalidStyle.php @@ -9,6 +9,4 @@ /** * @internal */ -final class InvalidStyle extends InvalidArgumentException -{ -} +final class InvalidStyle extends InvalidArgumentException {} diff --git a/vendor/nunomaduro/termwind/src/Functions.php b/vendor/nunomaduro/termwind/src/Functions.php index 7ce10393..9b073b2c 100644 --- a/vendor/nunomaduro/termwind/src/Functions.php +++ b/vendor/nunomaduro/termwind/src/Functions.php @@ -14,7 +14,7 @@ /** * Sets the renderer implementation. */ - function renderUsing(OutputInterface|null $renderer): void + function renderUsing(?OutputInterface $renderer): void { Termwind::renderUsing($renderer); } @@ -24,9 +24,9 @@ function renderUsing(OutputInterface|null $renderer): void /** * Creates a new style. * - * @param (Closure(Styles $renderable, string|int ...$arguments): Styles)|null $callback + * @param (Closure(Styles $renderable, string|int ...$arguments): Styles)|null $callback */ - function style(string $name, Closure $callback = null): Style + function style(string $name, ?Closure $callback = null): Style { return StyleRepository::create($name, $callback); } @@ -58,7 +58,7 @@ function terminal(): Terminal * * @param iterable|null $autocomplete */ - function ask(string $question, iterable $autocomplete = null): mixed + function ask(string $question, ?iterable $autocomplete = null): mixed { return (new Question)->ask($question, $autocomplete); } diff --git a/vendor/nunomaduro/termwind/src/Html/CodeRenderer.php b/vendor/nunomaduro/termwind/src/Html/CodeRenderer.php index 6950cfdb..f75898bc 100644 --- a/vendor/nunomaduro/termwind/src/Html/CodeRenderer.php +++ b/vendor/nunomaduro/termwind/src/Html/CodeRenderer.php @@ -173,7 +173,6 @@ private function tokenize(string $source): array * Splits tokens into lines. * * @param array $tokens - * @param int $startLine * @return array> */ private function splitToLines(array $tokens, int $startLine): array @@ -228,8 +227,6 @@ private function colorLines(array $tokenLines): array * Prepends line numbers into lines. * * @param array $lines - * @param int $markLine - * @return string */ private function lineNumbers(array $lines, int $markLine): string { diff --git a/vendor/nunomaduro/termwind/src/Html/TableRenderer.php b/vendor/nunomaduro/termwind/src/Html/TableRenderer.php index 60b73d4e..81859a4b 100644 --- a/vendor/nunomaduro/termwind/src/Html/TableRenderer.php +++ b/vendor/nunomaduro/termwind/src/Html/TableRenderer.php @@ -122,7 +122,7 @@ private function parseFoot(Node $node): void if ($child->isName('tr')) { $rows = iterator_to_array($this->parseRow($child)); if (count($rows) > 0) { - $this->table->addRow(new TableSeparator()); + $this->table->addRow(new TableSeparator); $this->table->addRows($rows); } } @@ -203,7 +203,7 @@ private function parseRow(Node $node): Iterator $border = (int) $node->getAttribute('border'); for ($i = $border; $i--; $i > 0) { - yield new TableSeparator(); + yield new TableSeparator; } } diff --git a/vendor/nunomaduro/termwind/src/HtmlRenderer.php b/vendor/nunomaduro/termwind/src/HtmlRenderer.php index 568c946a..4f4d6b83 100644 --- a/vendor/nunomaduro/termwind/src/HtmlRenderer.php +++ b/vendor/nunomaduro/termwind/src/HtmlRenderer.php @@ -29,7 +29,7 @@ public function render(string $html, int $options): void */ public function parse(string $html): Components\Element { - $dom = new DOMDocument(); + $dom = new DOMDocument; if (strip_tags($html) === $html) { return Termwind::span($html); diff --git a/vendor/nunomaduro/termwind/src/Question.php b/vendor/nunomaduro/termwind/src/Question.php index 289f8667..f20682bd 100644 --- a/vendor/nunomaduro/termwind/src/Question.php +++ b/vendor/nunomaduro/termwind/src/Question.php @@ -27,9 +27,9 @@ final class Question */ private SymfonyQuestionHelper $helper; - public function __construct(SymfonyQuestionHelper $helper = null) + public function __construct(?SymfonyQuestionHelper $helper = null) { - $this->helper = $helper ?? new QuestionHelper(); + $this->helper = $helper ?? new QuestionHelper; } /** @@ -37,7 +37,7 @@ public function __construct(SymfonyQuestionHelper $helper = null) */ public static function setStreamableInput(StreamableInputInterface|null $streamableInput): void { - self::$streamableInput = $streamableInput ?? new ArgvInput(); + self::$streamableInput = $streamableInput ?? new ArgvInput; } /** @@ -45,7 +45,7 @@ public static function setStreamableInput(StreamableInputInterface|null $streama */ public static function getStreamableInput(): StreamableInputInterface { - return self::$streamableInput ??= new ArgvInput(); + return self::$streamableInput ??= new ArgvInput; } /** @@ -53,7 +53,7 @@ public static function getStreamableInput(): StreamableInputInterface * * @param iterable|null $autocomplete */ - public function ask(string $question, iterable $autocomplete = null): mixed + public function ask(string $question, ?iterable $autocomplete = null): mixed { $html = (new HtmlRenderer)->parse($question)->toString(); @@ -73,7 +73,7 @@ public function ask(string $question, iterable $autocomplete = null): mixed $currentHelper = $property->isInitialized($output) ? $property->getValue($output) - : new SymfonyQuestionHelper(); + : new SymfonyQuestionHelper; $property->setValue($output, new QuestionHelper); diff --git a/vendor/nunomaduro/termwind/src/Repositories/Styles.php b/vendor/nunomaduro/termwind/src/Repositories/Styles.php index 6dbada5e..8c1d6f67 100644 --- a/vendor/nunomaduro/termwind/src/Repositories/Styles.php +++ b/vendor/nunomaduro/termwind/src/Repositories/Styles.php @@ -21,10 +21,9 @@ final class Styles /** * Creates a new style from the given arguments. * - * @param (Closure(StylesValueObject $element, string|int ...$arguments): StylesValueObject)|null $callback - * @return Style + * @param (Closure(StylesValueObject $element, string|int ...$arguments): StylesValueObject)|null $callback */ - public static function create(string $name, Closure $callback = null): Style + public static function create(string $name, ?Closure $callback = null): Style { self::$storage[$name] = $style = new Style( $callback ?? static fn (StylesValueObject $styles) => $styles diff --git a/vendor/nunomaduro/termwind/src/Terminal.php b/vendor/nunomaduro/termwind/src/Terminal.php index 6b74885b..d49b941a 100644 --- a/vendor/nunomaduro/termwind/src/Terminal.php +++ b/vendor/nunomaduro/termwind/src/Terminal.php @@ -19,9 +19,9 @@ final class Terminal /** * Creates a new terminal instance. */ - public function __construct(ConsoleTerminal $terminal = null) + public function __construct(?ConsoleTerminal $terminal = null) { - $this->terminal = $terminal ?? new ConsoleTerminal(); + $this->terminal = $terminal ?? new ConsoleTerminal; } /** diff --git a/vendor/nunomaduro/termwind/src/Termwind.php b/vendor/nunomaduro/termwind/src/Termwind.php index 0ce1b515..6dcaaed7 100644 --- a/vendor/nunomaduro/termwind/src/Termwind.php +++ b/vendor/nunomaduro/termwind/src/Termwind.php @@ -25,7 +25,7 @@ final class Termwind */ public static function renderUsing(OutputInterface|null $renderer): void { - self::$renderer = $renderer ?? new ConsoleOutput(); + self::$renderer = $renderer ?? new ConsoleOutput; } /** @@ -278,7 +278,7 @@ public static function breakLine(string $styles = '', array $properties = []): C */ public static function getRenderer(): OutputInterface { - return self::$renderer ??= new ConsoleOutput(); + return self::$renderer ??= new ConsoleOutput; } /** diff --git a/vendor/nunomaduro/termwind/src/ValueObjects/Node.php b/vendor/nunomaduro/termwind/src/ValueObjects/Node.php index 4f82a5d2..d42ca795 100644 --- a/vendor/nunomaduro/termwind/src/ValueObjects/Node.php +++ b/vendor/nunomaduro/termwind/src/ValueObjects/Node.php @@ -14,9 +14,7 @@ final class Node /** * A value object with helper methods for working with DOM node. */ - public function __construct(private \DOMNode $node) - { - } + public function __construct(private \DOMNode $node) {} /** * Gets the value of the node. @@ -34,7 +32,7 @@ public function getValue(): string public function getChildNodes(): Generator { foreach ($this->node->childNodes as $node) { - yield new static($node); + yield new self($node); } } @@ -106,7 +104,7 @@ public function getPreviousSibling(): static|null $node = $this->node; while ($node = $node->previousSibling) { - $node = new static($node); + $node = new self($node); if ($node->isEmpty()) { $node = $node->node; @@ -121,7 +119,7 @@ public function getPreviousSibling(): static|null $node = $node->node; } - return is_null($node) ? null : new static($node); + return is_null($node) ? null : new self($node); } /** @@ -132,7 +130,7 @@ public function getNextSibling(): static|null $node = $this->node; while ($node = $node->nextSibling) { - $node = new static($node); + $node = new self($node); if ($node->isEmpty()) { $node = $node->node; @@ -147,7 +145,7 @@ public function getNextSibling(): static|null $node = $node->node; } - return is_null($node) ? null : new static($node); + return is_null($node) ? null : new self($node); } /** diff --git a/vendor/nunomaduro/termwind/src/ValueObjects/Style.php b/vendor/nunomaduro/termwind/src/ValueObjects/Style.php index bc96e58a..f1242e8a 100644 --- a/vendor/nunomaduro/termwind/src/ValueObjects/Style.php +++ b/vendor/nunomaduro/termwind/src/ValueObjects/Style.php @@ -16,7 +16,7 @@ final class Style /** * Creates a new value object instance. * - * @param Closure(Styles $styles, string|int ...$argument): Styles $callback + * @param Closure(Styles $styles, string|int ...$argument): Styles $callback */ public function __construct(private Closure $callback, private string $color = '') { diff --git a/vendor/nunomaduro/termwind/src/ValueObjects/Styles.php b/vendor/nunomaduro/termwind/src/ValueObjects/Styles.php index 04140cff..b29ee056 100644 --- a/vendor/nunomaduro/termwind/src/ValueObjects/Styles.php +++ b/vendor/nunomaduro/termwind/src/ValueObjects/Styles.php @@ -15,6 +15,7 @@ use Termwind\Exceptions\ColorNotFound; use Termwind\Exceptions\InvalidStyle; use Termwind\Repositories\Styles as StyleRepository; + use function Termwind\terminal; /** @@ -49,11 +50,9 @@ final public function __construct( private array $textModifiers = [], private array $styleModifiers = [], private array $defaultStyles = [] - ) { - } + ) {} /** - * @param Element $element * @return $this */ public function setElement(Element $element): self @@ -854,7 +853,7 @@ private function applyWidth(string $content): string preg_match_all("/\n+/", $content, $matches); - $width *= count($matches[0] ?? []) + 1; + $width *= count($matches[0] ?? []) + 1; // @phpstan-ignore-line $width += mb_strlen($matches[0][0] ?? '', 'UTF-8'); if ($length <= $width) { @@ -940,7 +939,7 @@ private function applyStyling(string $content): string /** * Get the length of the text provided without the styling tags. */ - public function getLength(string $text = null): int + public function getLength(?string $text = null): int { return mb_strlen(preg_replace( self::STYLING_REGEX, @@ -998,7 +997,6 @@ private static function calcWidthFromFraction(string $fraction, array $styles, a throw new InvalidStyle(sprintf('Style [%s] is invalid.', "w-$fraction")); } - /** @@phpstan-ignore-next-line */ $width = (int) floor($width * $matches[1] / $matches[2]); $width -= ($styles['ml'] ?? 0) + ($styles['mr'] ?? 0); @@ -1030,7 +1028,7 @@ public static function getParentWidth(array $styles): int $width = count($matches) !== 3 ? (int) $parentWidth - : (int) floor($width * $matches[1] / $matches[2]); //@phpstan-ignore-line + : (int) floor($width * $matches[1] / $matches[2]); if ($maxWidth > 0) { $width = min($maxWidth, $width); @@ -1052,6 +1050,7 @@ private static function trimText(string $text, int $width): string preg_match_all(self::STYLING_REGEX, $text, $matches, PREG_OFFSET_CAPTURE); $text = rtrim(mb_strimwidth(preg_replace(self::STYLING_REGEX, '', $text) ?? '', 0, $width, '', 'UTF-8')); + // @phpstan-ignore-next-line foreach ($matches[0] ?? [] as [$part, $index]) { $text = substr($text, 0, $index).$part.substr($text, $index, null); } diff --git a/vendor/pestphp/pest/composer.json b/vendor/pestphp/pest/composer.json index cb356505..1f659f0e 100644 --- a/vendor/pestphp/pest/composer.json +++ b/vendor/pestphp/pest/composer.json @@ -19,14 +19,15 @@ "require": { "php": "^8.1.0", "brianium/paratest": "^7.3.1", - "nunomaduro/collision": "^7.10.0|^8.4.0", - "nunomaduro/termwind": "^1.15.1|^2.0.1", + "nunomaduro/collision": "^7.11.0|^8.4.0", + "nunomaduro/termwind": "^1.16.0|^2.1.0", "pestphp/pest-plugin": "^2.1.1", "pestphp/pest-plugin-arch": "^2.7.0", - "phpunit/phpunit": "^10.5.17" + "phpunit/phpunit": "^10.5.36" }, "conflict": { - "phpunit/phpunit": ">10.5.17", + "filp/whoops": "<2.16.0", + "phpunit/phpunit": ">10.5.36", "sebastian/exporter": "<5.1.0", "webmozart/assert": "<1.11.0" }, @@ -51,9 +52,9 @@ ] }, "require-dev": { - "pestphp/pest-dev-tools": "^2.16.0", - "pestphp/pest-plugin-type-coverage": "^2.8.5", - "symfony/process": "^6.4.0|^7.1.3" + "pestphp/pest-dev-tools": "^2.17.0", + "pestphp/pest-plugin-type-coverage": "^2.8.7", + "symfony/process": "^6.4.0|^7.1.5" }, "minimum-stability": "dev", "prefer-stable": true, @@ -73,7 +74,7 @@ "test:refacto": "rector --dry-run", "test:lint": "pint --test", "test:type:check": "phpstan analyse --ansi --memory-limit=-1 --debug", - "test:type:coverage": "php bin/pest --type-coverage --min=100", + "test:type:coverage": "php -d memory_limit=-1 bin/pest --type-coverage --min=100", "test:unit": "php bin/pest --colors=always --exclude-group=integration --compact", "test:inline": "php bin/pest --colors=always --configuration=phpunit.inline.xml", "test:parallel": "php bin/pest --colors=always --exclude-group=integration --parallel --processes=3", diff --git a/vendor/pestphp/pest/src/Concerns/Testable.php b/vendor/pestphp/pest/src/Concerns/Testable.php index 4075caf4..4c0250d3 100644 --- a/vendor/pestphp/pest/src/Concerns/Testable.php +++ b/vendor/pestphp/pest/src/Concerns/Testable.php @@ -234,11 +234,13 @@ protected function tearDown(): void $afterEach = ChainableClosure::bound($this->__afterEach, $afterEach); } - $this->__callClosure($afterEach, func_get_args()); + try { + $this->__callClosure($afterEach, func_get_args()); + } finally { + parent::tearDown(); - parent::tearDown(); - - TestSuite::getInstance()->test = null; + TestSuite::getInstance()->test = null; + } } /** diff --git a/vendor/pestphp/pest/src/Expectation.php b/vendor/pestphp/pest/src/Expectation.php index 42baf54e..8331fbe4 100644 --- a/vendor/pestphp/pest/src/Expectation.php +++ b/vendor/pestphp/pest/src/Expectation.php @@ -441,7 +441,7 @@ public function toUseStrictTypes(): ArchExpectation { return Targeted::make( $this, - fn (ObjectDescription $object): bool => str_contains((string) file_get_contents($object->path), 'declare(strict_types=1);'), + fn (ObjectDescription $object): bool => (bool) preg_match('/^<\?php\s+declare\(.*?strict_types\s?=\s?1.*?\);/', (string) file_get_contents($object->path)), 'to use strict types', FileLineFinder::where(fn (string $line): bool => str_contains($line, 'original, - fn (ObjectDescription $object): bool => ! str_contains((string) file_get_contents($object->path), 'declare(strict_types=1);'), + fn (ObjectDescription $object): bool => ! (bool) preg_match('/^<\?php\s+declare\(.*?strict_types\s?=\s?1.*?\);/', (string) file_get_contents($object->path)), 'not to use strict types', FileLineFinder::where(fn (string $line): bool => str_contains($line, ' $attributes * @return array */ - public function __invoke(TestCaseMethodFactory $method, array $attributes): array // @phpstan-ignore-line + public function __invoke(TestCaseMethodFactory $method, array $attributes): array { return $attributes; } diff --git a/vendor/pestphp/pest/src/Factories/TestCaseFactory.php b/vendor/pestphp/pest/src/Factories/TestCaseFactory.php index 4bdb2f07..07d0c19b 100644 --- a/vendor/pestphp/pest/src/Factories/TestCaseFactory.php +++ b/vendor/pestphp/pest/src/Factories/TestCaseFactory.php @@ -11,6 +11,7 @@ use Pest\Exceptions\DatasetMissing; use Pest\Exceptions\ShouldNotHappen; use Pest\Exceptions\TestAlreadyExist; +use Pest\Exceptions\TestClosureMustNotBeStatic; use Pest\Exceptions\TestDescriptionMissing; use Pest\Factories\Concerns\HigherOrderable; use Pest\Support\Reflection; @@ -193,7 +194,7 @@ final class $className extends $baseClass implements $hasPrintableTestCaseClassF } PHP; - eval($classCode); // @phpstan-ignore-line + eval($classCode); } catch (ParseError $caught) { throw new RuntimeException(sprintf( "Unable to create test case for test file at %s. \n %s", @@ -216,6 +217,14 @@ public function addMethod(TestCaseMethodFactory $method): void throw new TestAlreadyExist($method->filename, $method->description); } + if ( + $method->closure instanceof \Closure && + (new \ReflectionFunction($method->closure))->isStatic() + ) { + + throw new TestClosureMustNotBeStatic($method); + } + if (! $method->receivesArguments()) { if (! $method->closure instanceof \Closure) { throw ShouldNotHappen::fromMessage('The test closure may not be empty.'); diff --git a/vendor/pestphp/pest/src/KernelDump.php b/vendor/pestphp/pest/src/KernelDump.php index 150e44ae..e1c67da5 100644 --- a/vendor/pestphp/pest/src/KernelDump.php +++ b/vendor/pestphp/pest/src/KernelDump.php @@ -40,7 +40,7 @@ public function enable(): void */ public function disable(): void { - @ob_clean(); // @phpstan-ignore-line + @ob_clean(); if ($this->buffer !== '') { $this->flush(); diff --git a/vendor/pestphp/pest/src/Pest.php b/vendor/pestphp/pest/src/Pest.php index 2188a22f..a12b0add 100644 --- a/vendor/pestphp/pest/src/Pest.php +++ b/vendor/pestphp/pest/src/Pest.php @@ -6,7 +6,7 @@ function version(): string { - return '2.35.1'; + return '2.36.0'; } function testDirectory(string $file = ''): string diff --git a/vendor/pestphp/pest/src/Result.php b/vendor/pestphp/pest/src/Result.php index 9b3a83e5..98e9e8b6 100644 --- a/vendor/pestphp/pest/src/Result.php +++ b/vendor/pestphp/pest/src/Result.php @@ -40,9 +40,20 @@ public static function ok(Configuration $configuration, TestResult $result): boo */ public static function exitCode(Configuration $configuration, TestResult $result): int { - if ($result->wasSuccessfulIgnoringPhpunitWarnings() - && ! $result->hasTestTriggeredPhpunitWarningEvents()) { - return self::SUCCESS_EXIT; + if ($result->wasSuccessfulIgnoringPhpunitWarnings()) { + if ($configuration->failOnWarning()) { + $warnings = $result->numberOfTestsWithTestTriggeredPhpunitWarningEvents() + + count($result->warnings()) + + count($result->phpWarnings()); + + if ($warnings > 0) { + return self::FAILURE_EXIT; + } + } + + if (! $result->hasTestTriggeredPhpunitWarningEvents()) { + return self::SUCCESS_EXIT; + } } if ($configuration->failOnEmptyTestSuite() && ResultReflection::numberOfTests($result) === 0) { @@ -54,14 +65,6 @@ public static function exitCode(Configuration $configuration, TestResult $result $returnCode = self::FAILURE_EXIT; } - $warnings = $result->numberOfTestsWithTestTriggeredPhpunitWarningEvents() - + count($result->warnings()) - + count($result->phpWarnings()); - - if ($configuration->failOnWarning() && $warnings > 0) { - $returnCode = self::FAILURE_EXIT; - } - if ($configuration->failOnIncomplete() && $result->hasTestMarkedIncompleteEvents()) { $returnCode = self::FAILURE_EXIT; } diff --git a/vendor/phpdocumentor/reflection-docblock/composer.json b/vendor/phpdocumentor/reflection-docblock/composer.json index cf8f49d3..8105049b 100644 --- a/vendor/phpdocumentor/reflection-docblock/composer.json +++ b/vendor/phpdocumentor/reflection-docblock/composer.json @@ -19,17 +19,17 @@ "webmozart/assert": "^1.9.1", "phpdocumentor/reflection-common": "^2.2", "ext-filter": "*", - "phpstan/phpdoc-parser": "^1.7", + "phpstan/phpdoc-parser": "^1.7|^2.0", "doctrine/deprecations": "^1.1" }, "require-dev": { - "mockery/mockery": "~1.3.5", + "mockery/mockery": "~1.3.5 || ~1.6.0", "phpunit/phpunit": "^9.5", "phpstan/phpstan": "^1.8", "phpstan/phpstan-mockery": "^1.1", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-webmozart-assert": "^1.2", - "vimeo/psalm": "^5.13" + "psalm/phar": "^5.26" }, "autoload": { "psr-4": { diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/ExampleFinder.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/ExampleFinder.php index 7136e28f..0fb24a68 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/ExampleFinder.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/ExampleFinder.php @@ -44,7 +44,7 @@ public function find(Example $example): string $filename = $example->getFilePath(); $file = $this->getExampleFileContents($filename); - if (!$file) { + if ($file === null) { return sprintf('** File not found : %s **', $filename); } @@ -112,7 +112,7 @@ private function getExampleFileContents(string $filename): ?array } } - if (!$normalizedPath) { + if ($normalizedPath === null) { if (is_readable($this->getExamplePathFromSource($filename))) { $normalizedPath = $this->getExamplePathFromSource($filename); } elseif (is_readable($this->getExamplePathFromExampleDirectory($filename))) { @@ -122,7 +122,7 @@ private function getExampleFileContents(string $filename): ?array } } - $lines = $normalizedPath && is_readable($normalizedPath) ? file($normalizedPath) : false; + $lines = $normalizedPath !== null && is_readable($normalizedPath) ? file($normalizedPath) : false; return $lines !== false ? $lines : null; } diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Serializer.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Serializer.php index 31ca29c5..2c257dd5 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Serializer.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Serializer.php @@ -82,7 +82,7 @@ public function getDocComment(DocBlock $docblock): string $indent = str_repeat($this->indentString, $this->indent); $firstIndent = $this->isFirstLineIndented ? $indent : ''; // 3 === strlen(' * ') - $wrapLength = $this->lineLength ? $this->lineLength - strlen($indent) - 3 : null; + $wrapLength = $this->lineLength !== null ? $this->lineLength - strlen($indent) - 3 : null; $text = $this->removeTrailingSpaces( $indent, diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/StandardTagFactory.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/StandardTagFactory.php index 7360a707..d029cd1b 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/StandardTagFactory.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/StandardTagFactory.php @@ -22,6 +22,7 @@ use phpDocumentor\Reflection\DocBlock\Tags\InvalidTag; use phpDocumentor\Reflection\DocBlock\Tags\Link as LinkTag; use phpDocumentor\Reflection\DocBlock\Tags\Method; +use phpDocumentor\Reflection\DocBlock\Tags\Mixin; use phpDocumentor\Reflection\DocBlock\Tags\Param; use phpDocumentor\Reflection\DocBlock\Tags\Property; use phpDocumentor\Reflection\DocBlock\Tags\PropertyRead; @@ -30,6 +31,7 @@ use phpDocumentor\Reflection\DocBlock\Tags\See as SeeTag; use phpDocumentor\Reflection\DocBlock\Tags\Since; use phpDocumentor\Reflection\DocBlock\Tags\Source; +use phpDocumentor\Reflection\DocBlock\Tags\TemplateCovariant; use phpDocumentor\Reflection\DocBlock\Tags\Throws; use phpDocumentor\Reflection\DocBlock\Tags\Uses; use phpDocumentor\Reflection\DocBlock\Tags\Var_; @@ -45,7 +47,6 @@ use function array_merge; use function array_slice; use function call_user_func_array; -use function count; use function get_class; use function is_object; use function preg_match; @@ -80,29 +81,31 @@ final class StandardTagFactory implements TagFactory * FQCN to a class that handles it as an array value. */ private array $tagHandlerMappings = [ - 'author' => Author::class, - 'covers' => Covers::class, - 'deprecated' => Deprecated::class, - // 'example' => '\phpDocumentor\Reflection\DocBlock\Tags\Example', - 'link' => LinkTag::class, - 'method' => Method::class, - 'param' => Param::class, - 'property-read' => PropertyRead::class, - 'property' => Property::class, - 'property-write' => PropertyWrite::class, - 'return' => Return_::class, - 'see' => SeeTag::class, - 'since' => Since::class, - 'source' => Source::class, - 'throw' => Throws::class, - 'throws' => Throws::class, - 'uses' => Uses::class, - 'var' => Var_::class, - 'version' => Version::class, + 'author' => Author::class, + 'covers' => Covers::class, + 'deprecated' => Deprecated::class, + // 'example' => '\phpDocumentor\Reflection\DocBlock\Tags\Example', + 'link' => LinkTag::class, + 'mixin' => Mixin::class, + 'method' => Method::class, + 'param' => Param::class, + 'property-read' => PropertyRead::class, + 'property' => Property::class, + 'property-write' => PropertyWrite::class, + 'return' => Return_::class, + 'see' => SeeTag::class, + 'since' => Since::class, + 'source' => Source::class, + 'template-covariant' => TemplateCovariant::class, + 'throw' => Throws::class, + 'throws' => Throws::class, + 'uses' => Uses::class, + 'var' => Var_::class, + 'version' => Version::class, ]; /** - * @var array> An array with a anotation s a key, and an + * @var array> An array with an annotation as a key, and an * FQCN to a class that handles it as an array value. */ private array $annotationMappings = []; @@ -162,14 +165,14 @@ public function addParameter(string $name, $value): void public function addService(object $service, ?string $alias = null): void { - $this->serviceLocator[$alias ?: get_class($service)] = $service; + $this->serviceLocator[$alias ?? get_class($service)] = $service; } /** {@inheritDoc} */ public function registerTagHandler(string $tagName, $handler): void { Assert::stringNotEmpty($tagName); - if (strpos($tagName, '\\') && $tagName[0] !== '\\') { + if (strpos($tagName, '\\') !== false && $tagName[0] !== '\\') { throw new InvalidArgumentException( 'A namespaced tag must have a leading backslash as it must be fully qualified' ); @@ -201,10 +204,6 @@ private function extractTagParts(string $tagLine): array ); } - if (count($matches) < 3) { - $matches[] = ''; - } - return array_slice($matches, 1); } @@ -323,7 +322,7 @@ private function fetchParametersForHandlerFactoryMethod($handler): array * Returns a copy of this class' Service Locator with added dynamic parameters, * such as the tag's name, body and Context. * - * @param TypeContext $context The Context (namespace and aliasses) that may be + * @param TypeContext $context The Context (namespace and aliases) that may be * passed and is used to resolve FQSENs. * @param string $tagName The name of the tag that may be * passed onto the factory method of the Tag class. diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Deprecated.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Deprecated.php index a55cd914..fff591f9 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Deprecated.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Deprecated.php @@ -62,7 +62,7 @@ public static function create( ?DescriptionFactory $descriptionFactory = null, ?TypeContext $context = null ): self { - if (empty($body)) { + if ($body === null || $body === '') { return new static(); } diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Example.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Example.php index fd9ef6eb..3ddbb686 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Example.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Example.php @@ -94,10 +94,10 @@ public static function create(string $body): ?Tag $filePath = null; $fileUri = null; - if ($matches[1] !== '') { + if (array_key_exists(1, $matches) && $matches[1] !== '') { $filePath = $matches[1]; } else { - $fileUri = $matches[2]; + $fileUri = array_key_exists(2, $matches) ? $matches[2] : ''; } $startingLine = 1; diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php index b1618bfa..872a266f 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php @@ -21,8 +21,10 @@ use PHPStan\PhpDocParser\Parser\PhpDocParser; use PHPStan\PhpDocParser\Parser\TokenIterator; use PHPStan\PhpDocParser\Parser\TypeParser; +use PHPStan\PhpDocParser\ParserConfig; use RuntimeException; +use function class_exists; use function ltrim; use function property_exists; use function rtrim; @@ -44,16 +46,28 @@ class AbstractPHPStanFactory implements Factory public function __construct(PHPStanFactory ...$factories) { - $this->lexer = new Lexer(true); - $constParser = new ConstExprParser(true, true, ['lines' => true, 'indexes' => true]); - $this->parser = new PhpDocParser( - new TypeParser($constParser, true, ['lines' => true, 'indexes' => true]), - $constParser, - true, - true, - ['lines' => true, 'indexes' => true], - true - ); + if (class_exists(ParserConfig::class)) { + $config = new ParserConfig(['indexes' => true, 'lines' => true]); + $this->lexer = new Lexer($config); + $constParser = new ConstExprParser($config); + $this->parser = new PhpDocParser( + $config, + new TypeParser($config, $constParser), + $constParser + ); + } else { + $this->lexer = new Lexer(true); + $constParser = new ConstExprParser(true, true, ['lines' => true, 'indexes' => true]); + $this->parser = new PhpDocParser( + new TypeParser($constParser, true, ['lines' => true, 'indexes' => true]), + $constParser, + true, + true, + ['lines' => true, 'indexes' => true], + true + ); + } + $this->factories = $factories; } @@ -104,12 +118,12 @@ private function tokenizeLine(string $tagLine): TokenIterator $fixed[] = [ rtrim($token[Lexer::VALUE_OFFSET], " \t"), Lexer::TOKEN_PHPDOC_EOL, - $token[2] ?? null, + $token[2] ?? 0, ]; $fixed[] = [ ltrim($token[Lexer::VALUE_OFFSET], "\n\r"), Lexer::TOKEN_HORIZONTAL_WS, - ($token[2] ?? null) + 1, + ($token[2] ?? 0) + 1, ]; continue; } diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodFactory.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodFactory.php index 920be845..17c768f8 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodFactory.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodFactory.php @@ -57,7 +57,9 @@ function (MethodTagValueParameterNode $param) use ($context) { ), $param->isReference, $param->isVariadic, - (string) $param->defaultValue + $param->defaultValue === null ? + MethodParameter::NO_DEFAULT_VALUE : + (string) $param->defaultValue ); }, $tagValue->parameters diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/InvalidTag.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/InvalidTag.php index c7d3cd54..05944ab9 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/InvalidTag.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/InvalidTag.php @@ -27,7 +27,7 @@ * we cannot simply throw exceptions at all time because the exceptions will break the creation of a * docklock. Just silently ignore the exceptions is not an option because the user as an issue to fix. * - * This tag holds that error information until a using application is able to display it. The object wil just behave + * This tag holds that error information until a using application is able to display it. The object will just behave * like any normal tag. So the normal application flow will not break. */ final class InvalidTag implements Tag diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Method.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Method.php index 471ebe95..41e0eed1 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Method.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Method.php @@ -261,10 +261,7 @@ public function __toString(): string { $arguments = []; foreach ($this->parameters as $parameter) { - $arguments[] = $parameter->getType() . ' ' . - ($parameter->isReference() ? '&' : '') . - ($parameter->isVariadic() ? '...' : '') . - '$' . $parameter->getName(); + $arguments[] = (string) $parameter; } $argumentStr = '(' . implode(', ', $arguments) . ')'; diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/MethodParameter.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/MethodParameter.php index 0c85d41d..ceb87024 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/MethodParameter.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/MethodParameter.php @@ -12,6 +12,7 @@ namespace phpDocumentor\Reflection\DocBlock\Tags; +use phpDocumentor\Reflection\DocBlock\Tags\Factory\MethodParameterFactory; use phpDocumentor\Reflection\Type; final class MethodParameter @@ -24,14 +25,20 @@ final class MethodParameter private string $name; - private ?string $defaultValue = null; + /** @var mixed */ + private $defaultValue; + public const NO_DEFAULT_VALUE = '__NO_VALUE__'; + + /** + * @param mixed $defaultValue + */ public function __construct( string $name, Type $type, bool $isReference = false, bool $isVariadic = false, - ?string $defaultValue = null + $defaultValue = self::NO_DEFAULT_VALUE ) { $this->type = $type; $this->isReference = $isReference; @@ -62,6 +69,23 @@ public function isVariadic(): bool public function getDefaultValue(): ?string { - return $this->defaultValue; + if ($this->defaultValue === self::NO_DEFAULT_VALUE) { + return null; + } + + return (new MethodParameterFactory())->format($this->defaultValue); + } + + public function __toString(): string + { + return $this->getType() . ' ' . + ($this->isReference() ? '&' : '') . + ($this->isVariadic() ? '...' : '') . + '$' . $this->getName() . + ( + $this->defaultValue !== self::NO_DEFAULT_VALUE ? + (new MethodParameterFactory())->format($this->defaultValue) : + '' + ); } } diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Param.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Param.php index 19b1b5fb..6d46686d 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Param.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Param.php @@ -160,7 +160,7 @@ public function __toString(): string } $variableName = ''; - if ($this->variableName) { + if ($this->variableName !== null && $this->variableName !== '') { $variableName .= ($this->isReference ? '&' : '') . ($this->isVariadic ? '...' : ''); $variableName .= '$' . $this->variableName; } diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Property.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Property.php index 1287b6cc..3328b080 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Property.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Property.php @@ -111,13 +111,13 @@ public function getVariableName(): ?string */ public function __toString(): string { - if ($this->description) { + if ($this->description !== null) { $description = $this->description->render(); } else { $description = ''; } - if ($this->variableName) { + if ($this->variableName !== null && $this->variableName !== '') { $variableName = '$' . $this->variableName; } else { $variableName = ''; diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyRead.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyRead.php index 2cf8e61a..8ac1eb02 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyRead.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyRead.php @@ -111,13 +111,13 @@ public function getVariableName(): ?string */ public function __toString(): string { - if ($this->description) { + if ($this->description !== null) { $description = $this->description->render(); } else { $description = ''; } - if ($this->variableName) { + if ($this->variableName !== null && $this->variableName !== '') { $variableName = '$' . $this->variableName; } else { $variableName = ''; diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Return_.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Return_.php index f130760a..7e9b0c7a 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Return_.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Return_.php @@ -60,17 +60,4 @@ public static function create( return new static($type, $description); } - - public function __toString(): string - { - if ($this->description) { - $description = $this->description->render(); - } else { - $description = ''; - } - - $type = $this->type ? '' . $this->type : 'mixed'; - - return $type . ($description !== '' ? ' ' . $description : ''); - } } diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Since.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Since.php index 24400fa1..8ec59e91 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Since.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Since.php @@ -59,7 +59,7 @@ public static function create( ?DescriptionFactory $descriptionFactory = null, ?TypeContext $context = null ): ?self { - if (empty($body)) { + if ($body === null || $body === '') { return new static(); } @@ -89,7 +89,7 @@ public function getVersion(): ?string */ public function __toString(): string { - if ($this->description) { + if ($this->description !== null) { $description = $this->description->render(); } else { $description = ''; diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TagWithType.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TagWithType.php index 271c41b5..89e29e5e 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TagWithType.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TagWithType.php @@ -71,4 +71,17 @@ protected static function extractTypeFromBody(string $body): array return [$type, $description]; } + + public function __toString(): string + { + if ($this->description) { + $description = $this->description->render(); + } else { + $description = ''; + } + + $type = (string) $this->type; + + return $type . ($description !== '' ? ($type !== '' ? ' ' : '') . $description : ''); + } } diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Throws.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Throws.php index f21c9101..e0818468 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Throws.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Throws.php @@ -48,17 +48,4 @@ public static function create( return new static($type, $description); } - - public function __toString(): string - { - if ($this->description) { - $description = $this->description->render(); - } else { - $description = ''; - } - - $type = (string) $this->type; - - return $type . ($description !== '' ? ($type !== '' ? ' ' : '') . $description : ''); - } } diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Var_.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Var_.php index 0a79ab94..b0bd8c21 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Var_.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Var_.php @@ -111,13 +111,13 @@ public function getVariableName(): ?string */ public function __toString(): string { - if ($this->description) { + if ($this->description !== null) { $description = $this->description->render(); } else { $description = ''; } - if ($this->variableName) { + if ($this->variableName !== null && $this->variableName !== '') { $variableName = '$' . $this->variableName; } else { $variableName = ''; diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Version.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Version.php index 1ed25d17..8ea96ed3 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Version.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Version.php @@ -59,7 +59,7 @@ public static function create( ?DescriptionFactory $descriptionFactory = null, ?TypeContext $context = null ): ?self { - if (empty($body)) { + if ($body === null || $body === '') { return new static(); } diff --git a/vendor/phpdocumentor/reflection-docblock/src/DocBlockFactory.php b/vendor/phpdocumentor/reflection-docblock/src/DocBlockFactory.php index 1f7faf1a..ca33fbbb 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/DocBlockFactory.php +++ b/vendor/phpdocumentor/reflection-docblock/src/DocBlockFactory.php @@ -20,13 +20,18 @@ use phpDocumentor\Reflection\DocBlock\Tag; use phpDocumentor\Reflection\DocBlock\TagFactory; use phpDocumentor\Reflection\DocBlock\Tags\Factory\AbstractPHPStanFactory; +use phpDocumentor\Reflection\DocBlock\Tags\Factory\ExtendsFactory; use phpDocumentor\Reflection\DocBlock\Tags\Factory\Factory; +use phpDocumentor\Reflection\DocBlock\Tags\Factory\ImplementsFactory; use phpDocumentor\Reflection\DocBlock\Tags\Factory\MethodFactory; use phpDocumentor\Reflection\DocBlock\Tags\Factory\ParamFactory; use phpDocumentor\Reflection\DocBlock\Tags\Factory\PropertyFactory; use phpDocumentor\Reflection\DocBlock\Tags\Factory\PropertyReadFactory; use phpDocumentor\Reflection\DocBlock\Tags\Factory\PropertyWriteFactory; use phpDocumentor\Reflection\DocBlock\Tags\Factory\ReturnFactory; +use phpDocumentor\Reflection\DocBlock\Tags\Factory\TemplateExtendsFactory; +use phpDocumentor\Reflection\DocBlock\Tags\Factory\TemplateFactory; +use phpDocumentor\Reflection\DocBlock\Tags\Factory\TemplateImplementsFactory; use phpDocumentor\Reflection\DocBlock\Tags\Factory\VarFactory; use Webmozart\Assert\Assert; @@ -76,7 +81,12 @@ public static function createInstance(array $additionalTags = []): DocBlockFacto new PropertyFactory($typeResolver, $descriptionFactory), new PropertyReadFactory($typeResolver, $descriptionFactory), new PropertyWriteFactory($typeResolver, $descriptionFactory), - new MethodFactory($typeResolver, $descriptionFactory) + new MethodFactory($typeResolver, $descriptionFactory), + new ImplementsFactory($typeResolver, $descriptionFactory), + new ExtendsFactory($typeResolver, $descriptionFactory), + new TemplateFactory($typeResolver, $descriptionFactory), + new TemplateImplementsFactory($typeResolver, $descriptionFactory), + new TemplateExtendsFactory($typeResolver, $descriptionFactory), ); $tagFactory->addService($descriptionFactory); @@ -88,6 +98,11 @@ public static function createInstance(array $additionalTags = []): DocBlockFacto $tagFactory->registerTagHandler('property-read', $phpstanTagFactory); $tagFactory->registerTagHandler('property-write', $phpstanTagFactory); $tagFactory->registerTagHandler('method', $phpstanTagFactory); + $tagFactory->registerTagHandler('extends', $phpstanTagFactory); + $tagFactory->registerTagHandler('implements', $phpstanTagFactory); + $tagFactory->registerTagHandler('template', $phpstanTagFactory); + $tagFactory->registerTagHandler('template-extends', $phpstanTagFactory); + $tagFactory->registerTagHandler('template-implements', $phpstanTagFactory); $docBlockFactory = new self($descriptionFactory, $tagFactory); foreach ($additionalTags as $tagName => $tagHandler) { diff --git a/vendor/phpdocumentor/reflection-docblock/src/Utils.php b/vendor/phpdocumentor/reflection-docblock/src/Utils.php index ddd0f61d..fe311c9e 100644 --- a/vendor/phpdocumentor/reflection-docblock/src/Utils.php +++ b/vendor/phpdocumentor/reflection-docblock/src/Utils.php @@ -26,7 +26,7 @@ abstract class Utils * * This function is inspired by {@link https://github.com/thecodingmachine/safe/blob/master/generated/pcre.php}. But * since this library is all about performance we decided to strip everything we don't need. Reducing the amount - * of files that have to be loaded, ect. + * of files that have to be loaded, etc. * * @param string $pattern The pattern to search for, as a string. * @param string $subject The input string. diff --git a/vendor/phpdocumentor/type-resolver/composer.json b/vendor/phpdocumentor/type-resolver/composer.json index c4afb7d6..5c280e32 100644 --- a/vendor/phpdocumentor/type-resolver/composer.json +++ b/vendor/phpdocumentor/type-resolver/composer.json @@ -12,7 +12,7 @@ "require": { "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.13", + "phpstan/phpdoc-parser": "^1.18|^2.0", "doctrine/deprecations": "^1.0" }, "require-dev": { diff --git a/vendor/phpdocumentor/type-resolver/src/PseudoTypes/ArrayShapeItem.php b/vendor/phpdocumentor/type-resolver/src/PseudoTypes/ArrayShapeItem.php index a9756bb5..81187d90 100644 --- a/vendor/phpdocumentor/type-resolver/src/PseudoTypes/ArrayShapeItem.php +++ b/vendor/phpdocumentor/type-resolver/src/PseudoTypes/ArrayShapeItem.php @@ -13,53 +13,6 @@ namespace phpDocumentor\Reflection\PseudoTypes; -use phpDocumentor\Reflection\Type; -use phpDocumentor\Reflection\Types\Mixed_; - -use function sprintf; - -final class ArrayShapeItem +class ArrayShapeItem extends ShapeItem { - /** @var string|null */ - private $key; - /** @var Type */ - private $value; - /** @var bool */ - private $optional; - - public function __construct(?string $key, ?Type $value, bool $optional) - { - $this->key = $key; - $this->value = $value ?? new Mixed_(); - $this->optional = $optional; - } - - public function getKey(): ?string - { - return $this->key; - } - - public function getValue(): Type - { - return $this->value; - } - - public function isOptional(): bool - { - return $this->optional; - } - - public function __toString(): string - { - if ($this->key !== null) { - return sprintf( - '%s%s: %s', - $this->key, - $this->optional ? '?' : '', - (string) $this->value - ); - } - - return (string) $this->value; - } } diff --git a/vendor/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyList.php b/vendor/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyList.php index dd6a6531..384b6296 100644 --- a/vendor/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyList.php +++ b/vendor/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyList.php @@ -28,7 +28,7 @@ final class NonEmptyList extends Array_ implements PseudoType { public function underlyingType(): Type { - return new Array_(); + return new Array_($this->valueType, $this->keyType); } public function __construct(?Type $valueType = null) diff --git a/vendor/phpdocumentor/type-resolver/src/TypeResolver.php b/vendor/phpdocumentor/type-resolver/src/TypeResolver.php index 0c558c9c..af57226c 100644 --- a/vendor/phpdocumentor/type-resolver/src/TypeResolver.php +++ b/vendor/phpdocumentor/type-resolver/src/TypeResolver.php @@ -25,14 +25,19 @@ use phpDocumentor\Reflection\PseudoTypes\IntegerRange; use phpDocumentor\Reflection\PseudoTypes\IntegerValue; use phpDocumentor\Reflection\PseudoTypes\List_; +use phpDocumentor\Reflection\PseudoTypes\ListShape; +use phpDocumentor\Reflection\PseudoTypes\ListShapeItem; use phpDocumentor\Reflection\PseudoTypes\LiteralString; use phpDocumentor\Reflection\PseudoTypes\LowercaseString; use phpDocumentor\Reflection\PseudoTypes\NegativeInteger; +use phpDocumentor\Reflection\PseudoTypes\NonEmptyArray; use phpDocumentor\Reflection\PseudoTypes\NonEmptyList; use phpDocumentor\Reflection\PseudoTypes\NonEmptyLowercaseString; use phpDocumentor\Reflection\PseudoTypes\NonEmptyString; use phpDocumentor\Reflection\PseudoTypes\Numeric_; use phpDocumentor\Reflection\PseudoTypes\NumericString; +use phpDocumentor\Reflection\PseudoTypes\ObjectShape; +use phpDocumentor\Reflection\PseudoTypes\ObjectShapeItem; use phpDocumentor\Reflection\PseudoTypes\PositiveInteger; use phpDocumentor\Reflection\PseudoTypes\StringValue; use phpDocumentor\Reflection\PseudoTypes\TraitString; @@ -82,6 +87,8 @@ use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode; use PHPStan\PhpDocParser\Ast\Type\IntersectionTypeNode; use PHPStan\PhpDocParser\Ast\Type\NullableTypeNode; +use PHPStan\PhpDocParser\Ast\Type\ObjectShapeItemNode; +use PHPStan\PhpDocParser\Ast\Type\ObjectShapeNode; use PHPStan\PhpDocParser\Ast\Type\OffsetAccessTypeNode; use PHPStan\PhpDocParser\Ast\Type\ThisTypeNode; use PHPStan\PhpDocParser\Ast\Type\TypeNode; @@ -91,6 +98,7 @@ use PHPStan\PhpDocParser\Parser\ParserException; use PHPStan\PhpDocParser\Parser\TokenIterator; use PHPStan\PhpDocParser\Parser\TypeParser; +use PHPStan\PhpDocParser\ParserConfig; use RuntimeException; use function array_filter; @@ -139,6 +147,7 @@ final class TypeResolver 'mixed' => Mixed_::class, 'array' => Array_::class, 'array-key' => ArrayKey::class, + 'non-empty-array' => NonEmptyArray::class, 'resource' => Resource_::class, 'void' => Void_::class, 'null' => Null_::class, @@ -181,8 +190,14 @@ final class TypeResolver public function __construct(?FqsenResolver $fqsenResolver = null) { $this->fqsenResolver = $fqsenResolver ?: new FqsenResolver(); - $this->typeParser = new TypeParser(new ConstExprParser()); - $this->lexer = new Lexer(); + + if (class_exists(ParserConfig::class)) { + $this->typeParser = new TypeParser(new ParserConfig([]), new ConstExprParser(new ParserConfig([]))); + $this->lexer = new Lexer(new ParserConfig([])); + } else { + $this->typeParser = new TypeParser(new ConstExprParser()); + $this->lexer = new Lexer(); + } } /** @@ -234,10 +249,43 @@ public function createType(?TypeNode $type, Context $context): Type ); case ArrayShapeNode::class: - return new ArrayShape( + switch ($type->kind) { + case ArrayShapeNode::KIND_ARRAY: + return new ArrayShape( + ...array_map( + function (ArrayShapeItemNode $item) use ($context): ArrayShapeItem { + return new ArrayShapeItem( + (string) $item->keyName, + $this->createType($item->valueType, $context), + $item->optional + ); + }, + $type->items + ) + ); + + case ArrayShapeNode::KIND_LIST: + return new ListShape( + ...array_map( + function (ArrayShapeItemNode $item) use ($context): ListShapeItem { + return new ListShapeItem( + null, + $this->createType($item->valueType, $context), + $item->optional + ); + }, + $type->items + ) + ); + + default: + throw new RuntimeException('Unsupported array shape kind'); + } + case ObjectShapeNode::class: + return new ObjectShape( ...array_map( - function (ArrayShapeItemNode $item) use ($context): ArrayShapeItem { - return new ArrayShapeItem( + function (ObjectShapeItemNode $item) use ($context): ObjectShapeItem { + return new ObjectShapeItem( (string) $item->keyName, $this->createType($item->valueType, $context), $item->optional diff --git a/vendor/phpoption/phpoption/composer.json b/vendor/phpoption/phpoption/composer.json index 77f50a37..91dd6fb7 100644 --- a/vendor/phpoption/phpoption/composer.json +++ b/vendor/phpoption/phpoption/composer.json @@ -20,7 +20,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28" }, "autoload": { "psr-4": { @@ -41,12 +41,10 @@ "extra": { "bamarni-bin": { "bin-links": true, - "forward-command": true + "forward-command": false }, "branch-alias": { "dev-master": "1.9-dev" } - }, - "minimum-stability": "dev", - "prefer-stable": true + } } diff --git a/vendor/phpoption/phpoption/src/PhpOption/Option.php b/vendor/phpoption/phpoption/src/PhpOption/Option.php index 172924cf..91fab9ca 100644 --- a/vendor/phpoption/phpoption/src/PhpOption/Option.php +++ b/vendor/phpoption/phpoption/src/PhpOption/Option.php @@ -62,13 +62,13 @@ public static function fromValue($value, $noneValue = null) * @template S * * @param array|ArrayAccess|null $array A potential array or \ArrayAccess value. - * @param string $key The key to check. + * @param string|int|null $key The key to check. * * @return Option */ public static function fromArraysValue($array, $key) { - if (!(is_array($array) || $array instanceof ArrayAccess) || !isset($array[$key])) { + if ($key === null || !(is_array($array) || $array instanceof ArrayAccess) || !isset($array[$key])) { return None::create(); } diff --git a/vendor/phpstan/phpdoc-parser/README.md b/vendor/phpstan/phpdoc-parser/README.md index 3b321b22..ff6e808e 100644 --- a/vendor/phpstan/phpdoc-parser/README.md +++ b/vendor/phpstan/phpdoc-parser/README.md @@ -13,9 +13,9 @@ For the complete list of supported PHPDoc features check out PHPStan documentati * [PHPDoc Basics](https://phpstan.org/writing-php-code/phpdocs-basics) (list of PHPDoc tags) * [PHPDoc Types](https://phpstan.org/writing-php-code/phpdoc-types) (list of PHPDoc types) -* [phpdoc-parser API Reference](https://phpstan.github.io/phpdoc-parser/namespace-PHPStan.PhpDocParser.html) with all the AST node types etc. +* [phpdoc-parser API Reference](https://phpstan.github.io/phpdoc-parser/2.0.x/namespace-PHPStan.PhpDocParser.html) with all the AST node types etc. -This parser also supports parsing [Doctrine Annotations](https://github.com/doctrine/annotations). The AST nodes live in the [PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine namespace](https://phpstan.github.io/phpdoc-parser/namespace-PHPStan.PhpDocParser.Ast.PhpDoc.Doctrine.html). The support needs to be turned on by setting `bool $parseDoctrineAnnotations` to `true` in `Lexer` and `PhpDocParser` class constructors. +This parser also supports parsing [Doctrine Annotations](https://github.com/doctrine/annotations). The AST nodes live in the [PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine namespace](https://phpstan.github.io/phpdoc-parser/2.0.x/namespace-PHPStan.PhpDocParser.Ast.PhpDoc.Doctrine.html). ## Installation @@ -34,6 +34,7 @@ use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode; use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode; use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode; use PHPStan\PhpDocParser\Lexer\Lexer; +use PHPStan\PhpDocParser\ParserConfig; use PHPStan\PhpDocParser\Parser\ConstExprParser; use PHPStan\PhpDocParser\Parser\PhpDocParser; use PHPStan\PhpDocParser\Parser\TokenIterator; @@ -41,10 +42,11 @@ use PHPStan\PhpDocParser\Parser\TypeParser; // basic setup -$lexer = new Lexer(); -$constExprParser = new ConstExprParser(); -$typeParser = new TypeParser($constExprParser); -$phpDocParser = new PhpDocParser($typeParser, $constExprParser); +$config = new ParserConfig(usedAttributes: []); +$lexer = new Lexer($config); +$constExprParser = new ConstExprParser($config); +$typeParser = new TypeParser($config, $constExprParser); +$phpDocParser = new PhpDocParser($config, $typeParser, $constExprParser); // parsing and reading a PHPDoc string @@ -72,6 +74,7 @@ use PHPStan\PhpDocParser\Ast\NodeVisitor\CloningVisitor; use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode; use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode; use PHPStan\PhpDocParser\Lexer\Lexer; +use PHPStan\PhpDocParser\ParserConfig; use PHPStan\PhpDocParser\Parser\ConstExprParser; use PHPStan\PhpDocParser\Parser\PhpDocParser; use PHPStan\PhpDocParser\Parser\TokenIterator; @@ -80,12 +83,11 @@ use PHPStan\PhpDocParser\Printer\Printer; // basic setup with enabled required lexer attributes -$usedAttributes = ['lines' => true, 'indexes' => true]; - -$lexer = new Lexer(); -$constExprParser = new ConstExprParser(true, true, $usedAttributes); -$typeParser = new TypeParser($constExprParser, true, $usedAttributes); -$phpDocParser = new PhpDocParser($typeParser, $constExprParser, true, true, $usedAttributes); +$config = new ParserConfig(usedAttributes: ['lines' => true, 'indexes' => true]); +$lexer = new Lexer($config); +$constExprParser = new ConstExprParser($config); +$typeParser = new TypeParser($config, $constExprParser); +$phpDocParser = new PhpDocParser($config, $typeParser, $constExprParser); $tokens = new TokenIterator($lexer->tokenize('/** @param Lorem $a */')); $phpDocNode = $phpDocParser->parse($tokens); // PhpDocNode diff --git a/vendor/phpstan/phpdoc-parser/composer.json b/vendor/phpstan/phpdoc-parser/composer.json index f1c648e5..8047c49e 100644 --- a/vendor/phpstan/phpdoc-parser/composer.json +++ b/vendor/phpstan/phpdoc-parser/composer.json @@ -3,17 +3,17 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "license": "MIT", "require": { - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "doctrine/annotations": "^2.0", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^5.3.0", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.5", - "phpstan/phpstan-phpunit": "^1.1", - "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^9.5", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan-strict-rules": "^2.0", + "phpunit/phpunit": "^9.6", "symfony/process": "^5.2" }, "config": { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayItemNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayItemNode.php index ef144521..cd067cac 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayItemNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayItemNode.php @@ -10,11 +10,9 @@ class ConstExprArrayItemNode implements ConstExprNode use NodeAttributes; - /** @var ConstExprNode|null */ - public $key; + public ?ConstExprNode $key = null; - /** @var ConstExprNode */ - public $value; + public ConstExprNode $value; public function __construct(?ConstExprNode $key, ConstExprNode $value) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayNode.php index 1f9def37..dc7ad4a9 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayNode.php @@ -11,7 +11,7 @@ class ConstExprArrayNode implements ConstExprNode use NodeAttributes; /** @var ConstExprArrayItemNode[] */ - public $items; + public array $items; /** * @param ConstExprArrayItemNode[] $items diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprFloatNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprFloatNode.php index a4192fba..30ab41de 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprFloatNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprFloatNode.php @@ -9,8 +9,7 @@ class ConstExprFloatNode implements ConstExprNode use NodeAttributes; - /** @var string */ - public $value; + public string $value; public function __construct(string $value) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprIntegerNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprIntegerNode.php index 5339bb5a..9f0285f3 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprIntegerNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprIntegerNode.php @@ -9,8 +9,7 @@ class ConstExprIntegerNode implements ConstExprNode use NodeAttributes; - /** @var string */ - public $value; + public string $value; public function __construct(string $value) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprStringNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprStringNode.php index fa44c262..26e5ef4a 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprStringNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprStringNode.php @@ -3,24 +3,78 @@ namespace PHPStan\PhpDocParser\Ast\ConstExpr; use PHPStan\PhpDocParser\Ast\NodeAttributes; +use function addcslashes; +use function assert; +use function dechex; +use function ord; +use function preg_replace_callback; +use function sprintf; +use function str_pad; +use function strlen; +use const STR_PAD_LEFT; class ConstExprStringNode implements ConstExprNode { + public const SINGLE_QUOTED = 1; + public const DOUBLE_QUOTED = 2; + use NodeAttributes; - /** @var string */ - public $value; + public string $value; + + /** @var self::SINGLE_QUOTED|self::DOUBLE_QUOTED */ + public $quoteType; - public function __construct(string $value) + /** + * @param self::SINGLE_QUOTED|self::DOUBLE_QUOTED $quoteType + */ + public function __construct(string $value, int $quoteType) { $this->value = $value; + $this->quoteType = $quoteType; } public function __toString(): string { - return $this->value; + if ($this->quoteType === self::SINGLE_QUOTED) { + // from https://github.com/nikic/PHP-Parser/blob/0ffddce52d816f72d0efc4d9b02e276d3309ef01/lib/PhpParser/PrettyPrinter/Standard.php#L1007 + return sprintf("'%s'", addcslashes($this->value, '\'\\')); + } + + // from https://github.com/nikic/PHP-Parser/blob/0ffddce52d816f72d0efc4d9b02e276d3309ef01/lib/PhpParser/PrettyPrinter/Standard.php#L1010-L1040 + return sprintf('"%s"', $this->escapeDoubleQuotedString()); + } + + private function escapeDoubleQuotedString(): string + { + $quote = '"'; + $escaped = addcslashes($this->value, "\n\r\t\f\v$" . $quote . '\\'); + + // Escape control characters and non-UTF-8 characters. + // Regex based on https://stackoverflow.com/a/11709412/385378. + $regex = '/( + [\x00-\x08\x0E-\x1F] # Control characters + | [\xC0-\xC1] # Invalid UTF-8 Bytes + | [\xF5-\xFF] # Invalid UTF-8 Bytes + | \xE0(?=[\x80-\x9F]) # Overlong encoding of prior code point + | \xF0(?=[\x80-\x8F]) # Overlong encoding of prior code point + | [\xC2-\xDF](?![\x80-\xBF]) # Invalid UTF-8 Sequence Start + | [\xE0-\xEF](?![\x80-\xBF]{2}) # Invalid UTF-8 Sequence Start + | [\xF0-\xF4](?![\x80-\xBF]{3}) # Invalid UTF-8 Sequence Start + | (?<=[\x00-\x7F\xF5-\xFF])[\x80-\xBF] # Invalid UTF-8 Sequence Middle + | (?value = $value; } diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/QuoteAwareConstExprStringNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/QuoteAwareConstExprStringNode.php deleted file mode 100644 index f2792b1b..00000000 --- a/vendor/phpstan/phpdoc-parser/src/Ast/ConstExpr/QuoteAwareConstExprStringNode.php +++ /dev/null @@ -1,78 +0,0 @@ -quoteType = $quoteType; - } - - - public function __toString(): string - { - if ($this->quoteType === self::SINGLE_QUOTED) { - // from https://github.com/nikic/PHP-Parser/blob/0ffddce52d816f72d0efc4d9b02e276d3309ef01/lib/PhpParser/PrettyPrinter/Standard.php#L1007 - return sprintf("'%s'", addcslashes($this->value, '\'\\')); - } - - // from https://github.com/nikic/PHP-Parser/blob/0ffddce52d816f72d0efc4d9b02e276d3309ef01/lib/PhpParser/PrettyPrinter/Standard.php#L1010-L1040 - return sprintf('"%s"', $this->escapeDoubleQuotedString()); - } - - private function escapeDoubleQuotedString(): string - { - $quote = '"'; - $escaped = addcslashes($this->value, "\n\r\t\f\v$" . $quote . '\\'); - - // Escape control characters and non-UTF-8 characters. - // Regex based on https://stackoverflow.com/a/11709412/385378. - $regex = '/( - [\x00-\x08\x0E-\x1F] # Control characters - | [\xC0-\xC1] # Invalid UTF-8 Bytes - | [\xF5-\xFF] # Invalid UTF-8 Bytes - | \xE0(?=[\x80-\x9F]) # Overlong encoding of prior code point - | \xF0(?=[\x80-\x8F]) # Overlong encoding of prior code point - | [\xC2-\xDF](?![\x80-\xBF]) # Invalid UTF-8 Sequence Start - | [\xE0-\xEF](?![\x80-\xBF]{2}) # Invalid UTF-8 Sequence Start - | [\xF0-\xF4](?![\x80-\xBF]{3}) # Invalid UTF-8 Sequence Start - | (?<=[\x00-\x7F\xF5-\xFF])[\x80-\xBF] # Invalid UTF-8 Sequence Middle - | (? */ - private $attributes = []; + private array $attributes = []; /** * @param mixed $value diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/NodeTraverser.php b/vendor/phpstan/phpdoc-parser/src/Ast/NodeTraverser.php index 63b25c37..76c88f0c 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/NodeTraverser.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/NodeTraverser.php @@ -62,10 +62,10 @@ final class NodeTraverser public const DONT_TRAVERSE_CURRENT_AND_CHILDREN = 4; /** @var list Visitors */ - private $visitors = []; + private array $visitors = []; /** @var bool Whether traversal should be stopped */ - private $stopTraversal; + private bool $stopTraversal; /** * @param list $visitors @@ -151,7 +151,7 @@ private function traverseNode(Node $node): Node break 2; } else { throw new LogicException( - 'enterNode() returned invalid value of type ' . gettype($return) + 'enterNode() returned invalid value of type ' . gettype($return), ); } } @@ -176,11 +176,11 @@ private function traverseNode(Node $node): Node } elseif (is_array($return)) { throw new LogicException( 'leaveNode() may only return an array ' . - 'if the parent structure is an array' + 'if the parent structure is an array', ); } else { throw new LogicException( - 'leaveNode() returned invalid value of type ' . gettype($return) + 'leaveNode() returned invalid value of type ' . gettype($return), ); } } @@ -237,7 +237,7 @@ private function traverseArray(array $nodes): array break 2; } else { throw new LogicException( - 'enterNode() returned invalid value of type ' . gettype($return) + 'enterNode() returned invalid value of type ' . gettype($return), ); } } @@ -267,7 +267,7 @@ private function traverseArray(array $nodes): array break 2; } else { throw new LogicException( - 'leaveNode() returned invalid value of type ' . gettype($return) + 'leaveNode() returned invalid value of type ' . gettype($return), ); } } diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/NodeVisitor/CloningVisitor.php b/vendor/phpstan/phpdoc-parser/src/Ast/NodeVisitor/CloningVisitor.php index 7200f3af..486e2aae 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/NodeVisitor/CloningVisitor.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/NodeVisitor/CloningVisitor.php @@ -9,7 +9,7 @@ final class CloningVisitor extends AbstractNodeVisitor { - public function enterNode(Node $originalNode) + public function enterNode(Node $originalNode): Node { $node = clone $originalNode; $node->setAttribute(Attribute::ORIGINAL_NODE, $originalNode); diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagMethodValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagMethodValueNode.php index cf4f5563..0dfee314 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagMethodValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagMethodValueNode.php @@ -11,25 +11,20 @@ class AssertTagMethodValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; - /** @var string */ - public $parameter; + public string $parameter; - /** @var string */ - public $method; + public string $method; - /** @var bool */ - public $isNegated; + public bool $isNegated; - /** @var bool */ - public $isEquality; + public bool $isEquality; /** @var string (may be empty) */ - public $description; + public string $description; - public function __construct(TypeNode $type, string $parameter, string $method, bool $isNegated, string $description, bool $isEquality = false) + public function __construct(TypeNode $type, string $parameter, string $method, bool $isNegated, string $description, bool $isEquality) { $this->type = $type; $this->parameter = $parameter; diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagPropertyValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagPropertyValueNode.php index 4fb31807..8bfd1d0e 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagPropertyValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagPropertyValueNode.php @@ -11,25 +11,20 @@ class AssertTagPropertyValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; - /** @var string */ - public $parameter; + public string $parameter; - /** @var string */ - public $property; + public string $property; - /** @var bool */ - public $isNegated; + public bool $isNegated; - /** @var bool */ - public $isEquality; + public bool $isEquality; /** @var string (may be empty) */ - public $description; + public string $description; - public function __construct(TypeNode $type, string $parameter, string $property, bool $isNegated, string $description, bool $isEquality = false) + public function __construct(TypeNode $type, string $parameter, string $property, bool $isNegated, string $description, bool $isEquality) { $this->type = $type; $this->parameter = $parameter; diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagValueNode.php index d6423f50..5dc9e8c3 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagValueNode.php @@ -11,22 +11,18 @@ class AssertTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; - /** @var string */ - public $parameter; + public string $parameter; - /** @var bool */ - public $isNegated; + public bool $isNegated; - /** @var bool */ - public $isEquality; + public bool $isEquality; /** @var string (may be empty) */ - public $description; + public string $description; - public function __construct(TypeNode $type, string $parameter, bool $isNegated, string $description, bool $isEquality = false) + public function __construct(TypeNode $type, string $parameter, bool $isNegated, string $description, bool $isEquality) { $this->type = $type; $this->parameter = $parameter; diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/DeprecatedTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/DeprecatedTagValueNode.php index abf2f1a6..facdd2b4 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/DeprecatedTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/DeprecatedTagValueNode.php @@ -11,7 +11,7 @@ class DeprecatedTagValueNode implements PhpDocTagValueNode use NodeAttributes; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineAnnotation.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineAnnotation.php index 3a93f5aa..778b21fa 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineAnnotation.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineAnnotation.php @@ -11,11 +11,10 @@ class DoctrineAnnotation implements Node use NodeAttributes; - /** @var string */ - public $name; + public string $name; /** @var list */ - public $arguments; + public array $arguments; /** * @param list $arguments diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArgument.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArgument.php index f30812cf..30fe9879 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArgument.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArgument.php @@ -15,8 +15,7 @@ class DoctrineArgument implements Node use NodeAttributes; - /** @var IdentifierTypeNode|null */ - public $key; + public ?IdentifierTypeNode $key = null; /** @var ValueType */ public $value; diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArray.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArray.php index e740567d..06686a52 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArray.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArray.php @@ -12,7 +12,7 @@ class DoctrineArray implements Node use NodeAttributes; /** @var list */ - public $items; + public array $items; /** * @param list $items diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineTagValueNode.php index 84f7b18b..3940e24f 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineTagValueNode.php @@ -11,11 +11,10 @@ class DoctrineTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var DoctrineAnnotation */ - public $annotation; + public DoctrineAnnotation $annotation; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct( diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ExtendsTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ExtendsTagValueNode.php index 3bf53e13..d9bbeec5 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ExtendsTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ExtendsTagValueNode.php @@ -11,11 +11,10 @@ class ExtendsTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var GenericTypeNode */ - public $type; + public GenericTypeNode $type; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(GenericTypeNode $type, string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/GenericTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/GenericTagValueNode.php index 026aa153..de77051a 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/GenericTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/GenericTagValueNode.php @@ -10,7 +10,7 @@ class GenericTagValueNode implements PhpDocTagValueNode use NodeAttributes; /** @var string (may be empty) */ - public $value; + public string $value; public function __construct(string $value) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ImplementsTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ImplementsTagValueNode.php index 99043d91..34a30b0d 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ImplementsTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ImplementsTagValueNode.php @@ -11,11 +11,10 @@ class ImplementsTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var GenericTypeNode */ - public $type; + public GenericTypeNode $type; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(GenericTypeNode $type, string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/InvalidTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/InvalidTagValueNode.php index ca7b4f20..7bb20b22 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/InvalidTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/InvalidTagValueNode.php @@ -17,10 +17,10 @@ class InvalidTagValueNode implements PhpDocTagValueNode use NodeAttributes; /** @var string (may be empty) */ - public $value; + public string $value; /** @var mixed[] */ - private $exceptionArgs; + private array $exceptionArgs; public function __construct(string $value, ParserException $exception) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueNode.php index 211510be..223d6e47 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueNode.php @@ -12,29 +12,26 @@ class MethodTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var bool */ - public $isStatic; + public bool $isStatic; - /** @var TypeNode|null */ - public $returnType; + public ?TypeNode $returnType = null; - /** @var string */ - public $methodName; + public string $methodName; /** @var TemplateTagValueNode[] */ - public $templateTypes; + public array $templateTypes; /** @var MethodTagValueParameterNode[] */ - public $parameters; + public array $parameters; /** @var string (may be empty) */ - public $description; + public string $description; /** * @param MethodTagValueParameterNode[] $parameters * @param TemplateTagValueNode[] $templateTypes */ - public function __construct(bool $isStatic, ?TypeNode $returnType, string $methodName, array $parameters, string $description, array $templateTypes = []) + public function __construct(bool $isStatic, ?TypeNode $returnType, string $methodName, array $parameters, string $description, array $templateTypes) { $this->isStatic = $isStatic; $this->returnType = $returnType; diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueParameterNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueParameterNode.php index 7c17e44c..ebf33e32 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueParameterNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueParameterNode.php @@ -12,20 +12,15 @@ class MethodTagValueParameterNode implements Node use NodeAttributes; - /** @var TypeNode|null */ - public $type; + public ?TypeNode $type = null; - /** @var bool */ - public $isReference; + public bool $isReference; - /** @var bool */ - public $isVariadic; + public bool $isVariadic; - /** @var string */ - public $parameterName; + public string $parameterName; - /** @var ConstExprNode|null */ - public $defaultValue; + public ?ConstExprNode $defaultValue = null; public function __construct(?TypeNode $type, bool $isReference, bool $isVariadic, string $parameterName, ?ConstExprNode $defaultValue) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/MixinTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/MixinTagValueNode.php index d9b7d78a..7a4e43ea 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/MixinTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/MixinTagValueNode.php @@ -11,11 +11,10 @@ class MixinTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(TypeNode $type, string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamClosureThisTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamClosureThisTagValueNode.php index 0ac2131a..54feff9e 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamClosureThisTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamClosureThisTagValueNode.php @@ -11,14 +11,12 @@ class ParamClosureThisTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; - /** @var string */ - public $parameterName; + public string $parameterName; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(TypeNode $type, string $parameterName, string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamImmediatelyInvokedCallableTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamImmediatelyInvokedCallableTagValueNode.php index 0f480f7a..9a6761f7 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamImmediatelyInvokedCallableTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamImmediatelyInvokedCallableTagValueNode.php @@ -10,11 +10,10 @@ class ParamImmediatelyInvokedCallableTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var string */ - public $parameterName; + public string $parameterName; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(string $parameterName, string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamLaterInvokedCallableTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamLaterInvokedCallableTagValueNode.php index eab353f9..84db67a9 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamLaterInvokedCallableTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamLaterInvokedCallableTagValueNode.php @@ -10,11 +10,10 @@ class ParamLaterInvokedCallableTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var string */ - public $parameterName; + public string $parameterName; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(string $parameterName, string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamOutTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamOutTagValueNode.php index 9f374bf1..3e89f9d7 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamOutTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamOutTagValueNode.php @@ -11,14 +11,12 @@ class ParamOutTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; - /** @var string */ - public $parameterName; + public string $parameterName; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(TypeNode $type, string $parameterName, string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamTagValueNode.php index f93af0ea..8d1ef27a 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamTagValueNode.php @@ -11,22 +11,18 @@ class ParamTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; - /** @var bool */ - public $isReference; + public bool $isReference; - /** @var bool */ - public $isVariadic; + public bool $isVariadic; - /** @var string */ - public $parameterName; + public string $parameterName; /** @var string (may be empty) */ - public $description; + public string $description; - public function __construct(TypeNode $type, bool $isVariadic, string $parameterName, string $description, bool $isReference = false) + public function __construct(TypeNode $type, bool $isVariadic, string $parameterName, string $description, bool $isReference) { $this->type = $type; $this->isReference = $isReference; diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocNode.php index ade55b78..6abad3d0 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocNode.php @@ -15,7 +15,7 @@ class PhpDocNode implements Node use NodeAttributes; /** @var PhpDocChildNode[] */ - public $children; + public array $children; /** * @param PhpDocChildNode[] $children @@ -31,9 +31,7 @@ public function __construct(array $children) */ public function getTags(): array { - return array_filter($this->children, static function (PhpDocChildNode $child): bool { - return $child instanceof PhpDocTagNode; - }); + return array_filter($this->children, static fn (PhpDocChildNode $child): bool => $child instanceof PhpDocTagNode); } @@ -42,9 +40,7 @@ public function getTags(): array */ public function getTagsByName(string $tagName): array { - return array_filter($this->getTags(), static function (PhpDocTagNode $tag) use ($tagName): bool { - return $tag->name === $tagName; - }); + return array_filter($this->getTags(), static fn (PhpDocTagNode $tag): bool => $tag->name === $tagName); } @@ -55,9 +51,7 @@ public function getVarTagValues(string $tagName = '@var'): array { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof VarTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof VarTagValueNode, ); } @@ -69,9 +63,7 @@ public function getParamTagValues(string $tagName = '@param'): array { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof ParamTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof ParamTagValueNode, ); } @@ -83,9 +75,7 @@ public function getTypelessParamTagValues(string $tagName = '@param'): array { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof TypelessParamTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof TypelessParamTagValueNode, ); } @@ -97,9 +87,7 @@ public function getParamImmediatelyInvokedCallableTagValues(string $tagName = '@ { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof ParamImmediatelyInvokedCallableTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof ParamImmediatelyInvokedCallableTagValueNode, ); } @@ -111,9 +99,7 @@ public function getParamLaterInvokedCallableTagValues(string $tagName = '@param- { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof ParamLaterInvokedCallableTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof ParamLaterInvokedCallableTagValueNode, ); } @@ -125,12 +111,20 @@ public function getParamClosureThisTagValues(string $tagName = '@param-closure-t { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof ParamClosureThisTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof ParamClosureThisTagValueNode, ); } + /** + * @return PureUnlessCallableIsImpureTagValueNode[] + */ + public function getPureUnlessCallableIsImpureTagValues(string $tagName = '@pure-unless-callable-is-impure'): array + { + return array_filter( + array_column($this->getTagsByName($tagName), 'value'), + static fn (PhpDocTagValueNode $value): bool => $value instanceof PureUnlessCallableIsImpureTagValueNode, + ); + } /** * @return TemplateTagValueNode[] @@ -139,9 +133,7 @@ public function getTemplateTagValues(string $tagName = '@template'): array { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof TemplateTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof TemplateTagValueNode, ); } @@ -153,9 +145,7 @@ public function getExtendsTagValues(string $tagName = '@extends'): array { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof ExtendsTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof ExtendsTagValueNode, ); } @@ -167,9 +157,7 @@ public function getImplementsTagValues(string $tagName = '@implements'): array { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof ImplementsTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof ImplementsTagValueNode, ); } @@ -181,9 +169,7 @@ public function getUsesTagValues(string $tagName = '@use'): array { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof UsesTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof UsesTagValueNode, ); } @@ -195,9 +181,7 @@ public function getReturnTagValues(string $tagName = '@return'): array { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof ReturnTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof ReturnTagValueNode, ); } @@ -209,9 +193,7 @@ public function getThrowsTagValues(string $tagName = '@throws'): array { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof ThrowsTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof ThrowsTagValueNode, ); } @@ -223,9 +205,7 @@ public function getMixinTagValues(string $tagName = '@mixin'): array { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof MixinTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof MixinTagValueNode, ); } @@ -236,9 +216,7 @@ public function getRequireExtendsTagValues(string $tagName = '@phpstan-require-e { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof RequireExtendsTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof RequireExtendsTagValueNode, ); } @@ -249,9 +227,7 @@ public function getRequireImplementsTagValues(string $tagName = '@phpstan-requir { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof RequireImplementsTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof RequireImplementsTagValueNode, ); } @@ -262,9 +238,7 @@ public function getDeprecatedTagValues(): array { return array_filter( array_column($this->getTagsByName('@deprecated'), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof DeprecatedTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof DeprecatedTagValueNode, ); } @@ -276,9 +250,7 @@ public function getPropertyTagValues(string $tagName = '@property'): array { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof PropertyTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof PropertyTagValueNode, ); } @@ -290,9 +262,7 @@ public function getPropertyReadTagValues(string $tagName = '@property-read'): ar { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof PropertyTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof PropertyTagValueNode, ); } @@ -304,9 +274,7 @@ public function getPropertyWriteTagValues(string $tagName = '@property-write'): { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof PropertyTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof PropertyTagValueNode, ); } @@ -318,9 +286,7 @@ public function getMethodTagValues(string $tagName = '@method'): array { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof MethodTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof MethodTagValueNode, ); } @@ -332,9 +298,7 @@ public function getTypeAliasTagValues(string $tagName = '@phpstan-type'): array { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof TypeAliasTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof TypeAliasTagValueNode, ); } @@ -346,9 +310,7 @@ public function getTypeAliasImportTagValues(string $tagName = '@phpstan-import-t { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof TypeAliasImportTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof TypeAliasImportTagValueNode, ); } @@ -360,9 +322,7 @@ public function getAssertTagValues(string $tagName = '@phpstan-assert'): array { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof AssertTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof AssertTagValueNode, ); } @@ -374,9 +334,7 @@ public function getAssertPropertyTagValues(string $tagName = '@phpstan-assert'): { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof AssertTagPropertyValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof AssertTagPropertyValueNode, ); } @@ -388,9 +346,7 @@ public function getAssertMethodTagValues(string $tagName = '@phpstan-assert'): a { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof AssertTagMethodValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof AssertTagMethodValueNode, ); } @@ -402,9 +358,7 @@ public function getSelfOutTypeTagValues(string $tagName = '@phpstan-this-out'): { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof SelfOutTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof SelfOutTagValueNode, ); } @@ -416,9 +370,7 @@ public function getParamOutTypeTagValues(string $tagName = '@param-out'): array { return array_filter( array_column($this->getTagsByName($tagName), 'value'), - static function (PhpDocTagValueNode $value): bool { - return $value instanceof ParamOutTagValueNode; - } + static fn (PhpDocTagValueNode $value): bool => $value instanceof ParamOutTagValueNode, ); } @@ -430,7 +382,7 @@ static function (PhpDocChildNode $child): string { $s = (string) $child; return $s === '' ? '' : ' ' . $s; }, - $this->children + $this->children, ); return "/**\n *" . implode("\n *", $children) . "\n */"; } diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagNode.php index d20746fc..cac2feeb 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagNode.php @@ -11,11 +11,9 @@ class PhpDocTagNode implements PhpDocChildNode use NodeAttributes; - /** @var string */ - public $name; + public string $name; - /** @var PhpDocTagValueNode */ - public $value; + public PhpDocTagValueNode $value; public function __construct(string $name, PhpDocTagValueNode $value) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTextNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTextNode.php index 0bca3c99..97a96894 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTextNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTextNode.php @@ -9,8 +9,7 @@ class PhpDocTextNode implements PhpDocChildNode use NodeAttributes; - /** @var string */ - public $text; + public string $text; public function __construct(string $text) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PropertyTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PropertyTagValueNode.php index 046003d1..cbf622f8 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PropertyTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/PropertyTagValueNode.php @@ -11,14 +11,12 @@ class PropertyTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; - /** @var string */ - public $propertyName; + public string $propertyName; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(TypeNode $type, string $propertyName, string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireExtendsTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireExtendsTagValueNode.php index 91c26892..5d8e1d22 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireExtendsTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireExtendsTagValueNode.php @@ -11,11 +11,10 @@ class RequireExtendsTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(TypeNode $type, string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireImplementsTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireImplementsTagValueNode.php index 65c9213f..6b7f7bae 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireImplementsTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireImplementsTagValueNode.php @@ -11,11 +11,10 @@ class RequireImplementsTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(TypeNode $type, string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ReturnTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ReturnTagValueNode.php index d53c8c75..c063bf48 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ReturnTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ReturnTagValueNode.php @@ -11,11 +11,10 @@ class ReturnTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(TypeNode $type, string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/SelfOutTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/SelfOutTagValueNode.php index 83169aff..d2377620 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/SelfOutTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/SelfOutTagValueNode.php @@ -11,11 +11,10 @@ class SelfOutTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(TypeNode $type, string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TemplateTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TemplateTagValueNode.php index 78b311ee..ba106825 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TemplateTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TemplateTagValueNode.php @@ -12,24 +12,25 @@ class TemplateTagValueNode implements PhpDocTagValueNode use NodeAttributes; /** @var non-empty-string */ - public $name; + public string $name; - /** @var TypeNode|null */ - public $bound; + public ?TypeNode $bound; - /** @var TypeNode|null */ - public $default; + public ?TypeNode $default; + + public ?TypeNode $lowerBound; /** @var string (may be empty) */ - public $description; + public string $description; /** * @param non-empty-string $name */ - public function __construct(string $name, ?TypeNode $bound, string $description, ?TypeNode $default = null) + public function __construct(string $name, ?TypeNode $bound, string $description, ?TypeNode $default = null, ?TypeNode $lowerBound = null) { $this->name = $name; $this->bound = $bound; + $this->lowerBound = $lowerBound; $this->default = $default; $this->description = $description; } @@ -37,9 +38,10 @@ public function __construct(string $name, ?TypeNode $bound, string $description, public function __toString(): string { - $bound = $this->bound !== null ? " of {$this->bound}" : ''; + $upperBound = $this->bound !== null ? " of {$this->bound}" : ''; + $lowerBound = $this->lowerBound !== null ? " super {$this->lowerBound}" : ''; $default = $this->default !== null ? " = {$this->default}" : ''; - return trim("{$this->name}{$bound}{$default} {$this->description}"); + return trim("{$this->name}{$upperBound}{$lowerBound}{$default} {$this->description}"); } } diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ThrowsTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ThrowsTagValueNode.php index 62d2aed3..dc5521b4 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ThrowsTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/ThrowsTagValueNode.php @@ -11,11 +11,10 @@ class ThrowsTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(TypeNode $type, string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasImportTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasImportTagValueNode.php index ad6b85a5..d0f945d2 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasImportTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasImportTagValueNode.php @@ -11,14 +11,11 @@ class TypeAliasImportTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var string */ - public $importedAlias; + public string $importedAlias; - /** @var IdentifierTypeNode */ - public $importedFrom; + public IdentifierTypeNode $importedFrom; - /** @var string|null */ - public $importedAs; + public ?string $importedAs = null; public function __construct(string $importedAlias, IdentifierTypeNode $importedFrom, ?string $importedAs) { @@ -31,7 +28,7 @@ public function __toString(): string { return trim( "{$this->importedAlias} from {$this->importedFrom}" - . ($this->importedAs !== null ? " as {$this->importedAs}" : '') + . ($this->importedAs !== null ? " as {$this->importedAs}" : ''), ); } diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasTagValueNode.php index 4ccaaac4..ae366b50 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasTagValueNode.php @@ -11,11 +11,9 @@ class TypeAliasTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var string */ - public $alias; + public string $alias; - /** @var TypeNode */ - public $type; + public TypeNode $type; public function __construct(string $alias, TypeNode $type) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypelessParamTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypelessParamTagValueNode.php index 8b982954..bb99e781 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypelessParamTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypelessParamTagValueNode.php @@ -10,19 +10,16 @@ class TypelessParamTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var bool */ - public $isReference; + public bool $isReference; - /** @var bool */ - public $isVariadic; + public bool $isVariadic; - /** @var string */ - public $parameterName; + public string $parameterName; /** @var string (may be empty) */ - public $description; + public string $description; - public function __construct(bool $isVariadic, string $parameterName, string $description, bool $isReference = false) + public function __construct(bool $isVariadic, string $parameterName, string $description, bool $isReference) { $this->isReference = $isReference; $this->isVariadic = $isVariadic; diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/UsesTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/UsesTagValueNode.php index cd573d97..b33fff60 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/UsesTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/UsesTagValueNode.php @@ -11,11 +11,10 @@ class UsesTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var GenericTypeNode */ - public $type; + public GenericTypeNode $type; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(GenericTypeNode $type, string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/VarTagValueNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/VarTagValueNode.php index afb941a8..5b0538c8 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/VarTagValueNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/VarTagValueNode.php @@ -11,14 +11,13 @@ class VarTagValueNode implements PhpDocTagValueNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; /** @var string (may be empty) */ - public $variableName; + public string $variableName; /** @var string (may be empty) */ - public $description; + public string $description; public function __construct(TypeNode $type, string $variableName, string $description) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeItemNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeItemNode.php index 660c6c9d..bed62381 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeItemNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeItemNode.php @@ -4,10 +4,11 @@ use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode; use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode; +use PHPStan\PhpDocParser\Ast\Node; use PHPStan\PhpDocParser\Ast\NodeAttributes; use function sprintf; -class ArrayShapeItemNode implements TypeNode +class ArrayShapeItemNode implements Node { use NodeAttributes; @@ -15,11 +16,9 @@ class ArrayShapeItemNode implements TypeNode /** @var ConstExprIntegerNode|ConstExprStringNode|IdentifierTypeNode|null */ public $keyName; - /** @var bool */ - public $optional; + public bool $optional; - /** @var TypeNode */ - public $valueType; + public TypeNode $valueType; /** * @param ConstExprIntegerNode|ConstExprStringNode|IdentifierTypeNode|null $keyName @@ -39,7 +38,7 @@ public function __toString(): string '%s%s: %s', (string) $this->keyName, $this->optional ? '?' : '', - (string) $this->valueType + (string) $this->valueType, ); } diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeNode.php index 1f4ed4a9..1d9cf850 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeNode.php @@ -10,36 +10,55 @@ class ArrayShapeNode implements TypeNode public const KIND_ARRAY = 'array'; public const KIND_LIST = 'list'; + public const KIND_NON_EMPTY_ARRAY = 'non-empty-array'; + public const KIND_NON_EMPTY_LIST = 'non-empty-list'; use NodeAttributes; /** @var ArrayShapeItemNode[] */ - public $items; + public array $items; - /** @var bool */ - public $sealed; + public bool $sealed; /** @var self::KIND_* */ public $kind; - /** @var ArrayShapeUnsealedTypeNode|null */ - public $unsealedType; + public ?ArrayShapeUnsealedTypeNode $unsealedType = null; /** * @param ArrayShapeItemNode[] $items * @param self::KIND_* $kind */ - public function __construct( + private function __construct( array $items, bool $sealed = true, - string $kind = self::KIND_ARRAY, - ?ArrayShapeUnsealedTypeNode $unsealedType = null + ?ArrayShapeUnsealedTypeNode $unsealedType = null, + string $kind = self::KIND_ARRAY ) { $this->items = $items; $this->sealed = $sealed; - $this->kind = $kind; $this->unsealedType = $unsealedType; + $this->kind = $kind; + } + + + /** + * @param ArrayShapeItemNode[] $items + * @param self::KIND_* $kind + */ + public static function createSealed(array $items, string $kind = self::KIND_ARRAY): self + { + return new self($items, true, null, $kind); + } + + /** + * @param ArrayShapeItemNode[] $items + * @param self::KIND_* $kind + */ + public static function createUnsealed(array $items, ?ArrayShapeUnsealedTypeNode $unsealedType, string $kind = self::KIND_ARRAY): self + { + return new self($items, false, $unsealedType, $kind); } diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeUnsealedTypeNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeUnsealedTypeNode.php index 7ffdf1d2..68d6b36f 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeUnsealedTypeNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeUnsealedTypeNode.php @@ -11,11 +11,9 @@ class ArrayShapeUnsealedTypeNode implements Node use NodeAttributes; - /** @var TypeNode */ - public $valueType; + public TypeNode $valueType; - /** @var TypeNode|null */ - public $keyType; + public ?TypeNode $keyType = null; public function __construct(TypeNode $valueType, ?TypeNode $keyType) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayTypeNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayTypeNode.php index d2031032..95c020d8 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayTypeNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ArrayTypeNode.php @@ -9,8 +9,7 @@ class ArrayTypeNode implements TypeNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; public function __construct(TypeNode $type) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeNode.php index 4c913198..0a9e3442 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeNode.php @@ -11,23 +11,21 @@ class CallableTypeNode implements TypeNode use NodeAttributes; - /** @var IdentifierTypeNode */ - public $identifier; + public IdentifierTypeNode $identifier; /** @var TemplateTagValueNode[] */ - public $templateTypes; + public array $templateTypes; /** @var CallableTypeParameterNode[] */ - public $parameters; + public array $parameters; - /** @var TypeNode */ - public $returnType; + public TypeNode $returnType; /** * @param CallableTypeParameterNode[] $parameters * @param TemplateTagValueNode[] $templateTypes */ - public function __construct(IdentifierTypeNode $identifier, array $parameters, TypeNode $returnType, array $templateTypes = []) + public function __construct(IdentifierTypeNode $identifier, array $parameters, TypeNode $returnType, array $templateTypes) { $this->identifier = $identifier; $this->parameters = $parameters; diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeParameterNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeParameterNode.php index c78d4c7b..08119670 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeParameterNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeParameterNode.php @@ -11,20 +11,16 @@ class CallableTypeParameterNode implements Node use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; - /** @var bool */ - public $isReference; + public bool $isReference; - /** @var bool */ - public $isVariadic; + public bool $isVariadic; /** @var string (may be empty) */ - public $parameterName; + public string $parameterName; - /** @var bool */ - public $isOptional; + public bool $isOptional; public function __construct(TypeNode $type, bool $isReference, bool $isVariadic, string $parameterName, bool $isOptional) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeForParameterNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeForParameterNode.php index fbfcae95..4c120d22 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeForParameterNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeForParameterNode.php @@ -10,20 +10,15 @@ class ConditionalTypeForParameterNode implements TypeNode use NodeAttributes; - /** @var string */ - public $parameterName; + public string $parameterName; - /** @var TypeNode */ - public $targetType; + public TypeNode $targetType; - /** @var TypeNode */ - public $if; + public TypeNode $if; - /** @var TypeNode */ - public $else; + public TypeNode $else; - /** @var bool */ - public $negated; + public bool $negated; public function __construct(string $parameterName, TypeNode $targetType, TypeNode $if, TypeNode $else, bool $negated) { @@ -42,7 +37,7 @@ public function __toString(): string $this->negated ? 'is not' : 'is', $this->targetType, $this->if, - $this->else + $this->else, ); } diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeNode.php index bfdb0db1..89c1c63f 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeNode.php @@ -10,20 +10,15 @@ class ConditionalTypeNode implements TypeNode use NodeAttributes; - /** @var TypeNode */ - public $subjectType; + public TypeNode $subjectType; - /** @var TypeNode */ - public $targetType; + public TypeNode $targetType; - /** @var TypeNode */ - public $if; + public TypeNode $if; - /** @var TypeNode */ - public $else; + public TypeNode $else; - /** @var bool */ - public $negated; + public bool $negated; public function __construct(TypeNode $subjectType, TypeNode $targetType, TypeNode $if, TypeNode $else, bool $negated) { @@ -42,7 +37,7 @@ public function __toString(): string $this->negated ? 'is not' : 'is', $this->targetType, $this->if, - $this->else + $this->else, ); } diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ConstTypeNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ConstTypeNode.php index 0096055b..22823e5b 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ConstTypeNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ConstTypeNode.php @@ -10,8 +10,7 @@ class ConstTypeNode implements TypeNode use NodeAttributes; - /** @var ConstExprNode */ - public $constExpr; + public ConstExprNode $constExpr; public function __construct(ConstExprNode $constExpr) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/GenericTypeNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/GenericTypeNode.php index 44e1d16d..4e52c00a 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/GenericTypeNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/GenericTypeNode.php @@ -16,14 +16,13 @@ class GenericTypeNode implements TypeNode use NodeAttributes; - /** @var IdentifierTypeNode */ - public $type; + public IdentifierTypeNode $type; /** @var TypeNode[] */ - public $genericTypes; + public array $genericTypes; /** @var (self::VARIANCE_*)[] */ - public $variances; + public array $variances; /** * @param TypeNode[] $genericTypes diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/IdentifierTypeNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/IdentifierTypeNode.php index 29bac308..df93fa86 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/IdentifierTypeNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/IdentifierTypeNode.php @@ -9,8 +9,7 @@ class IdentifierTypeNode implements TypeNode use NodeAttributes; - /** @var string */ - public $name; + public string $name; public function __construct(string $name) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/IntersectionTypeNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/IntersectionTypeNode.php index fd761cf7..b3059cf5 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/IntersectionTypeNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/IntersectionTypeNode.php @@ -12,7 +12,7 @@ class IntersectionTypeNode implements TypeNode use NodeAttributes; /** @var TypeNode[] */ - public $types; + public array $types; /** * @param TypeNode[] $types diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/InvalidTypeNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/InvalidTypeNode.php index 1ec47cf6..318176e7 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/InvalidTypeNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/InvalidTypeNode.php @@ -11,7 +11,7 @@ class InvalidTypeNode implements TypeNode use NodeAttributes; /** @var mixed[] */ - private $exceptionArgs; + private array $exceptionArgs; public function __construct(ParserException $exception) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/NullableTypeNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/NullableTypeNode.php index 73f438cd..080a13f2 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/NullableTypeNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/NullableTypeNode.php @@ -9,8 +9,7 @@ class NullableTypeNode implements TypeNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; public function __construct(TypeNode $type) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeItemNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeItemNode.php index 2f012406..f7aa9efb 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeItemNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeItemNode.php @@ -3,10 +3,11 @@ namespace PHPStan\PhpDocParser\Ast\Type; use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode; +use PHPStan\PhpDocParser\Ast\Node; use PHPStan\PhpDocParser\Ast\NodeAttributes; use function sprintf; -class ObjectShapeItemNode implements TypeNode +class ObjectShapeItemNode implements Node { use NodeAttributes; @@ -14,11 +15,9 @@ class ObjectShapeItemNode implements TypeNode /** @var ConstExprStringNode|IdentifierTypeNode */ public $keyName; - /** @var bool */ - public $optional; + public bool $optional; - /** @var TypeNode */ - public $valueType; + public TypeNode $valueType; /** * @param ConstExprStringNode|IdentifierTypeNode $keyName @@ -38,7 +37,7 @@ public function __toString(): string '%s%s: %s', (string) $this->keyName, $this->optional ? '?' : '', - (string) $this->valueType + (string) $this->valueType, ); } diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeNode.php index f418bc30..41dc68c3 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeNode.php @@ -11,7 +11,7 @@ class ObjectShapeNode implements TypeNode use NodeAttributes; /** @var ObjectShapeItemNode[] */ - public $items; + public array $items; /** * @param ObjectShapeItemNode[] $items diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/OffsetAccessTypeNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/OffsetAccessTypeNode.php index c27ec0a3..4bd67d8d 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/OffsetAccessTypeNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/OffsetAccessTypeNode.php @@ -9,11 +9,9 @@ class OffsetAccessTypeNode implements TypeNode use NodeAttributes; - /** @var TypeNode */ - public $type; + public TypeNode $type; - /** @var TypeNode */ - public $offset; + public TypeNode $offset; public function __construct(TypeNode $type, TypeNode $offset) { diff --git a/vendor/phpstan/phpdoc-parser/src/Ast/Type/UnionTypeNode.php b/vendor/phpstan/phpdoc-parser/src/Ast/Type/UnionTypeNode.php index c552dab5..602cb3dd 100644 --- a/vendor/phpstan/phpdoc-parser/src/Ast/Type/UnionTypeNode.php +++ b/vendor/phpstan/phpdoc-parser/src/Ast/Type/UnionTypeNode.php @@ -12,7 +12,7 @@ class UnionTypeNode implements TypeNode use NodeAttributes; /** @var TypeNode[] */ - public $types; + public array $types; /** * @param TypeNode[] $types diff --git a/vendor/phpstan/phpdoc-parser/src/Lexer/Lexer.php b/vendor/phpstan/phpdoc-parser/src/Lexer/Lexer.php index 32539faf..be85fa9f 100644 --- a/vendor/phpstan/phpdoc-parser/src/Lexer/Lexer.php +++ b/vendor/phpstan/phpdoc-parser/src/Lexer/Lexer.php @@ -2,6 +2,7 @@ namespace PHPStan\PhpDocParser\Lexer; +use PHPStan\PhpDocParser\ParserConfig; use function implode; use function preg_match_all; use const PREG_SET_ORDER; @@ -94,17 +95,16 @@ class Lexer public const TYPE_OFFSET = 1; public const LINE_OFFSET = 2; - /** @var bool */ - private $parseDoctrineAnnotations; + private ParserConfig $config; // @phpstan-ignore property.onlyWritten - /** @var string|null */ - private $regexp; + private ?string $regexp = null; - public function __construct(bool $parseDoctrineAnnotations = false) + public function __construct(ParserConfig $config) { - $this->parseDoctrineAnnotations = $parseDoctrineAnnotations; + $this->config = $config; } + /** * @return list */ @@ -170,23 +170,20 @@ private function generateRegexp(): string self::TOKEN_OPEN_PHPDOC => '/\\*\\*(?=\\s)\\x20?+', self::TOKEN_CLOSE_PHPDOC => '\\*/', self::TOKEN_PHPDOC_TAG => '@(?:[a-z][a-z0-9-\\\\]+:)?[a-z][a-z0-9-\\\\]*+', + self::TOKEN_DOCTRINE_TAG => '@[a-z_\\\\][a-z0-9_\:\\\\]*[a-z_][a-z0-9_]*', self::TOKEN_PHPDOC_EOL => '\\r?+\\n[\\x09\\x20]*+(?:\\*(?!/)\\x20?+)?', self::TOKEN_FLOAT => '[+\-]?(?:(?:[0-9]++(_[0-9]++)*\\.[0-9]*+(_[0-9]++)*(?:e[+\-]?[0-9]++(_[0-9]++)*)?)|(?:[0-9]*+(_[0-9]++)*\\.[0-9]++(_[0-9]++)*(?:e[+\-]?[0-9]++(_[0-9]++)*)?)|(?:[0-9]++(_[0-9]++)*e[+\-]?[0-9]++(_[0-9]++)*))', self::TOKEN_INTEGER => '[+\-]?(?:(?:0b[0-1]++(_[0-1]++)*)|(?:0o[0-7]++(_[0-7]++)*)|(?:0x[0-9a-f]++(_[0-9a-f]++)*)|(?:[0-9]++(_[0-9]++)*))', self::TOKEN_SINGLE_QUOTED_STRING => '\'(?:\\\\[^\\r\\n]|[^\'\\r\\n\\\\])*+\'', self::TOKEN_DOUBLE_QUOTED_STRING => '"(?:\\\\[^\\r\\n]|[^"\\r\\n\\\\])*+"', + self::TOKEN_DOCTRINE_ANNOTATION_STRING => '"(?:""|[^"])*+"', self::TOKEN_WILDCARD => '\\*', - ]; - if ($this->parseDoctrineAnnotations) { - $patterns[self::TOKEN_DOCTRINE_TAG] = '@[a-z_\\\\][a-z0-9_\:\\\\]*[a-z_][a-z0-9_]*'; - $patterns[self::TOKEN_DOCTRINE_ANNOTATION_STRING] = '"(?:""|[^"])*+"'; - } - - // anything but TOKEN_CLOSE_PHPDOC or TOKEN_HORIZONTAL_WS or TOKEN_EOL - $patterns[self::TOKEN_OTHER] = '(?:(?!\\*/)[^\\s])++'; + // anything but TOKEN_CLOSE_PHPDOC or TOKEN_HORIZONTAL_WS or TOKEN_EOL + self::TOKEN_OTHER => '(?:(?!\\*/)[^\\s])++', + ]; foreach ($patterns as $type => &$pattern) { $pattern = '(?:' . $pattern . ')(*MARK:' . $type . ')'; diff --git a/vendor/phpstan/phpdoc-parser/src/Parser/ConstExprParser.php b/vendor/phpstan/phpdoc-parser/src/Parser/ConstExprParser.php index f6a7306e..396b8d7c 100644 --- a/vendor/phpstan/phpdoc-parser/src/Parser/ConstExprParser.php +++ b/vendor/phpstan/phpdoc-parser/src/Parser/ConstExprParser.php @@ -4,41 +4,22 @@ use PHPStan\PhpDocParser\Ast; use PHPStan\PhpDocParser\Lexer\Lexer; +use PHPStan\PhpDocParser\ParserConfig; use function str_replace; use function strtolower; -use function substr; class ConstExprParser { - /** @var bool */ - private $unescapeStrings; + private ParserConfig $config; - /** @var bool */ - private $quoteAwareConstExprString; + private bool $parseDoctrineStrings; - /** @var bool */ - private $useLinesAttributes; - - /** @var bool */ - private $useIndexAttributes; - - /** @var bool */ - private $parseDoctrineStrings; - - /** - * @param array{lines?: bool, indexes?: bool} $usedAttributes - */ public function __construct( - bool $unescapeStrings = false, - bool $quoteAwareConstExprString = false, - array $usedAttributes = [] + ParserConfig $config ) { - $this->unescapeStrings = $unescapeStrings; - $this->quoteAwareConstExprString = $quoteAwareConstExprString; - $this->useLinesAttributes = $usedAttributes['lines'] ?? false; - $this->useIndexAttributes = $usedAttributes['indexes'] ?? false; + $this->config = $config; $this->parseDoctrineStrings = false; } @@ -47,19 +28,12 @@ public function __construct( */ public function toDoctrine(): self { - $self = new self( - $this->unescapeStrings, - $this->quoteAwareConstExprString, - [ - 'lines' => $this->useLinesAttributes, - 'indexes' => $this->useIndexAttributes, - ] - ); + $self = new self($this->config); $self->parseDoctrineStrings = true; return $self; } - public function parse(TokenIterator $tokens, bool $trimStrings = false): Ast\ConstExpr\ConstExprNode + public function parse(TokenIterator $tokens): Ast\ConstExpr\ConstExprNode { $startLine = $tokens->currentTokenLine(); $startIndex = $tokens->currentTokenIndex(); @@ -71,7 +45,7 @@ public function parse(TokenIterator $tokens, bool $trimStrings = false): Ast\Con $tokens, new Ast\ConstExpr\ConstExprFloatNode(str_replace('_', '', $value)), $startLine, - $startIndex + $startIndex, ); } @@ -83,7 +57,7 @@ public function parse(TokenIterator $tokens, bool $trimStrings = false): Ast\Con $tokens, new Ast\ConstExpr\ConstExprIntegerNode(str_replace('_', '', $value)), $startLine, - $startIndex + $startIndex, ); } @@ -95,7 +69,7 @@ public function parse(TokenIterator $tokens, bool $trimStrings = false): Ast\Con $tokens, new Ast\ConstExpr\DoctrineConstExprStringNode(Ast\ConstExpr\DoctrineConstExprStringNode::unescape($value)), $startLine, - $startIndex + $startIndex, ); } @@ -108,7 +82,7 @@ public function parse(TokenIterator $tokens, bool $trimStrings = false): Ast\Con $tokens->currentTokenOffset(), Lexer::TOKEN_DOUBLE_QUOTED_STRING, null, - $tokens->currentTokenLine() + $tokens->currentTokenLine(), ); } @@ -119,39 +93,24 @@ public function parse(TokenIterator $tokens, bool $trimStrings = false): Ast\Con $tokens, $this->parseDoctrineString($value, $tokens), $startLine, - $startIndex + $startIndex, ); } - $value = $tokens->currentTokenValue(); + + $value = StringUnescaper::unescapeString($tokens->currentTokenValue()); $type = $tokens->currentTokenType(); - if ($trimStrings) { - if ($this->unescapeStrings) { - $value = StringUnescaper::unescapeString($value); - } else { - $value = substr($value, 1, -1); - } - } $tokens->next(); - if ($this->quoteAwareConstExprString) { - return $this->enrichWithAttributes( - $tokens, - new Ast\ConstExpr\QuoteAwareConstExprStringNode( - $value, - $type === Lexer::TOKEN_SINGLE_QUOTED_STRING - ? Ast\ConstExpr\QuoteAwareConstExprStringNode::SINGLE_QUOTED - : Ast\ConstExpr\QuoteAwareConstExprStringNode::DOUBLE_QUOTED - ), - $startLine, - $startIndex - ); - } - return $this->enrichWithAttributes( $tokens, - new Ast\ConstExpr\ConstExprStringNode($value), + new Ast\ConstExpr\ConstExprStringNode( + $value, + $type === Lexer::TOKEN_SINGLE_QUOTED_STRING + ? Ast\ConstExpr\ConstExprStringNode::SINGLE_QUOTED + : Ast\ConstExpr\ConstExprStringNode::DOUBLE_QUOTED, + ), $startLine, - $startIndex + $startIndex, ); } elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_IDENTIFIER)) { @@ -164,21 +123,21 @@ public function parse(TokenIterator $tokens, bool $trimStrings = false): Ast\Con $tokens, new Ast\ConstExpr\ConstExprTrueNode(), $startLine, - $startIndex + $startIndex, ); case 'false': return $this->enrichWithAttributes( $tokens, new Ast\ConstExpr\ConstExprFalseNode(), $startLine, - $startIndex + $startIndex, ); case 'null': return $this->enrichWithAttributes( $tokens, new Ast\ConstExpr\ConstExprNullNode(), $startLine, - $startIndex + $startIndex, ); case 'array': $tokens->consumeTokenType(Lexer::TOKEN_OPEN_PARENTHESES); @@ -220,7 +179,7 @@ public function parse(TokenIterator $tokens, bool $trimStrings = false): Ast\Con $tokens, new Ast\ConstExpr\ConstFetchNode($identifier, $classConstantName), $startLine, - $startIndex + $startIndex, ); } @@ -229,7 +188,7 @@ public function parse(TokenIterator $tokens, bool $trimStrings = false): Ast\Con $tokens, new Ast\ConstExpr\ConstFetchNode('', $identifier), $startLine, - $startIndex + $startIndex, ); } elseif ($tokens->tryConsumeTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) { @@ -242,7 +201,7 @@ public function parse(TokenIterator $tokens, bool $trimStrings = false): Ast\Con $tokens->currentTokenOffset(), Lexer::TOKEN_IDENTIFIER, null, - $tokens->currentTokenLine() + $tokens->currentTokenLine(), ); } @@ -264,7 +223,7 @@ private function parseArray(TokenIterator $tokens, int $endToken, int $startInde $tokens, new Ast\ConstExpr\ConstExprArrayNode($items), $startLine, - $startIndex + $startIndex, ); } @@ -306,7 +265,7 @@ private function parseArrayItem(TokenIterator $tokens): Ast\ConstExpr\ConstExprA $tokens, new Ast\ConstExpr\ConstExprArrayItemNode($key, $value), $startLine, - $startIndex + $startIndex, ); } @@ -317,12 +276,12 @@ private function parseArrayItem(TokenIterator $tokens): Ast\ConstExpr\ConstExprA */ private function enrichWithAttributes(TokenIterator $tokens, Ast\ConstExpr\ConstExprNode $node, int $startLine, int $startIndex): Ast\ConstExpr\ConstExprNode { - if ($this->useLinesAttributes) { + if ($this->config->useLinesAttributes) { $node->setAttribute(Ast\Attribute::START_LINE, $startLine); $node->setAttribute(Ast\Attribute::END_LINE, $tokens->currentTokenLine()); } - if ($this->useIndexAttributes) { + if ($this->config->useIndexAttributes) { $node->setAttribute(Ast\Attribute::START_INDEX, $startIndex); $node->setAttribute(Ast\Attribute::END_INDEX, $tokens->endIndexOfLastRelevantToken()); } diff --git a/vendor/phpstan/phpdoc-parser/src/Parser/ParserException.php b/vendor/phpstan/phpdoc-parser/src/Parser/ParserException.php index 6ab5cc07..ae72fd9c 100644 --- a/vendor/phpstan/phpdoc-parser/src/Parser/ParserException.php +++ b/vendor/phpstan/phpdoc-parser/src/Parser/ParserException.php @@ -14,31 +14,25 @@ class ParserException extends Exception { - /** @var string */ - private $currentTokenValue; + private string $currentTokenValue; - /** @var int */ - private $currentTokenType; + private int $currentTokenType; - /** @var int */ - private $currentOffset; + private int $currentOffset; - /** @var int */ - private $expectedTokenType; + private int $expectedTokenType; - /** @var string|null */ - private $expectedTokenValue; + private ?string $expectedTokenValue; - /** @var int|null */ - private $currentTokenLine; + private ?int $currentTokenLine; public function __construct( string $currentTokenValue, int $currentTokenType, int $currentOffset, int $expectedTokenType, - ?string $expectedTokenValue = null, - ?int $currentTokenLine = null + ?string $expectedTokenValue, + ?int $currentTokenLine ) { $this->currentTokenValue = $currentTokenValue; @@ -54,7 +48,7 @@ public function __construct( Lexer::TOKEN_LABELS[$expectedTokenType], $expectedTokenValue !== null ? sprintf(' (%s)', $this->formatValue($expectedTokenValue)) : '', $currentOffset, - $currentTokenLine === null ? '' : sprintf(' on line %d', $currentTokenLine) + $currentTokenLine === null ? '' : sprintf(' on line %d', $currentTokenLine), )); } diff --git a/vendor/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php b/vendor/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php index e46e0941..ac717b95 100644 --- a/vendor/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php +++ b/vendor/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php @@ -10,9 +10,9 @@ use PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine; use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode; use PHPStan\PhpDocParser\Lexer\Lexer; +use PHPStan\PhpDocParser\ParserConfig; use PHPStan\ShouldNotHappenException; use function array_key_exists; -use function array_values; use function count; use function rtrim; use function str_replace; @@ -29,55 +29,24 @@ class PhpDocParser Lexer::TOKEN_INTERSECTION, ]; - /** @var TypeParser */ - private $typeParser; + private ParserConfig $config; - /** @var ConstExprParser */ - private $constantExprParser; + private TypeParser $typeParser; - /** @var ConstExprParser */ - private $doctrineConstantExprParser; + private ConstExprParser $constantExprParser; - /** @var bool */ - private $requireWhitespaceBeforeDescription; + private ConstExprParser $doctrineConstantExprParser; - /** @var bool */ - private $preserveTypeAliasesWithInvalidTypes; - - /** @var bool */ - private $parseDoctrineAnnotations; - - /** @var bool */ - private $useLinesAttributes; - - /** @var bool */ - private $useIndexAttributes; - - /** @var bool */ - private $textBetweenTagsBelongsToDescription; - - /** - * @param array{lines?: bool, indexes?: bool} $usedAttributes - */ public function __construct( + ParserConfig $config, TypeParser $typeParser, - ConstExprParser $constantExprParser, - bool $requireWhitespaceBeforeDescription = false, - bool $preserveTypeAliasesWithInvalidTypes = false, - array $usedAttributes = [], - bool $parseDoctrineAnnotations = false, - bool $textBetweenTagsBelongsToDescription = false + ConstExprParser $constantExprParser ) { + $this->config = $config; $this->typeParser = $typeParser; $this->constantExprParser = $constantExprParser; $this->doctrineConstantExprParser = $constantExprParser->toDoctrine(); - $this->requireWhitespaceBeforeDescription = $requireWhitespaceBeforeDescription; - $this->preserveTypeAliasesWithInvalidTypes = $preserveTypeAliasesWithInvalidTypes; - $this->parseDoctrineAnnotations = $parseDoctrineAnnotations; - $this->useLinesAttributes = $usedAttributes['lines'] ?? false; - $this->useIndexAttributes = $usedAttributes['indexes'] ?? false; - $this->textBetweenTagsBelongsToDescription = $textBetweenTagsBelongsToDescription; } @@ -88,44 +57,35 @@ public function parse(TokenIterator $tokens): Ast\PhpDoc\PhpDocNode $children = []; - if ($this->parseDoctrineAnnotations) { - if (!$tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) { - $lastChild = $this->parseChild($tokens); - $children[] = $lastChild; - while (!$tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) { - if ( - $lastChild instanceof Ast\PhpDoc\PhpDocTagNode - && ( - $lastChild->value instanceof Doctrine\DoctrineTagValueNode - || $lastChild->value instanceof Ast\PhpDoc\GenericTagValueNode - ) - ) { - $tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL); - if ($tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) { - break; - } - $lastChild = $this->parseChild($tokens); - $children[] = $lastChild; - continue; - } - - if (!$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL)) { - break; - } + if (!$tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) { + $lastChild = $this->parseChild($tokens); + $children[] = $lastChild; + while (!$tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) { + if ( + $lastChild instanceof Ast\PhpDoc\PhpDocTagNode + && ( + $lastChild->value instanceof Doctrine\DoctrineTagValueNode + || $lastChild->value instanceof Ast\PhpDoc\GenericTagValueNode + ) + ) { + $tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL); if ($tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) { break; } - $lastChild = $this->parseChild($tokens); $children[] = $lastChild; + continue; } - } - } else { - if (!$tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) { - $children[] = $this->parseChild($tokens); - while ($tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL) && !$tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) { - $children[] = $this->parseChild($tokens); + + if (!$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL)) { + break; } + if ($tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) { + break; + } + + $lastChild = $this->parseChild($tokens); + $children[] = $lastChild; } } @@ -150,8 +110,8 @@ public function parse(TokenIterator $tokens): Ast\PhpDoc\PhpDocNode $tokens, new Ast\PhpDoc\InvalidTagValueNode($e->getMessage(), $e), $startLine, - $startIndex - ) + $startIndex, + ), ); $tokens->forwardToTheEnd(); @@ -159,7 +119,7 @@ public function parse(TokenIterator $tokens): Ast\PhpDoc\PhpDocNode return $this->enrichWithAttributes($tokens, new Ast\PhpDoc\PhpDocNode([$this->enrichWithAttributes($tokens, $tag, $startLine, $startIndex)]), 1, 0); } - return $this->enrichWithAttributes($tokens, new Ast\PhpDoc\PhpDocNode(array_values($children)), 1, 0); + return $this->enrichWithAttributes($tokens, new Ast\PhpDoc\PhpDocNode($children), 1, 0); } @@ -187,8 +147,8 @@ private function parseChild(TokenIterator $tokens): Ast\PhpDoc\PhpDocChildNode $tokens, $this->parseDoctrineTagValue($tokens, $tag), $tagStartLine, - $tagStartIndex - ) + $tagStartIndex, + ), ), $startLine, $startIndex); } @@ -206,12 +166,12 @@ private function parseChild(TokenIterator $tokens): Ast\PhpDoc\PhpDocChildNode */ private function enrichWithAttributes(TokenIterator $tokens, Ast\Node $tag, int $startLine, int $startIndex): Ast\Node { - if ($this->useLinesAttributes) { + if ($this->config->useLinesAttributes) { $tag->setAttribute(Ast\Attribute::START_LINE, $startLine); $tag->setAttribute(Ast\Attribute::END_LINE, $tokens->currentTokenLine()); } - if ($this->useIndexAttributes) { + if ($this->config->useIndexAttributes) { $tag->setAttribute(Ast\Attribute::START_INDEX, $startIndex); $tag->setAttribute(Ast\Attribute::END_INDEX, $tokens->endIndexOfLastRelevantToken()); } @@ -224,31 +184,26 @@ private function parseText(TokenIterator $tokens): Ast\PhpDoc\PhpDocTextNode { $text = ''; - $endTokens = [Lexer::TOKEN_PHPDOC_EOL, Lexer::TOKEN_CLOSE_PHPDOC, Lexer::TOKEN_END]; - if ($this->textBetweenTagsBelongsToDescription) { - $endTokens = [Lexer::TOKEN_CLOSE_PHPDOC, Lexer::TOKEN_END]; - } + $endTokens = [Lexer::TOKEN_CLOSE_PHPDOC, Lexer::TOKEN_END]; $savepoint = false; // if the next token is EOL, everything below is skipped and empty string is returned - while ($this->textBetweenTagsBelongsToDescription || !$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL)) { + while (true) { $tmpText = $tokens->getSkippedHorizontalWhiteSpaceIfAny() . $tokens->joinUntil(Lexer::TOKEN_PHPDOC_EOL, ...$endTokens); $text .= $tmpText; // stop if we're not at EOL - meaning it's the end of PHPDoc - if (!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL)) { + if (!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL, Lexer::TOKEN_CLOSE_PHPDOC)) { break; } - if ($this->textBetweenTagsBelongsToDescription) { - if (!$savepoint) { - $tokens->pushSavePoint(); - $savepoint = true; - } elseif ($tmpText !== '') { - $tokens->dropSavePoint(); - $tokens->pushSavePoint(); - } + if (!$savepoint) { + $tokens->pushSavePoint(); + $savepoint = true; + } elseif ($tmpText !== '') { + $tokens->dropSavePoint(); + $tokens->pushSavePoint(); } $tokens->pushSavePoint(); @@ -280,20 +235,17 @@ private function parseOptionalDescriptionAfterDoctrineTag(TokenIterator $tokens) { $text = ''; - $endTokens = [Lexer::TOKEN_PHPDOC_EOL, Lexer::TOKEN_CLOSE_PHPDOC, Lexer::TOKEN_END]; - if ($this->textBetweenTagsBelongsToDescription) { - $endTokens = [Lexer::TOKEN_CLOSE_PHPDOC, Lexer::TOKEN_END]; - } + $endTokens = [Lexer::TOKEN_CLOSE_PHPDOC, Lexer::TOKEN_END]; $savepoint = false; // if the next token is EOL, everything below is skipped and empty string is returned - while ($this->textBetweenTagsBelongsToDescription || !$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL)) { + while (true) { $tmpText = $tokens->getSkippedHorizontalWhiteSpaceIfAny() . $tokens->joinUntil(Lexer::TOKEN_PHPDOC_TAG, Lexer::TOKEN_DOCTRINE_TAG, Lexer::TOKEN_PHPDOC_EOL, ...$endTokens); $text .= $tmpText; // stop if we're not at EOL - meaning it's the end of PHPDoc - if (!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL)) { + if (!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL, Lexer::TOKEN_CLOSE_PHPDOC)) { if (!$tokens->isPrecededByHorizontalWhitespace()) { return trim($text . $this->parseText($tokens)->text, " \t"); } @@ -327,14 +279,12 @@ private function parseOptionalDescriptionAfterDoctrineTag(TokenIterator $tokens) break; } - if ($this->textBetweenTagsBelongsToDescription) { - if (!$savepoint) { - $tokens->pushSavePoint(); - $savepoint = true; - } elseif ($tmpText !== '') { - $tokens->dropSavePoint(); - $tokens->pushSavePoint(); - } + if (!$savepoint) { + $tokens->pushSavePoint(); + $savepoint = true; + } elseif ($tmpText !== '') { + $tokens->dropSavePoint(); + $tokens->pushSavePoint(); } $tokens->pushSavePoint(); @@ -403,6 +353,11 @@ public function parseTagValue(TokenIterator $tokens, string $tag): Ast\PhpDoc\Ph $tagValue = $this->parseParamClosureThisTagValue($tokens); break; + case '@pure-unless-callable-is-impure': + case '@phpstan-pure-unless-callable-is-impure': + $tagValue = $this->parsePureUnlessCallableIsImpureTagValue($tokens); + break; + case '@var': case '@phpstan-var': case '@psalm-var': @@ -476,9 +431,7 @@ public function parseTagValue(TokenIterator $tokens, string $tag): Ast\PhpDoc\Ph case '@psalm-template-contravariant': $tagValue = $this->typeParser->parseTemplateTagValue( $tokens, - function ($tokens) { - return $this->parseOptionalDescription($tokens); - } + fn ($tokens) => $this->parseOptionalDescription($tokens, true), ); break; @@ -539,17 +492,11 @@ function ($tokens) { break; default: - if ($this->parseDoctrineAnnotations) { - if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) { - $tagValue = $this->parseDoctrineTagValue($tokens, $tag); - } else { - $tagValue = new Ast\PhpDoc\GenericTagValueNode($this->parseOptionalDescriptionAfterDoctrineTag($tokens)); - } - break; + if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) { + $tagValue = $this->parseDoctrineTagValue($tokens, $tag); + } else { + $tagValue = new Ast\PhpDoc\GenericTagValueNode($this->parseOptionalDescriptionAfterDoctrineTag($tokens)); } - - $tagValue = new Ast\PhpDoc\GenericTagValueNode($this->parseOptionalDescription($tokens)); - break; } @@ -557,7 +504,7 @@ function ($tokens) { } catch (ParserException $e) { $tokens->rollback(); - $tagValue = new Ast\PhpDoc\InvalidTagValueNode($this->parseOptionalDescription($tokens), $e); + $tagValue = new Ast\PhpDoc\InvalidTagValueNode($this->parseOptionalDescription($tokens, false), $e); } return $this->enrichWithAttributes($tokens, $tagValue, $startLine, $startIndex); @@ -574,9 +521,9 @@ private function parseDoctrineTagValue(TokenIterator $tokens, string $tag): Ast\ $tokens, new Doctrine\DoctrineAnnotation($tag, $this->parseDoctrineArguments($tokens, false)), $startLine, - $startIndex + $startIndex, ), - $this->parseOptionalDescriptionAfterDoctrineTag($tokens) + $this->parseOptionalDescriptionAfterDoctrineTag($tokens), ); } @@ -627,7 +574,7 @@ private function parseDoctrineArgument(TokenIterator $tokens): Doctrine\Doctrine $tokens, new Doctrine\DoctrineArgument(null, $this->parseDoctrineArgumentValue($tokens)), $startLine, - $startIndex + $startIndex, ); } @@ -643,7 +590,7 @@ private function parseDoctrineArgument(TokenIterator $tokens): Doctrine\Doctrine $tokens, new IdentifierTypeNode($currentValue), $startLine, - $startIndex + $startIndex, ); $tokens->consumeTokenType(Lexer::TOKEN_EQUAL); @@ -655,7 +602,7 @@ private function parseDoctrineArgument(TokenIterator $tokens): Doctrine\Doctrine $tokens, new Doctrine\DoctrineArgument($key, $value), $startLine, - $startIndex + $startIndex, ); } catch (ParserException $e) { $tokens->rollback(); @@ -664,7 +611,7 @@ private function parseDoctrineArgument(TokenIterator $tokens): Doctrine\Doctrine $tokens, new Doctrine\DoctrineArgument(null, $this->parseDoctrineArgumentValue($tokens)), $startLine, - $startIndex + $startIndex, ); } } @@ -686,7 +633,7 @@ private function parseDoctrineArgumentValue(TokenIterator $tokens) $tokens, new Doctrine\DoctrineAnnotation($name, $this->parseDoctrineArguments($tokens, true)), $startLine, - $startIndex + $startIndex, ); } @@ -705,7 +652,7 @@ private function parseDoctrineArgumentValue(TokenIterator $tokens) $tokens, new Doctrine\DoctrineArray($items), $startLine, - $startIndex + $startIndex, ); } @@ -716,7 +663,7 @@ private function parseDoctrineArgumentValue(TokenIterator $tokens) $tokens, new Ast\Type\IdentifierTypeNode($currentTokenValue), $startLine, - $startIndex + $startIndex, ); if (!$tokens->isCurrentTokenType(Lexer::TOKEN_DOUBLE_COLON)) { $tokens->dropSavePoint(); @@ -734,7 +681,7 @@ private function parseDoctrineArgumentValue(TokenIterator $tokens) $currentTokenLine = $tokens->currentTokenLine(); try { - $constExpr = $this->doctrineConstantExprParser->parse($tokens, true); + $constExpr = $this->doctrineConstantExprParser->parse($tokens); if ($constExpr instanceof Ast\ConstExpr\ConstExprArrayNode) { throw new ParserException( $currentTokenValue, @@ -742,7 +689,7 @@ private function parseDoctrineArgumentValue(TokenIterator $tokens) $currentTokenOffset, Lexer::TOKEN_IDENTIFIER, null, - $currentTokenLine + $currentTokenLine, ); } @@ -754,7 +701,7 @@ private function parseDoctrineArgumentValue(TokenIterator $tokens) $currentTokenOffset, Lexer::TOKEN_IDENTIFIER, null, - $currentTokenLine + $currentTokenLine, ); } } @@ -783,7 +730,7 @@ private function parseDoctrineArrayItem(TokenIterator $tokens): Doctrine\Doctrin $tokens, new Doctrine\DoctrineArrayItem($key, $value), $startLine, - $startIndex + $startIndex, ); } catch (ParserException $e) { $tokens->rollback(); @@ -792,7 +739,7 @@ private function parseDoctrineArrayItem(TokenIterator $tokens): Doctrine\Doctrin $tokens, new Doctrine\DoctrineArrayItem(null, $this->parseDoctrineArgumentValue($tokens)), $startLine, - $startIndex + $startIndex, ); } } @@ -811,10 +758,14 @@ private function parseDoctrineArrayKey(TokenIterator $tokens) $tokens->next(); } elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_DOCTRINE_ANNOTATION_STRING)) { - $key = new Ast\ConstExpr\DoctrineConstExprStringNode(Ast\ConstExpr\DoctrineConstExprStringNode::unescape($tokens->currentTokenValue())); + $key = $this->doctrineConstantExprParser->parseDoctrineString($tokens->currentTokenValue(), $tokens); $tokens->next(); + } elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_SINGLE_QUOTED_STRING)) { + $key = new Ast\ConstExpr\ConstExprStringNode(StringUnescaper::unescapeString($tokens->currentTokenValue()), Ast\ConstExpr\ConstExprStringNode::SINGLE_QUOTED); + $tokens->next(); + } elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_DOUBLE_QUOTED_STRING)) { $value = $tokens->currentTokenValue(); $tokens->next(); @@ -831,7 +782,7 @@ private function parseDoctrineArrayKey(TokenIterator $tokens) $tokens->currentTokenOffset(), Lexer::TOKEN_IDENTIFIER, null, - $tokens->currentTokenLine() + $tokens->currentTokenLine(), ); } @@ -842,12 +793,12 @@ private function parseDoctrineArrayKey(TokenIterator $tokens) $tokens, new IdentifierTypeNode($currentTokenValue), $startLine, - $startIndex + $startIndex, ); } $tokens->rollback(); - $constExpr = $this->doctrineConstantExprParser->parse($tokens, true); + $constExpr = $this->doctrineConstantExprParser->parse($tokens); if (!$constExpr instanceof Ast\ConstExpr\ConstFetchNode) { throw new ParserException( $tokens->currentTokenValue(), @@ -855,7 +806,7 @@ private function parseDoctrineArrayKey(TokenIterator $tokens) $tokens->currentTokenOffset(), Lexer::TOKEN_IDENTIFIER, null, - $tokens->currentTokenLine() + $tokens->currentTokenLine(), ); } @@ -882,7 +833,7 @@ private function parseParamTagValue(TokenIterator $tokens): Ast\PhpDoc\PhpDocTag $isReference = $tokens->tryConsumeTokenType(Lexer::TOKEN_REFERENCE); $isVariadic = $tokens->tryConsumeTokenType(Lexer::TOKEN_VARIADIC); $parameterName = $this->parseRequiredVariableName($tokens); - $description = $this->parseOptionalDescription($tokens); + $description = $this->parseOptionalDescription($tokens, false); if ($type !== null) { return new Ast\PhpDoc\ParamTagValueNode($type, $isVariadic, $parameterName, $description, $isReference); @@ -895,7 +846,7 @@ private function parseParamTagValue(TokenIterator $tokens): Ast\PhpDoc\PhpDocTag private function parseParamImmediatelyInvokedCallableTagValue(TokenIterator $tokens): Ast\PhpDoc\ParamImmediatelyInvokedCallableTagValueNode { $parameterName = $this->parseRequiredVariableName($tokens); - $description = $this->parseOptionalDescription($tokens); + $description = $this->parseOptionalDescription($tokens, false); return new Ast\PhpDoc\ParamImmediatelyInvokedCallableTagValueNode($parameterName, $description); } @@ -904,7 +855,7 @@ private function parseParamImmediatelyInvokedCallableTagValue(TokenIterator $tok private function parseParamLaterInvokedCallableTagValue(TokenIterator $tokens): Ast\PhpDoc\ParamLaterInvokedCallableTagValueNode { $parameterName = $this->parseRequiredVariableName($tokens); - $description = $this->parseOptionalDescription($tokens); + $description = $this->parseOptionalDescription($tokens, false); return new Ast\PhpDoc\ParamLaterInvokedCallableTagValueNode($parameterName, $description); } @@ -914,11 +865,18 @@ private function parseParamClosureThisTagValue(TokenIterator $tokens): Ast\PhpDo { $type = $this->typeParser->parse($tokens); $parameterName = $this->parseRequiredVariableName($tokens); - $description = $this->parseOptionalDescription($tokens); + $description = $this->parseOptionalDescription($tokens, false); return new Ast\PhpDoc\ParamClosureThisTagValueNode($type, $parameterName, $description); } + private function parsePureUnlessCallableIsImpureTagValue(TokenIterator $tokens): Ast\PhpDoc\PureUnlessCallableIsImpureTagValueNode + { + $parameterName = $this->parseRequiredVariableName($tokens); + $description = $this->parseOptionalDescription($tokens, false); + + return new Ast\PhpDoc\PureUnlessCallableIsImpureTagValueNode($parameterName, $description); + } private function parseVarTagValue(TokenIterator $tokens): Ast\PhpDoc\VarTagValueNode { @@ -967,7 +925,7 @@ private function parseRequireImplementsTagValue(TokenIterator $tokens): Ast\PhpD private function parseDeprecatedTagValue(TokenIterator $tokens): Ast\PhpDoc\DeprecatedTagValueNode { - $description = $this->parseOptionalDescription($tokens); + $description = $this->parseOptionalDescription($tokens, false); return new Ast\PhpDoc\DeprecatedTagValueNode($description); } @@ -976,7 +934,7 @@ private function parsePropertyTagValue(TokenIterator $tokens): Ast\PhpDoc\Proper { $type = $this->typeParser->parse($tokens); $parameterName = $this->parseRequiredVariableName($tokens); - $description = $this->parseOptionalDescription($tokens); + $description = $this->parseOptionalDescription($tokens, false); return new Ast\PhpDoc\PropertyTagValueNode($type, $parameterName, $description); } @@ -1019,7 +977,7 @@ private function parseMethodTagValue(TokenIterator $tokens): Ast\PhpDoc\MethodTa $tokens, $this->typeParser->parseTemplateTagValue($tokens), $startLine, - $startIndex + $startIndex, ); } while ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)); $tokens->consumeTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET); @@ -1035,7 +993,7 @@ private function parseMethodTagValue(TokenIterator $tokens): Ast\PhpDoc\MethodTa } $tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PARENTHESES); - $description = $this->parseOptionalDescription($tokens); + $description = $this->parseOptionalDescription($tokens, false); return new Ast\PhpDoc\MethodTagValueNode($isStatic, $returnType, $methodName, $parameters, $description, $templateTypes); } @@ -1072,7 +1030,7 @@ private function parseMethodTagValueParameter(TokenIterator $tokens): Ast\PhpDoc $tokens, new Ast\PhpDoc\MethodTagValueParameterNode($parameterType, $isReference, $isVariadic, $parameterName, $defaultValue), $startLine, - $startIndex + $startIndex, ); } @@ -1085,10 +1043,10 @@ private function parseExtendsTagValue(string $tagName, TokenIterator $tokens): A $type = $this->typeParser->parseGeneric( $tokens, - $this->typeParser->enrichWithAttributes($tokens, $baseType, $startLine, $startIndex) + $this->typeParser->enrichWithAttributes($tokens, $baseType, $startLine, $startIndex), ); - $description = $this->parseOptionalDescription($tokens); + $description = $this->parseOptionalDescription($tokens, true); switch ($tagName) { case '@extends': @@ -1110,37 +1068,31 @@ private function parseTypeAliasTagValue(TokenIterator $tokens): Ast\PhpDoc\TypeA // support phan-type/psalm-type syntax $tokens->tryConsumeTokenType(Lexer::TOKEN_EQUAL); - if ($this->preserveTypeAliasesWithInvalidTypes) { - $startLine = $tokens->currentTokenLine(); - $startIndex = $tokens->currentTokenIndex(); - try { - $type = $this->typeParser->parse($tokens); - if (!$tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) { - if (!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL)) { - throw new ParserException( - $tokens->currentTokenValue(), - $tokens->currentTokenType(), - $tokens->currentTokenOffset(), - Lexer::TOKEN_PHPDOC_EOL, - null, - $tokens->currentTokenLine() - ); - } + $startLine = $tokens->currentTokenLine(); + $startIndex = $tokens->currentTokenIndex(); + try { + $type = $this->typeParser->parse($tokens); + if (!$tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) { + if (!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL)) { + throw new ParserException( + $tokens->currentTokenValue(), + $tokens->currentTokenType(), + $tokens->currentTokenOffset(), + Lexer::TOKEN_PHPDOC_EOL, + null, + $tokens->currentTokenLine(), + ); } - - return new Ast\PhpDoc\TypeAliasTagValueNode($alias, $type); - } catch (ParserException $e) { - $this->parseOptionalDescription($tokens); - return new Ast\PhpDoc\TypeAliasTagValueNode( - $alias, - $this->enrichWithAttributes($tokens, new Ast\Type\InvalidTypeNode($e), $startLine, $startIndex) - ); } - } - - $type = $this->typeParser->parse($tokens); - return new Ast\PhpDoc\TypeAliasTagValueNode($alias, $type); + return new Ast\PhpDoc\TypeAliasTagValueNode($alias, $type); + } catch (ParserException $e) { + $this->parseOptionalDescription($tokens, false); + return new Ast\PhpDoc\TypeAliasTagValueNode( + $alias, + $this->enrichWithAttributes($tokens, new Ast\Type\InvalidTypeNode($e), $startLine, $startIndex), + ); + } } private function parseTypeAliasImportTagValue(TokenIterator $tokens): Ast\PhpDoc\TypeAliasImportTagValueNode @@ -1158,7 +1110,7 @@ private function parseTypeAliasImportTagValue(TokenIterator $tokens): Ast\PhpDoc $tokens, new IdentifierTypeNode($importedFrom), $identifierStartLine, - $identifierStartIndex + $identifierStartIndex, ); $importedAs = null; @@ -1179,7 +1131,7 @@ private function parseAssertTagValue(TokenIterator $tokens): Ast\PhpDoc\PhpDocTa $isEquality = $tokens->tryConsumeTokenType(Lexer::TOKEN_EQUAL); $type = $this->typeParser->parse($tokens); $parameter = $this->parseAssertParameter($tokens); - $description = $this->parseOptionalDescription($tokens); + $description = $this->parseOptionalDescription($tokens, false); if (array_key_exists('method', $parameter)) { return new Ast\PhpDoc\AssertTagMethodValueNode($type, $parameter['parameter'], $parameter['method'], $isNegated, $description, $isEquality); @@ -1224,7 +1176,7 @@ private function parseAssertParameter(TokenIterator $tokens): array private function parseSelfOutTagValue(TokenIterator $tokens): Ast\PhpDoc\SelfOutTagValueNode { $type = $this->typeParser->parse($tokens); - $description = $this->parseOptionalDescription($tokens); + $description = $this->parseOptionalDescription($tokens, true); return new Ast\PhpDoc\SelfOutTagValueNode($type, $description); } @@ -1233,7 +1185,7 @@ private function parseParamOutTagValue(TokenIterator $tokens): Ast\PhpDoc\ParamO { $type = $this->typeParser->parse($tokens); $parameterName = $this->parseRequiredVariableName($tokens); - $description = $this->parseOptionalDescription($tokens); + $description = $this->parseOptionalDescription($tokens, false); return new Ast\PhpDoc\ParamOutTagValueNode($type, $parameterName, $description); } @@ -1263,7 +1215,10 @@ private function parseRequiredVariableName(TokenIterator $tokens): string return $parameterName; } - private function parseOptionalDescription(TokenIterator $tokens, bool $limitStartToken = false): string + /** + * @param bool $limitStartToken true should be used when the description immediately follows a parsed type + */ + private function parseOptionalDescription(TokenIterator $tokens, bool $limitStartToken): string { if ($limitStartToken) { foreach (self::DISALLOWED_DESCRIPTION_START_TOKENS as $disallowedStartToken) { @@ -1275,8 +1230,7 @@ private function parseOptionalDescription(TokenIterator $tokens, bool $limitStar } if ( - $this->requireWhitespaceBeforeDescription - && !$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL, Lexer::TOKEN_CLOSE_PHPDOC, Lexer::TOKEN_END) + !$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL, Lexer::TOKEN_CLOSE_PHPDOC, Lexer::TOKEN_END) && !$tokens->isPrecededByHorizontalWhitespace() ) { $tokens->consumeTokenType(Lexer::TOKEN_HORIZONTAL_WS); // will throw exception diff --git a/vendor/phpstan/phpdoc-parser/src/Parser/StringUnescaper.php b/vendor/phpstan/phpdoc-parser/src/Parser/StringUnescaper.php index a3bbeedd..e8e0a3d6 100644 --- a/vendor/phpstan/phpdoc-parser/src/Parser/StringUnescaper.php +++ b/vendor/phpstan/phpdoc-parser/src/Parser/StringUnescaper.php @@ -31,7 +31,7 @@ public static function unescapeString(string $string): string return str_replace( ['\\\\', '\\\''], ['\\', '\''], - substr($string, 1, -1) + substr($string, 1, -1), ); } @@ -65,7 +65,7 @@ static function ($matches) { return chr((int) octdec($str)); }, - $str + $str, ); } diff --git a/vendor/phpstan/phpdoc-parser/src/Parser/TokenIterator.php b/vendor/phpstan/phpdoc-parser/src/Parser/TokenIterator.php index 9be7593d..87ded21a 100644 --- a/vendor/phpstan/phpdoc-parser/src/Parser/TokenIterator.php +++ b/vendor/phpstan/phpdoc-parser/src/Parser/TokenIterator.php @@ -15,19 +15,17 @@ class TokenIterator { /** @var list */ - private $tokens; + private array $tokens; - /** @var int */ - private $index; + private int $index; /** @var int[] */ - private $savePoints = []; + private array $savePoints = []; /** @var list */ - private $skippedTokenTypes = [Lexer::TOKEN_HORIZONTAL_WS]; + private array $skippedTokenTypes = [Lexer::TOKEN_HORIZONTAL_WS]; - /** @var string|null */ - private $newline = null; + private ?string $newline = null; /** * @param list $tokens @@ -311,7 +309,7 @@ private function throwError(int $expectedTokenType, ?string $expectedTokenValue $this->currentTokenOffset(), $expectedTokenType, $expectedTokenValue, - $this->currentTokenLine() + $this->currentTokenLine(), ); } diff --git a/vendor/phpstan/phpdoc-parser/src/Parser/TypeParser.php b/vendor/phpstan/phpdoc-parser/src/Parser/TypeParser.php index c47ba10f..84a3880d 100644 --- a/vendor/phpstan/phpdoc-parser/src/Parser/TypeParser.php +++ b/vendor/phpstan/phpdoc-parser/src/Parser/TypeParser.php @@ -6,41 +6,27 @@ use PHPStan\PhpDocParser\Ast; use PHPStan\PhpDocParser\Ast\PhpDoc\TemplateTagValueNode; use PHPStan\PhpDocParser\Lexer\Lexer; +use PHPStan\PhpDocParser\ParserConfig; use function in_array; use function str_replace; use function strlen; use function strpos; use function substr_compare; -use function trim; class TypeParser { - /** @var ConstExprParser|null */ - private $constExprParser; + private ParserConfig $config; - /** @var bool */ - private $quoteAwareConstExprString; + private ConstExprParser $constExprParser; - /** @var bool */ - private $useLinesAttributes; - - /** @var bool */ - private $useIndexAttributes; - - /** - * @param array{lines?: bool, indexes?: bool} $usedAttributes - */ public function __construct( - ?ConstExprParser $constExprParser = null, - bool $quoteAwareConstExprString = false, - array $usedAttributes = [] + ParserConfig $config, + ConstExprParser $constExprParser ) { + $this->config = $config; $this->constExprParser = $constExprParser; - $this->quoteAwareConstExprString = $quoteAwareConstExprString; - $this->useLinesAttributes = $usedAttributes['lines'] ?? false; - $this->useIndexAttributes = $usedAttributes['indexes'] ?? false; } /** @phpstan-impure */ @@ -73,12 +59,12 @@ public function parse(TokenIterator $tokens): Ast\Type\TypeNode */ public function enrichWithAttributes(TokenIterator $tokens, Ast\Node $type, int $startLine, int $startIndex): Ast\Node { - if ($this->useLinesAttributes) { + if ($this->config->useLinesAttributes) { $type->setAttribute(Ast\Attribute::START_LINE, $startLine); $type->setAttribute(Ast\Attribute::END_LINE, $tokens->currentTokenLine()); } - if ($this->useIndexAttributes) { + if ($this->config->useIndexAttributes) { $type->setAttribute(Ast\Attribute::START_INDEX, $startIndex); $type->setAttribute(Ast\Attribute::END_INDEX, $tokens->endIndexOfLastRelevantToken()); } @@ -180,7 +166,13 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode } elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) { $type = $this->tryParseArrayOrOffsetAccess($tokens, $type); - } elseif (in_array($type->name, ['array', 'list', 'object'], true) && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) { + } elseif (in_array($type->name, [ + Ast\Type\ArrayShapeNode::KIND_ARRAY, + Ast\Type\ArrayShapeNode::KIND_LIST, + Ast\Type\ArrayShapeNode::KIND_NON_EMPTY_ARRAY, + Ast\Type\ArrayShapeNode::KIND_NON_EMPTY_LIST, + 'object', + ], true) && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) { if ($type->name === 'object') { $type = $this->parseObjectShape($tokens); } else { @@ -190,7 +182,7 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) { $type = $this->tryParseArrayOrOffsetAccess( $tokens, - $this->enrichWithAttributes($tokens, $type, $startLine, $startIndex) + $this->enrichWithAttributes($tokens, $type, $startLine, $startIndex), ); } } @@ -208,19 +200,8 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode $currentTokenOffset = $tokens->currentTokenOffset(); $currentTokenLine = $tokens->currentTokenLine(); - if ($this->constExprParser === null) { - throw new ParserException( - $currentTokenValue, - $currentTokenType, - $currentTokenOffset, - Lexer::TOKEN_IDENTIFIER, - null, - $currentTokenLine - ); - } - try { - $constExpr = $this->constExprParser->parse($tokens, true); + $constExpr = $this->constExprParser->parse($tokens); if ($constExpr instanceof Ast\ConstExpr\ConstExprArrayNode) { throw new ParserException( $currentTokenValue, @@ -228,7 +209,7 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode $currentTokenOffset, Lexer::TOKEN_IDENTIFIER, null, - $currentTokenLine + $currentTokenLine, ); } @@ -236,7 +217,7 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode $tokens, new Ast\Type\ConstTypeNode($constExpr), $startLine, - $startIndex + $startIndex, ); if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) { $type = $this->tryParseArrayOrOffsetAccess($tokens, $type); @@ -250,7 +231,7 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode $currentTokenOffset, Lexer::TOKEN_IDENTIFIER, null, - $currentTokenLine + $currentTokenLine, ); } } @@ -491,11 +472,14 @@ public function parseTemplateTagValue( $name = $tokens->currentTokenValue(); $tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER); + $upperBound = $lowerBound = null; + if ($tokens->tryConsumeTokenValue('of') || $tokens->tryConsumeTokenValue('as')) { - $bound = $this->parse($tokens); + $upperBound = $this->parse($tokens); + } - } else { - $bound = null; + if ($tokens->tryConsumeTokenValue('super')) { + $lowerBound = $this->parse($tokens); } if ($tokens->tryConsumeTokenValue('=')) { @@ -514,7 +498,7 @@ public function parseTemplateTagValue( throw new LogicException('Template tag name cannot be empty.'); } - return new Ast\PhpDoc\TemplateTagValueNode($name, $bound, $description, $default); + return new Ast\PhpDoc\TemplateTagValueNode($name, $upperBound, $description, $default, $lowerBound); } @@ -593,7 +577,7 @@ private function parseCallableTemplateArgument(TokenIterator $tokens): Ast\PhpDo $tokens, $this->parseTemplateTagValue($tokens), $startLine, - $startIndex + $startIndex, ); } @@ -620,7 +604,7 @@ private function parseCallableParameter(TokenIterator $tokens): Ast\Type\Callabl $tokens, new Ast\Type\CallableTypeParameterNode($type, $isReference, $isVariadic, $parameterName, $isOptional), $startLine, - $startIndex + $startIndex, ); } @@ -648,7 +632,7 @@ private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNo $tokens, $type, $startLine, - $startIndex + $startIndex, )); } @@ -667,15 +651,15 @@ private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNo $tokens, $type, $startLine, - $startIndex - ) + $startIndex, + ), ); if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) { $type = $this->tryParseArrayOrOffsetAccess($tokens, $this->enrichWithAttributes( $tokens, $type, $startLine, - $startIndex + $startIndex, )); } @@ -684,10 +668,16 @@ private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNo $tokens, $type, $startLine, - $startIndex + $startIndex, )); - } elseif (in_array($type->name, ['array', 'list', 'object'], true) && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) { + } elseif (in_array($type->name, [ + Ast\Type\ArrayShapeNode::KIND_ARRAY, + Ast\Type\ArrayShapeNode::KIND_LIST, + Ast\Type\ArrayShapeNode::KIND_NON_EMPTY_ARRAY, + Ast\Type\ArrayShapeNode::KIND_NON_EMPTY_LIST, + 'object', + ], true) && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) { if ($type->name === 'object') { $type = $this->parseObjectShape($tokens); } else { @@ -695,7 +685,7 @@ private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNo $tokens, $type, $startLine, - $startIndex + $startIndex, ), $type->name); } @@ -704,7 +694,7 @@ private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNo $tokens, $type, $startLine, - $startIndex + $startIndex, )); } } @@ -723,19 +713,8 @@ private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNo $currentTokenOffset = $tokens->currentTokenOffset(); $currentTokenLine = $tokens->currentTokenLine(); - if ($this->constExprParser === null) { - throw new ParserException( - $currentTokenValue, - $currentTokenType, - $currentTokenOffset, - Lexer::TOKEN_IDENTIFIER, - null, - $currentTokenLine - ); - } - try { - $constExpr = $this->constExprParser->parse($tokens, true); + $constExpr = $this->constExprParser->parse($tokens); if ($constExpr instanceof Ast\ConstExpr\ConstExprArrayNode) { throw new ParserException( $currentTokenValue, @@ -743,7 +722,7 @@ private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNo $currentTokenOffset, Lexer::TOKEN_IDENTIFIER, null, - $currentTokenLine + $currentTokenLine, ); } @@ -751,7 +730,7 @@ private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNo $tokens, new Ast\Type\ConstTypeNode($constExpr), $startLine, - $startIndex + $startIndex, ); if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) { $type = $this->tryParseArrayOrOffsetAccess($tokens, $type); @@ -765,7 +744,7 @@ private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNo $currentTokenOffset, Lexer::TOKEN_IDENTIFIER, null, - $currentTokenLine + $currentTokenLine, ); } } @@ -811,7 +790,7 @@ private function tryParseArrayOrOffsetAccess(TokenIterator $tokens, Ast\Type\Typ $tokens, $type, $startLine, - $startIndex + $startIndex, ); } } else { @@ -824,7 +803,7 @@ private function tryParseArrayOrOffsetAccess(TokenIterator $tokens, Ast\Type\Typ $tokens, $type, $startLine, - $startIndex + $startIndex, ); } } @@ -854,7 +833,7 @@ private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type, $tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL); if ($tokens->tryConsumeTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET)) { - return new Ast\Type\ArrayShapeNode($items, true, $kind); + return Ast\Type\ArrayShapeNode::createSealed($items, $kind); } if ($tokens->tryConsumeTokenType(Lexer::TOKEN_VARIADIC)) { @@ -882,7 +861,11 @@ private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type, $tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL); $tokens->consumeTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET); - return new Ast\Type\ArrayShapeNode($items, $sealed, $kind, $unsealedType); + if ($sealed) { + return Ast\Type\ArrayShapeNode::createSealed($items, $kind); + } + + return Ast\Type\ArrayShapeNode::createUnsealed($items, $unsealedType, $kind); } @@ -903,7 +886,7 @@ private function parseArrayShapeItem(TokenIterator $tokens): Ast\Type\ArrayShape $tokens, new Ast\Type\ArrayShapeItemNode($key, $optional, $value), $startLine, - $startIndex + $startIndex, ); } catch (ParserException $e) { $tokens->rollback(); @@ -913,7 +896,7 @@ private function parseArrayShapeItem(TokenIterator $tokens): Ast\Type\ArrayShape $tokens, new Ast\Type\ArrayShapeItemNode(null, false, $value), $startLine, - $startIndex + $startIndex, ); } } @@ -932,19 +915,11 @@ private function parseArrayShapeKey(TokenIterator $tokens) $tokens->next(); } elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_SINGLE_QUOTED_STRING)) { - if ($this->quoteAwareConstExprString) { - $key = new Ast\ConstExpr\QuoteAwareConstExprStringNode(StringUnescaper::unescapeString($tokens->currentTokenValue()), Ast\ConstExpr\QuoteAwareConstExprStringNode::SINGLE_QUOTED); - } else { - $key = new Ast\ConstExpr\ConstExprStringNode(trim($tokens->currentTokenValue(), "'")); - } + $key = new Ast\ConstExpr\ConstExprStringNode(StringUnescaper::unescapeString($tokens->currentTokenValue()), Ast\ConstExpr\ConstExprStringNode::SINGLE_QUOTED); $tokens->next(); } elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_DOUBLE_QUOTED_STRING)) { - if ($this->quoteAwareConstExprString) { - $key = new Ast\ConstExpr\QuoteAwareConstExprStringNode(StringUnescaper::unescapeString($tokens->currentTokenValue()), Ast\ConstExpr\QuoteAwareConstExprStringNode::DOUBLE_QUOTED); - } else { - $key = new Ast\ConstExpr\ConstExprStringNode(trim($tokens->currentTokenValue(), '"')); - } + $key = new Ast\ConstExpr\ConstExprStringNode(StringUnescaper::unescapeString($tokens->currentTokenValue()), Ast\ConstExpr\ConstExprStringNode::DOUBLE_QUOTED); $tokens->next(); @@ -957,7 +932,7 @@ private function parseArrayShapeKey(TokenIterator $tokens) $tokens, $key, $startLine, - $startIndex + $startIndex, ); } @@ -990,7 +965,7 @@ private function parseArrayShapeUnsealedType(TokenIterator $tokens): Ast\Type\Ar $tokens, new Ast\Type\ArrayShapeUnsealedTypeNode($valueType, $keyType), $startLine, - $startIndex + $startIndex, ); } @@ -1014,7 +989,7 @@ private function parseListShapeUnsealedType(TokenIterator $tokens): Ast\Type\Arr $tokens, new Ast\Type\ArrayShapeUnsealedTypeNode($valueType, null), $startLine, - $startIndex + $startIndex, ); } @@ -1069,19 +1044,11 @@ private function parseObjectShapeKey(TokenIterator $tokens) $startIndex = $tokens->currentTokenIndex(); if ($tokens->isCurrentTokenType(Lexer::TOKEN_SINGLE_QUOTED_STRING)) { - if ($this->quoteAwareConstExprString) { - $key = new Ast\ConstExpr\QuoteAwareConstExprStringNode(StringUnescaper::unescapeString($tokens->currentTokenValue()), Ast\ConstExpr\QuoteAwareConstExprStringNode::SINGLE_QUOTED); - } else { - $key = new Ast\ConstExpr\ConstExprStringNode(trim($tokens->currentTokenValue(), "'")); - } + $key = new Ast\ConstExpr\ConstExprStringNode(StringUnescaper::unescapeString($tokens->currentTokenValue()), Ast\ConstExpr\ConstExprStringNode::SINGLE_QUOTED); $tokens->next(); } elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_DOUBLE_QUOTED_STRING)) { - if ($this->quoteAwareConstExprString) { - $key = new Ast\ConstExpr\QuoteAwareConstExprStringNode(StringUnescaper::unescapeString($tokens->currentTokenValue()), Ast\ConstExpr\QuoteAwareConstExprStringNode::DOUBLE_QUOTED); - } else { - $key = new Ast\ConstExpr\ConstExprStringNode(trim($tokens->currentTokenValue(), '"')); - } + $key = new Ast\ConstExpr\ConstExprStringNode(StringUnescaper::unescapeString($tokens->currentTokenValue()), Ast\ConstExpr\ConstExprStringNode::DOUBLE_QUOTED); $tokens->next(); } else { diff --git a/vendor/phpstan/phpdoc-parser/src/Printer/Differ.php b/vendor/phpstan/phpdoc-parser/src/Printer/Differ.php index ab10be59..c60fd4ad 100644 --- a/vendor/phpstan/phpdoc-parser/src/Printer/Differ.php +++ b/vendor/phpstan/phpdoc-parser/src/Printer/Differ.php @@ -180,7 +180,7 @@ private function coalesceReplacements(array $diff): array $newDiff[] = new DiffElem( DiffElem::TYPE_REPLACE, $diff[$i + $n]->old, - $diff[$j + $n]->new + $diff[$j + $n]->new, ); } } else { diff --git a/vendor/phpstan/phpdoc-parser/src/Printer/Printer.php b/vendor/phpstan/phpdoc-parser/src/Printer/Printer.php index c4b9c356..8febe826 100644 --- a/vendor/phpstan/phpdoc-parser/src/Printer/Printer.php +++ b/vendor/phpstan/phpdoc-parser/src/Printer/Printer.php @@ -31,6 +31,7 @@ use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode; use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTextNode; use PHPStan\PhpDocParser\Ast\PhpDoc\PropertyTagValueNode; +use PHPStan\PhpDocParser\Ast\PhpDoc\PureUnlessCallableIsImpureTagValueNode; use PHPStan\PhpDocParser\Ast\PhpDoc\RequireExtendsTagValueNode; use PHPStan\PhpDocParser\Ast\PhpDoc\RequireImplementsTagValueNode; use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode; @@ -88,7 +89,7 @@ final class Printer { /** @var Differ */ - private $differ; + private Differ $differ; /** * Map From "{$class}->{$subNode}" to string that should be inserted @@ -96,7 +97,7 @@ final class Printer * * @var array */ - private $listInsertionMap = [ + private array $listInsertionMap = [ PhpDocNode::class . '->children' => "\n * ", UnionTypeNode::class . '->types' => '|', IntersectionTypeNode::class . '->types' => '&', @@ -116,7 +117,7 @@ final class Printer * * @var array */ - private $emptyListInsertionMap = [ + private array $emptyListInsertionMap = [ CallableTypeNode::class . '->parameters' => ['(', '', ''], ArrayShapeNode::class . '->items' => ['{', '', ''], ObjectShapeNode::class . '->items' => ['{', '', ''], @@ -125,7 +126,7 @@ final class Printer ]; /** @var array>> */ - private $parenthesesMap = [ + private array $parenthesesMap = [ CallableTypeNode::class . '->returnType' => [ CallableTypeNode::class, UnionTypeNode::class, @@ -147,7 +148,7 @@ final class Printer ]; /** @var array>> */ - private $parenthesesListMap = [ + private array $parenthesesListMap = [ IntersectionTypeNode::class . '->types' => [ IntersectionTypeNode::class, UnionTypeNode::class, @@ -177,7 +178,7 @@ public function printFormatPreserving(PhpDocNode $node, PhpDocNode $originalNode $originalTokens, $tokenIndex, PhpDocNode::class, - 'children' + 'children', ); if ($result !== null) { return $result . $originalTokens->getContentBetween($tokenIndex, $originalTokens->getTokenCount()); @@ -194,7 +195,7 @@ function (PhpDocChildNode $child): string { $s = $this->print($child); return $s === '' ? '' : ' ' . $s; }, - $node->children + $node->children, )) . "\n */"; } if ($node instanceof PhpDocTextNode) { @@ -248,6 +249,30 @@ function (PhpDocChildNode $child): string { if ($node instanceof DoctrineArrayItem) { return (string) $node; } + if ($node instanceof ArrayShapeItemNode) { + if ($node->keyName !== null) { + return sprintf( + '%s%s: %s', + $this->print($node->keyName), + $node->optional ? '?' : '', + $this->printType($node->valueType), + ); + } + + return $this->printType($node->valueType); + } + if ($node instanceof ObjectShapeItemNode) { + if ($node->keyName !== null) { + return sprintf( + '%s%s: %s', + $this->print($node->keyName), + $node->optional ? '?' : '', + $this->printType($node->valueType), + ); + } + + return $this->printType($node->valueType); + } throw new LogicException(sprintf('Unknown node type %s', get_class($node))); } @@ -282,13 +307,9 @@ private function printTagValue(PhpDocTagValueNode $node): string if ($node instanceof MethodTagValueNode) { $static = $node->isStatic ? 'static ' : ''; $returnType = $node->returnType !== null ? $this->printType($node->returnType) . ' ' : ''; - $parameters = implode(', ', array_map(function (MethodTagValueParameterNode $parameter): string { - return $this->print($parameter); - }, $node->parameters)); + $parameters = implode(', ', array_map(fn (MethodTagValueParameterNode $parameter): string => $this->print($parameter), $node->parameters)); $description = $node->description !== '' ? " {$node->description}" : ''; - $templateTypes = count($node->templateTypes) > 0 ? '<' . implode(', ', array_map(function (TemplateTagValueNode $templateTag): string { - return $this->print($templateTag); - }, $node->templateTypes)) . '>' : ''; + $templateTypes = count($node->templateTypes) > 0 ? '<' . implode(', ', array_map(fn (TemplateTagValueNode $templateTag): string => $this->print($templateTag), $node->templateTypes)) . '>' : ''; return "{$static}{$returnType}{$node->methodName}{$templateTypes}({$parameters}){$description}"; } if ($node instanceof MixinTagValueNode) { @@ -322,6 +343,9 @@ private function printTagValue(PhpDocTagValueNode $node): string if ($node instanceof ParamClosureThisTagValueNode) { return trim("{$node->type} {$node->parameterName} {$node->description}"); } + if ($node instanceof PureUnlessCallableIsImpureTagValueNode) { + return trim("{$node->parameterName} {$node->description}"); + } if ($node instanceof PropertyTagValueNode) { $type = $this->printType($node->type); return trim("{$type} {$node->propertyName} {$node->description}"); @@ -335,9 +359,10 @@ private function printTagValue(PhpDocTagValueNode $node): string return trim($type . ' ' . $node->description); } if ($node instanceof TemplateTagValueNode) { - $bound = $node->bound !== null ? ' of ' . $this->printType($node->bound) : ''; + $upperBound = $node->bound !== null ? ' of ' . $this->printType($node->bound) : ''; + $lowerBound = $node->lowerBound !== null ? ' super ' . $this->printType($node->lowerBound) : ''; $default = $node->default !== null ? ' = ' . $this->printType($node->default) : ''; - return trim("{$node->name}{$bound}{$default} {$node->description}"); + return trim("{$node->name}{$upperBound}{$lowerBound}{$default} {$node->description}"); } if ($node instanceof ThrowsTagValueNode) { $type = $this->printType($node->type); @@ -346,7 +371,7 @@ private function printTagValue(PhpDocTagValueNode $node): string if ($node instanceof TypeAliasImportTagValueNode) { return trim( "{$node->importedAlias} from " . $this->printType($node->importedFrom) - . ($node->importedAs !== null ? " as {$node->importedAs}" : '') + . ($node->importedAs !== null ? " as {$node->importedAs}" : ''), ); } if ($node instanceof TypeAliasTagValueNode) { @@ -368,9 +393,7 @@ private function printTagValue(PhpDocTagValueNode $node): string private function printType(TypeNode $node): string { if ($node instanceof ArrayShapeNode) { - $items = array_map(function (ArrayShapeItemNode $item): string { - return $this->printType($item); - }, $node->items); + $items = array_map(fn (ArrayShapeItemNode $item): string => $this->print($item), $node->items); if (! $node->sealed) { $items[] = '...' . ($node->unsealedType === null ? '' : $this->print($node->unsealedType)); @@ -378,18 +401,6 @@ private function printType(TypeNode $node): string return $node->kind . '{' . implode(', ', $items) . '}'; } - if ($node instanceof ArrayShapeItemNode) { - if ($node->keyName !== null) { - return sprintf( - '%s%s: %s', - $this->print($node->keyName), - $node->optional ? '?' : '', - $this->printType($node->valueType) - ); - } - - return $this->printType($node->valueType); - } if ($node instanceof ArrayTypeNode) { return $this->printOffsetAccessType($node->type) . '[]'; } @@ -400,13 +411,9 @@ private function printType(TypeNode $node): string $returnType = $this->printType($node->returnType); } $template = $node->templateTypes !== [] - ? '<' . implode(', ', array_map(function (TemplateTagValueNode $templateNode): string { - return $this->print($templateNode); - }, $node->templateTypes)) . '>' + ? '<' . implode(', ', array_map(fn (TemplateTagValueNode $templateNode): string => $this->print($templateNode), $node->templateTypes)) . '>' : ''; - $parameters = implode(', ', array_map(function (CallableTypeParameterNode $parameterNode): string { - return $this->print($parameterNode); - }, $node->parameters)); + $parameters = implode(', ', array_map(fn (CallableTypeParameterNode $parameterNode): string => $this->print($parameterNode), $node->parameters)); return "{$node->identifier}{$template}({$parameters}): {$returnType}"; } if ($node instanceof ConditionalTypeForParameterNode) { @@ -416,7 +423,7 @@ private function printType(TypeNode $node): string $node->negated ? 'is not' : 'is', $this->printType($node->targetType), $this->printType($node->if), - $this->printType($node->else) + $this->printType($node->else), ); } if ($node instanceof ConditionalTypeNode) { @@ -426,7 +433,7 @@ private function printType(TypeNode $node): string $node->negated ? 'is not' : 'is', $this->printType($node->targetType), $this->printType($node->if), - $this->printType($node->else) + $this->printType($node->else), ); } if ($node instanceof ConstTypeNode) { @@ -479,24 +486,10 @@ private function printType(TypeNode $node): string return '?' . $this->printType($node->type); } if ($node instanceof ObjectShapeNode) { - $items = array_map(function (ObjectShapeItemNode $item): string { - return $this->printType($item); - }, $node->items); + $items = array_map(fn (ObjectShapeItemNode $item): string => $this->print($item), $node->items); return 'object{' . implode(', ', $items) . '}'; } - if ($node instanceof ObjectShapeItemNode) { - if ($node->keyName !== null) { - return sprintf( - '%s%s: %s', - $this->print($node->keyName), - $node->optional ? '?' : '', - $this->printType($node->valueType) - ); - } - - return $this->printType($node->valueType); - } if ($node instanceof OffsetAccessTypeNode) { return $this->printOffsetAccessType($node->type) . '[' . $this->printType($node->offset) . ']'; } @@ -561,7 +554,11 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes, if (!$newNode instanceof Node || !$originalNode instanceof Node) { return null; } + + /** @var int $itemStartPos */ $itemStartPos = $originalNode->getAttribute(Attribute::START_INDEX); + + /** @var int $itemEndPos */ $itemEndPos = $originalNode->getAttribute(Attribute::END_INDEX); if ($itemStartPos < 0 || $itemEndPos < 0 || $itemStartPos < $tokenIndex) { throw new LogicException(); @@ -624,6 +621,7 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes, continue; } + /** @var int $itemEndPos */ $itemEndPos = $tokenIndex - 1; if ($insertNewline) { $result .= $insertStr . sprintf('%s%s*%s', $originalTokens->getDetectedNewline() ?? "\n", $beforeAsteriskIndent, $afterAsteriskIndent); @@ -649,7 +647,10 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes, return null; } + /** @var int $itemStartPos */ $itemStartPos = $originalNode->getAttribute(Attribute::START_INDEX); + + /** @var int $itemEndPos */ $itemEndPos = $originalNode->getAttribute(Attribute::END_INDEX); if ($itemStartPos < 0 || $itemEndPos < 0) { throw new LogicException(); @@ -709,7 +710,7 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes, } /** - * @param Node[] $nodes + * @param array $nodes * @return array{bool, string, string} */ private function isMultiline(int $initialIndex, array $nodes, TokenIterator $originalTokens): array @@ -799,7 +800,7 @@ private function printNodeFormatPreserving(Node $node, TokenIterator $originalTo $originalTokens, $pos, $class, - $subNodeName + $subNodeName, ); if ($listResult === null) { diff --git a/vendor/phpunit/phpunit/ChangeLog-10.5.md b/vendor/phpunit/phpunit/ChangeLog-10.5.md index 2d0b304b..e56f9e20 100644 --- a/vendor/phpunit/phpunit/ChangeLog-10.5.md +++ b/vendor/phpunit/phpunit/ChangeLog-10.5.md @@ -2,6 +2,157 @@ All notable changes of the PHPUnit 10.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles. +## [10.5.36] - 2024-10-08 + +### Changed + +* [#5957](https://github.com/sebastianbergmann/phpunit/pull/5957): Skip data provider build when requirements are not satisfied +* [#5969](https://github.com/sebastianbergmann/phpunit/pull/5969): Check for requirements before creating a separate process +* Updated regular expressions used by `StringMatchesFormatDescription` constraint to be consistent with PHP's `run-tests.php` + +### Fixed + +* [#5965](https://github.com/sebastianbergmann/phpunit/issues/5965): `PHPUnit\Framework\Exception` does not handle string error codes (`PDOException` with error code `'HY000'`, for example) + +## [10.5.35] - 2024-09-19 + +### Changed + +* [#5956](https://github.com/sebastianbergmann/phpunit/issues/5956): Deprecation of the `E_STRICT` constant in PHP 8.4 + +### Fixed + +* [#5950](https://github.com/sebastianbergmann/phpunit/pull/5950): TestDox text should not be `trim()`med when it contains `$` character +* The attribute parser will no longer try to instantiate attribute classes that do not exist + +## [10.5.34] - 2024-09-13 + +### Fixed + +* [#5931](https://github.com/sebastianbergmann/phpunit/pull/5931): Reverted addition of `name` property on `` element in JUnit XML logfile +* [#5946](https://github.com/sebastianbergmann/phpunit/issues/5946): `Callback` throws a `TypeError` when checking a `callable` has variadic parameters + +## [10.5.33] - 2024-09-09 + +### Fixed + +* [#4584](https://github.com/sebastianbergmann/phpunit/issues/4584): `assertJsonStringEqualsJsonString()` considers objects with sequential numeric keys equal to be arrays +* [#4625](https://github.com/sebastianbergmann/phpunit/issues/4625): Generator yielding keys that are neither integer or string leads to hard-to-understand error message when used as data provider +* [#4674](https://github.com/sebastianbergmann/phpunit/issues/4674): JSON assertions should treat objects as unordered +* [#5891](https://github.com/sebastianbergmann/phpunit/issues/5891): `Callback` constraint does not handle variadic arguments correctly when used for mock object expectations +* [#5929](https://github.com/sebastianbergmann/phpunit/issues/5929): TestDox output containing `$` at the beginning gets truncated when used with a data provider + +## [10.5.32] - 2024-09-04 + +### Added + +* [#5937](https://github.com/sebastianbergmann/phpunit/issues/5937): `failOnPhpunitDeprecation` attribute on the `` element of the XML configuration file and `--fail-on-phpunit-deprecation` CLI option for controlling whether PHPUnit deprecations should be considered when determining the test runner's shell exit code (default: do not consider) +* `displayDetailsOnPhpunitDeprecations` attribute on the `` element of the XML configuration file and `--display-phpunit-deprecations` CLI option for controlling whether details on PHPUnit deprecations should be displayed (default: do not display) + +### Changed + +* [#5937](https://github.com/sebastianbergmann/phpunit/issues/5937): PHPUnit deprecations will, by default, no longer affect the test runner's shell exit code. This can optionally be turned back on using the `--fail-on-phpunit-deprecation` CLI option or the `failOnPhpunitDeprecation="true"` attribute on the `` element of the XML configuration file. +* Details for PHPUnit deprecations will, by default, no longer be displayed. This can optionally be turned back on using the `--display-phpunit-deprecations` CLI option or the `displayDetailsOnPhpunitDeprecations` attribute on the `` element of the XML configuration file. + +## [10.5.31] - 2024-09-03 + +### Changed + +* [#5931](https://github.com/sebastianbergmann/phpunit/pull/5931): `name` property on `` element in JUnit XML logfile +* Removed `.phpstorm.meta.php` file as methods such as `TestCase::createStub()` use generics / template types for their return types and PhpStorm, for example, uses that information + +### Fixed + +* [#5884](https://github.com/sebastianbergmann/phpunit/issues/5884): TestDox printer does not consider that issues can be suppressed by attribute, baseline, source location, or `@` operator + +## [10.5.30] - 2024-08-13 + +### Changed + +* Improved error message when stubbed method is called more often than return values were configured for it + +## [10.5.29] - 2024-07-30 + +### Fixed + +* [#5887](https://github.com/sebastianbergmann/phpunit/pull/5887): Issue baseline generator does not correctly handle ignoring suppressed issues +* [#5908](https://github.com/sebastianbergmann/phpunit/issues/5908): `--list-tests` and `--list-tests-xml` CLI options do not report error when data provider method throws exception + +## [10.5.28] - 2024-07-18 + +### Fixed + +* [#5898](https://github.com/sebastianbergmann/phpunit/issues/5898): `Test\Passed` event is not emitted for PHPT tests +* `--coverage-filter` CLI option could not be used multiple times + +## [10.5.27] - 2024-07-10 + +### Changed + +* Updated dependencies (so that users that install using Composer's `--prefer-lowest` CLI option also get recent versions) + +### Fixed + +* [#5892](https://github.com/sebastianbergmann/phpunit/issues/5892): Errors during write of `phpunit.xml` are not handled correctly when `--generate-configuration` is used + +## [10.5.26] - 2024-07-08 + +### Added + +* `--only-summary-for-coverage-text` CLI option to reduce the code coverage report in text format to a summary +* `--show-uncovered-for-coverage-text` CLI option to expand the code coverage report in text format to include a list of uncovered files + +## [10.5.25] - 2024-07-03 + +### Changed + +* Updated dependencies for PHAR distribution + +## [10.5.24] - 2024-06-20 + +### Changed + +* [#5877](https://github.com/sebastianbergmann/phpunit/pull/5877): Use `array_pop()` instead of `array_shift()` for processing `Test` objects in `TestSuite::run()` and optimize `TestSuite::isEmpty()` + +## [10.5.23] - 2024-06-20 + +### Changed + +* [#5875](https://github.com/sebastianbergmann/phpunit/pull/5875): Also destruct `TestCase` objects early that use a data provider + +## [10.5.22] - 2024-06-19 + +### Changed + +* [#5871](https://github.com/sebastianbergmann/phpunit/pull/5871): Do not collect unnecessary information using `debug_backtrace()` + +## [10.5.21] - 2024-06-15 + +### Changed + +* [#5861](https://github.com/sebastianbergmann/phpunit/pull/5861): Destroy `TestCase` object after its test was run + +## [10.5.20] - 2024-04-24 + +* [#5771](https://github.com/sebastianbergmann/phpunit/issues/5771): JUnit XML logger may crash when test that is run in separate process exits unexpectedly +* [#5819](https://github.com/sebastianbergmann/phpunit/issues/5819): Duplicate keys from different data providers are not handled properly + +## [10.5.19] - 2024-04-17 + +### Fixed + +* [#5818](https://github.com/sebastianbergmann/phpunit/issues/5818): Calling `method()` on a test stub created using `createStubForIntersectionOfInterfaces()` throws an unexpected exception + +## [10.5.18] - 2024-04-14 + +### Deprecated + +* [#5812](https://github.com/sebastianbergmann/phpunit/pull/5812): Support for string array keys in data sets returned by data provider methods that do not match the parameter names of the test method(s) that use(s) them + +### Fixed + +* [#5795](https://github.com/sebastianbergmann/phpunit/issues/5795): Using `@testWith` annotation may generate `PHP Warning: Uninitialized string offset 0` + ## [10.5.17] - 2024-04-05 ### Changed @@ -183,6 +334,25 @@ All notable changes of the PHPUnit 10.5 release series are documented in this fi * [#5563](https://github.com/sebastianbergmann/phpunit/issues/5563): `createMockForIntersectionOfInterfaces()` does not automatically register mock object for expectation verification +[10.5.36]: https://github.com/sebastianbergmann/phpunit/compare/10.5.35...10.5.36 +[10.5.35]: https://github.com/sebastianbergmann/phpunit/compare/10.5.34...10.5.35 +[10.5.34]: https://github.com/sebastianbergmann/phpunit/compare/10.5.33...10.5.34 +[10.5.33]: https://github.com/sebastianbergmann/phpunit/compare/10.5.32...10.5.33 +[10.5.32]: https://github.com/sebastianbergmann/phpunit/compare/10.5.31...10.5.32 +[10.5.31]: https://github.com/sebastianbergmann/phpunit/compare/10.5.30...10.5.31 +[10.5.30]: https://github.com/sebastianbergmann/phpunit/compare/10.5.29...10.5.30 +[10.5.29]: https://github.com/sebastianbergmann/phpunit/compare/10.5.28...10.5.29 +[10.5.28]: https://github.com/sebastianbergmann/phpunit/compare/10.5.27...10.5.28 +[10.5.27]: https://github.com/sebastianbergmann/phpunit/compare/10.5.26...10.5.27 +[10.5.26]: https://github.com/sebastianbergmann/phpunit/compare/10.5.25...10.5.26 +[10.5.25]: https://github.com/sebastianbergmann/phpunit/compare/10.5.24...10.5.25 +[10.5.24]: https://github.com/sebastianbergmann/phpunit/compare/10.5.23...10.5.24 +[10.5.23]: https://github.com/sebastianbergmann/phpunit/compare/10.5.22...10.5.23 +[10.5.22]: https://github.com/sebastianbergmann/phpunit/compare/10.5.21...10.5.22 +[10.5.21]: https://github.com/sebastianbergmann/phpunit/compare/10.5.20...10.5.21 +[10.5.20]: https://github.com/sebastianbergmann/phpunit/compare/10.5.19...10.5.20 +[10.5.19]: https://github.com/sebastianbergmann/phpunit/compare/10.5.18...10.5.19 +[10.5.18]: https://github.com/sebastianbergmann/phpunit/compare/10.5.17...10.5.18 [10.5.17]: https://github.com/sebastianbergmann/phpunit/compare/10.5.16...10.5.17 [10.5.16]: https://github.com/sebastianbergmann/phpunit/compare/10.5.15...10.5.16 [10.5.15]: https://github.com/sebastianbergmann/phpunit/compare/10.5.14...10.5.15 diff --git a/vendor/phpunit/phpunit/DEPRECATIONS.md b/vendor/phpunit/phpunit/DEPRECATIONS.md index d66cef7e..7fa82a2b 100644 --- a/vendor/phpunit/phpunit/DEPRECATIONS.md +++ b/vendor/phpunit/phpunit/DEPRECATIONS.md @@ -86,6 +86,7 @@ This functionality is currently [hard-deprecated](https://phpunit.de/backward-co #### Miscellaneous -| Issue | Description | Since | Replacement | -|-------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------|--------|-------------| -| [#5100](https://github.com/sebastianbergmann/phpunit/issues/5100) | Support for non-static data provider methods, non-public data provider methods, and data provider methods that declare parameters | 10.0.0 | | +| Issue | Description | Since | Replacement | +|-------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-------------| +| [#5100](https://github.com/sebastianbergmann/phpunit/issues/5100) | Support for non-static data provider methods, non-public data provider methods, and data provider methods that declare parameters | 10.0.0 | | +| [#5812](https://github.com/sebastianbergmann/phpunit/pull/5812) | Support for string array keys in data sets returned by data provider methods that do not match the parameter names of the test method(s) that use(s) them | 10.5.18 | | diff --git a/vendor/phpunit/phpunit/README.md b/vendor/phpunit/phpunit/README.md index d18fbc75..1ca144ae 100644 --- a/vendor/phpunit/phpunit/README.md +++ b/vendor/phpunit/phpunit/README.md @@ -1,8 +1,7 @@ # PHPUnit -[![Latest Stable Version](https://poser.pugx.org/phpunit/phpunit/v/stable.png)](https://packagist.org/packages/phpunit/phpunit) +[![Latest Stable Version](https://poser.pugx.org/phpunit/phpunit/v)](https://packagist.org/packages/phpunit/phpunit) [![CI Status](https://github.com/sebastianbergmann/phpunit/workflows/CI/badge.svg)](https://github.com/sebastianbergmann/phpunit/actions) -[![Type Coverage](https://shepherd.dev/github/sebastianbergmann/phpunit/coverage.svg)](https://shepherd.dev/github/sebastianbergmann/phpunit) [![codecov](https://codecov.io/gh/sebastianbergmann/phpunit/branch/main/graph/badge.svg)](https://codecov.io/gh/sebastianbergmann/phpunit) PHPUnit is a programmer-oriented testing framework for PHP. It is an instance of the xUnit architecture for unit testing frameworks. diff --git a/vendor/phpunit/phpunit/composer.json b/vendor/phpunit/phpunit/composer.json index 4f81fae0..0b676747 100644 --- a/vendor/phpunit/phpunit/composer.json +++ b/vendor/phpunit/phpunit/composer.json @@ -29,25 +29,25 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", - "phpunit/php-code-coverage": "^10.1.5", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-invoker": "^4.0", - "phpunit/php-text-template": "^3.0", - "phpunit/php-timer": "^6.0", - "sebastian/cli-parser": "^2.0", - "sebastian/code-unit": "^2.0", - "sebastian/comparator": "^5.0", - "sebastian/diff": "^5.0", - "sebastian/environment": "^6.0", - "sebastian/exporter": "^5.1", - "sebastian/global-state": "^6.0.1", - "sebastian/object-enumerator": "^5.0", - "sebastian/recursion-context": "^5.0", - "sebastian/type": "^4.0", - "sebastian/version": "^4.0" + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", + "phpunit/php-code-coverage": "^10.1.16", + "phpunit/php-file-iterator": "^4.1.0", + "phpunit/php-invoker": "^4.0.0", + "phpunit/php-text-template": "^3.0.1", + "phpunit/php-timer": "^6.0.0", + "sebastian/cli-parser": "^2.0.1", + "sebastian/code-unit": "^2.0.0", + "sebastian/comparator": "^5.0.2", + "sebastian/diff": "^5.1.1", + "sebastian/environment": "^6.1.0", + "sebastian/exporter": "^5.1.2", + "sebastian/global-state": "^6.0.2", + "sebastian/object-enumerator": "^5.0.0", + "sebastian/recursion-context": "^5.0.0", + "sebastian/type": "^4.0.0", + "sebastian/version": "^4.0.1" }, "config": { "platform": { @@ -72,9 +72,13 @@ }, "autoload-dev": { "classmap": [ - "tests/" + "tests/_files" ], "files": [ + "tests/unit/Event/AbstractEventTestCase.php", + "tests/unit/Framework/MockObject/TestDoubleTestCase.php", + "tests/unit/Metadata/Parser/AnnotationParserTestCase.php", + "tests/unit/Metadata/Parser/AttributeParserTestCase.php", "tests/_files/CoverageNamespacedFunctionTest.php", "tests/_files/CoveredFunction.php", "tests/_files/Generator.php", diff --git a/vendor/phpunit/phpunit/composer.lock b/vendor/phpunit/phpunit/composer.lock index 5ef48c59..7228ab05 100644 --- a/vendor/phpunit/phpunit/composer.lock +++ b/vendor/phpunit/phpunit/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e06728e5442edec84af96f94a889b4a7", + "content-hash": "aa5ea99688099980c25ade93362ea9c7", "packages": [ { "name": "myclabs/deep-copy", - "version": "1.11.1", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", "shasum": "" }, "require": { @@ -25,11 +25,12 @@ }, "conflict": { "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, "require-dev": { "doctrine/collections": "^1.6.8", "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", @@ -55,7 +56,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" }, "funding": [ { @@ -63,20 +64,20 @@ "type": "tidelift" } ], - "time": "2023-03-08T13:26:56+00:00" + "time": "2024-06-12T14:39:25+00:00" }, { "name": "nikic/php-parser", - "version": "v5.0.2", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13" + "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a", + "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a", "shasum": "" }, "require": { @@ -87,7 +88,7 @@ }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^9.0" }, "bin": [ "bin/php-parse" @@ -119,9 +120,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0" }, - "time": "2024-03-05T20:51:40+00:00" + "time": "2024-09-29T13:56:26+00:00" }, { "name": "phar-io/manifest", @@ -243,32 +244,32 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.14", + "version": "10.1.16", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b" + "reference": "7e308268858ed6baedc8704a304727d20bc07c77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b", - "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7e308268858ed6baedc8704a304727d20bc07c77", + "reference": "7e308268858ed6baedc8704a304727d20bc07c77", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.18 || ^5.0", + "nikic/php-parser": "^4.19.1 || ^5.1.0", "php": ">=8.1", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-text-template": "^3.0", - "sebastian/code-unit-reverse-lookup": "^3.0", - "sebastian/complexity": "^3.0", - "sebastian/environment": "^6.0", - "sebastian/lines-of-code": "^2.0", - "sebastian/version": "^4.0", - "theseer/tokenizer": "^1.2.0" + "phpunit/php-file-iterator": "^4.1.0", + "phpunit/php-text-template": "^3.0.1", + "sebastian/code-unit-reverse-lookup": "^3.0.0", + "sebastian/complexity": "^3.2.0", + "sebastian/environment": "^6.1.0", + "sebastian/lines-of-code": "^2.0.2", + "sebastian/version": "^4.0.1", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { "phpunit/phpunit": "^10.1" @@ -280,7 +281,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "10.1-dev" + "dev-main": "10.1.x-dev" } }, "autoload": { @@ -309,7 +310,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.16" }, "funding": [ { @@ -317,7 +318,7 @@ "type": "github" } ], - "time": "2024-03-12T15:33:41+00:00" + "time": "2024-08-22T04:31:57+00:00" }, { "name": "phpunit/php-file-iterator", @@ -732,16 +733,16 @@ }, { "name": "sebastian/comparator", - "version": "5.0.1", + "version": "5.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2db5010a484d53ebf536087a70b4a5423c102372" + "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372", - "reference": "2db5010a484d53ebf536087a70b4a5423c102372", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53", + "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53", "shasum": "" }, "require": { @@ -752,7 +753,7 @@ "sebastian/exporter": "^5.0" }, "require-dev": { - "phpunit/phpunit": "^10.3" + "phpunit/phpunit": "^10.4" }, "type": "library", "extra": { @@ -797,7 +798,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1" + "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.2" }, "funding": [ { @@ -805,7 +806,7 @@ "type": "github" } ], - "time": "2023-08-14T13:18:12+00:00" + "time": "2024-08-12T06:03:08+00:00" }, { "name": "sebastian/complexity", @@ -1532,7 +1533,7 @@ "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": true, "prefer-lowest": false, "platform": { @@ -1544,7 +1545,7 @@ "ext-xml": "*", "ext-xmlwriter": "*" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "8.1.0" }, diff --git a/vendor/phpunit/phpunit/phpunit.xsd b/vendor/phpunit/phpunit/phpunit.xsd index 42a84489..8fa5451a 100644 --- a/vendor/phpunit/phpunit/phpunit.xsd +++ b/vendor/phpunit/phpunit/phpunit.xsd @@ -178,6 +178,7 @@ + @@ -196,7 +197,6 @@ - @@ -214,6 +214,7 @@ + diff --git a/vendor/phpunit/phpunit/src/Event/Dispatcher/CollectingDispatcher.php b/vendor/phpunit/phpunit/src/Event/Dispatcher/CollectingDispatcher.php index 39433fe3..c431b93e 100644 --- a/vendor/phpunit/phpunit/src/Event/Dispatcher/CollectingDispatcher.php +++ b/vendor/phpunit/phpunit/src/Event/Dispatcher/CollectingDispatcher.php @@ -10,6 +10,8 @@ namespace PHPUnit\Event; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class CollectingDispatcher implements Dispatcher diff --git a/vendor/phpunit/phpunit/src/Event/Dispatcher/DeferringDispatcher.php b/vendor/phpunit/phpunit/src/Event/Dispatcher/DeferringDispatcher.php index 8c67d2df..6895facb 100644 --- a/vendor/phpunit/phpunit/src/Event/Dispatcher/DeferringDispatcher.php +++ b/vendor/phpunit/phpunit/src/Event/Dispatcher/DeferringDispatcher.php @@ -10,6 +10,8 @@ namespace PHPUnit\Event; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class DeferringDispatcher implements SubscribableDispatcher diff --git a/vendor/phpunit/phpunit/src/Event/Dispatcher/DirectDispatcher.php b/vendor/phpunit/phpunit/src/Event/Dispatcher/DirectDispatcher.php index 8176229d..8e83d746 100644 --- a/vendor/phpunit/phpunit/src/Event/Dispatcher/DirectDispatcher.php +++ b/vendor/phpunit/phpunit/src/Event/Dispatcher/DirectDispatcher.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\Event; +use const PHP_EOL; use function array_key_exists; use function dirname; use function sprintf; @@ -16,6 +17,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class DirectDispatcher implements SubscribableDispatcher diff --git a/vendor/phpunit/phpunit/src/Event/Dispatcher/Dispatcher.php b/vendor/phpunit/phpunit/src/Event/Dispatcher/Dispatcher.php index 35691be7..e7086539 100644 --- a/vendor/phpunit/phpunit/src/Event/Dispatcher/Dispatcher.php +++ b/vendor/phpunit/phpunit/src/Event/Dispatcher/Dispatcher.php @@ -10,6 +10,8 @@ namespace PHPUnit\Event; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This interface is not covered by the backward compatibility promise for PHPUnit */ interface Dispatcher diff --git a/vendor/phpunit/phpunit/src/Event/Dispatcher/SubscribableDispatcher.php b/vendor/phpunit/phpunit/src/Event/Dispatcher/SubscribableDispatcher.php index 067c0cc6..c4393da1 100644 --- a/vendor/phpunit/phpunit/src/Event/Dispatcher/SubscribableDispatcher.php +++ b/vendor/phpunit/phpunit/src/Event/Dispatcher/SubscribableDispatcher.php @@ -10,6 +10,8 @@ namespace PHPUnit\Event; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This interface is not covered by the backward compatibility promise for PHPUnit */ interface SubscribableDispatcher extends Dispatcher diff --git a/vendor/phpunit/phpunit/src/Event/Emitter/DispatchingEmitter.php b/vendor/phpunit/phpunit/src/Event/Emitter/DispatchingEmitter.php index e05afeed..07528570 100644 --- a/vendor/phpunit/phpunit/src/Event/Emitter/DispatchingEmitter.php +++ b/vendor/phpunit/phpunit/src/Event/Emitter/DispatchingEmitter.php @@ -26,6 +26,8 @@ use PHPUnit\Util\Exporter; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class DispatchingEmitter implements Emitter diff --git a/vendor/phpunit/phpunit/src/Event/Emitter/Emitter.php b/vendor/phpunit/phpunit/src/Event/Emitter/Emitter.php index c85b2675..c66cbdc0 100644 --- a/vendor/phpunit/phpunit/src/Event/Emitter/Emitter.php +++ b/vendor/phpunit/phpunit/src/Event/Emitter/Emitter.php @@ -17,6 +17,8 @@ use PHPUnit\TextUI\Configuration\Configuration; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface Emitter diff --git a/vendor/phpunit/phpunit/src/Event/Events/Test/HookMethod/BeforeFirstTestMethodErrored.php b/vendor/phpunit/phpunit/src/Event/Events/Test/HookMethod/BeforeFirstTestMethodErrored.php index 81833227..959b1350 100644 --- a/vendor/phpunit/phpunit/src/Event/Events/Test/HookMethod/BeforeFirstTestMethodErrored.php +++ b/vendor/phpunit/phpunit/src/Event/Events/Test/HookMethod/BeforeFirstTestMethodErrored.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\Event\Test; +use const PHP_EOL; use function sprintf; use PHPUnit\Event\Code; use PHPUnit\Event\Code\Throwable; diff --git a/vendor/phpunit/phpunit/src/Event/Events/Test/PrintedUnexpectedOutput.php b/vendor/phpunit/phpunit/src/Event/Events/Test/PrintedUnexpectedOutput.php index 733520e6..308332e8 100644 --- a/vendor/phpunit/phpunit/src/Event/Events/Test/PrintedUnexpectedOutput.php +++ b/vendor/phpunit/phpunit/src/Event/Events/Test/PrintedUnexpectedOutput.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\Event\Test; +use const PHP_EOL; use function sprintf; use PHPUnit\Event\Event; use PHPUnit\Event\Telemetry; diff --git a/vendor/phpunit/phpunit/src/Event/Exception/NoTestCaseObjectOnCallStackException.php b/vendor/phpunit/phpunit/src/Event/Exception/NoTestCaseObjectOnCallStackException.php index 6e5b0342..35b4c25a 100644 --- a/vendor/phpunit/phpunit/src/Event/Exception/NoTestCaseObjectOnCallStackException.php +++ b/vendor/phpunit/phpunit/src/Event/Exception/NoTestCaseObjectOnCallStackException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NoTestCaseObjectOnCallStackException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Event/Facade.php b/vendor/phpunit/phpunit/src/Event/Facade.php index 9e05d3bb..c0a15e25 100644 --- a/vendor/phpunit/phpunit/src/Event/Facade.php +++ b/vendor/phpunit/phpunit/src/Event/Facade.php @@ -15,6 +15,8 @@ use PHPUnit\Event\Telemetry\Php83GarbageCollectorStatusProvider; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Facade diff --git a/vendor/phpunit/phpunit/src/Event/TypeMap.php b/vendor/phpunit/phpunit/src/Event/TypeMap.php index b4217320..df5e79cc 100644 --- a/vendor/phpunit/phpunit/src/Event/TypeMap.php +++ b/vendor/phpunit/phpunit/src/Event/TypeMap.php @@ -17,6 +17,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TypeMap diff --git a/vendor/phpunit/phpunit/src/Event/Value/ComparisonFailureBuilder.php b/vendor/phpunit/phpunit/src/Event/Value/ComparisonFailureBuilder.php index be411a9d..ece03427 100644 --- a/vendor/phpunit/phpunit/src/Event/Value/ComparisonFailureBuilder.php +++ b/vendor/phpunit/phpunit/src/Event/Value/ComparisonFailureBuilder.php @@ -16,6 +16,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ComparisonFailureBuilder diff --git a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/GarbageCollectorStatusProvider.php b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/GarbageCollectorStatusProvider.php index 15651208..09bede2e 100644 --- a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/GarbageCollectorStatusProvider.php +++ b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/GarbageCollectorStatusProvider.php @@ -10,6 +10,8 @@ namespace PHPUnit\Event\Telemetry; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This interface is not covered by the backward compatibility promise for PHPUnit */ interface GarbageCollectorStatusProvider diff --git a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/MemoryMeter.php b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/MemoryMeter.php index 4955397e..4d116ff3 100644 --- a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/MemoryMeter.php +++ b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/MemoryMeter.php @@ -10,6 +10,8 @@ namespace PHPUnit\Event\Telemetry; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This interface is not covered by the backward compatibility promise for PHPUnit */ interface MemoryMeter diff --git a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/Php81GarbageCollectorStatusProvider.php b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/Php81GarbageCollectorStatusProvider.php index 48d2afab..a96eff39 100644 --- a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/Php81GarbageCollectorStatusProvider.php +++ b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/Php81GarbageCollectorStatusProvider.php @@ -12,6 +12,8 @@ use function gc_status; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @codeCoverageIgnore diff --git a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/Php83GarbageCollectorStatusProvider.php b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/Php83GarbageCollectorStatusProvider.php index c3808b6b..ffac76ff 100644 --- a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/Php83GarbageCollectorStatusProvider.php +++ b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/Php83GarbageCollectorStatusProvider.php @@ -12,6 +12,8 @@ use function gc_status; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Php83GarbageCollectorStatusProvider implements GarbageCollectorStatusProvider diff --git a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/StopWatch.php b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/StopWatch.php index 8a149257..07ce5227 100644 --- a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/StopWatch.php +++ b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/StopWatch.php @@ -10,6 +10,8 @@ namespace PHPUnit\Event\Telemetry; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This interface is not covered by the backward compatibility promise for PHPUnit */ interface StopWatch diff --git a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/System.php b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/System.php index 53b394da..368054de 100644 --- a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/System.php +++ b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/System.php @@ -10,6 +10,8 @@ namespace PHPUnit\Event\Telemetry; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class System diff --git a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/SystemMemoryMeter.php b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/SystemMemoryMeter.php index f052f6f4..f5256650 100644 --- a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/SystemMemoryMeter.php +++ b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/SystemMemoryMeter.php @@ -13,6 +13,8 @@ use function memory_get_usage; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class SystemMemoryMeter implements MemoryMeter diff --git a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/SystemStopWatch.php b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/SystemStopWatch.php index bf37fb4e..9c9373e5 100644 --- a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/SystemStopWatch.php +++ b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/SystemStopWatch.php @@ -13,6 +13,8 @@ use PHPUnit\Event\InvalidArgumentException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class SystemStopWatch implements StopWatch diff --git a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/SystemStopWatchWithOffset.php b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/SystemStopWatchWithOffset.php index 86696afe..d27fd98c 100644 --- a/vendor/phpunit/phpunit/src/Event/Value/Telemetry/SystemStopWatchWithOffset.php +++ b/vendor/phpunit/phpunit/src/Event/Value/Telemetry/SystemStopWatchWithOffset.php @@ -13,6 +13,8 @@ use PHPUnit\Event\InvalidArgumentException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @codeCoverageIgnore diff --git a/vendor/phpunit/phpunit/src/Event/Value/Test/TestDoxBuilder.php b/vendor/phpunit/phpunit/src/Event/Value/Test/TestDoxBuilder.php index 623af26e..e5919797 100644 --- a/vendor/phpunit/phpunit/src/Event/Value/Test/TestDoxBuilder.php +++ b/vendor/phpunit/phpunit/src/Event/Value/Test/TestDoxBuilder.php @@ -14,6 +14,8 @@ use PHPUnit\Logging\TestDox\NamePrettifier; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestDoxBuilder diff --git a/vendor/phpunit/phpunit/src/Event/Value/Test/TestMethodBuilder.php b/vendor/phpunit/phpunit/src/Event/Value/Test/TestMethodBuilder.php index 59a9fef6..25ccf02f 100644 --- a/vendor/phpunit/phpunit/src/Event/Value/Test/TestMethodBuilder.php +++ b/vendor/phpunit/phpunit/src/Event/Value/Test/TestMethodBuilder.php @@ -9,6 +9,8 @@ */ namespace PHPUnit\Event\Code; +use const DEBUG_BACKTRACE_IGNORE_ARGS; +use const DEBUG_BACKTRACE_PROVIDE_OBJECT; use function assert; use function debug_backtrace; use function is_numeric; @@ -23,6 +25,8 @@ use PHPUnit\Util\Reflection; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestMethodBuilder @@ -54,7 +58,7 @@ public static function fromTestCase(TestCase $testCase): TestMethod */ public static function fromCallStack(): TestMethod { - foreach (debug_backtrace() as $frame) { + foreach (debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS) as $frame) { if (isset($frame['object']) && $frame['object'] instanceof TestCase) { return $frame['object']->valueObjectForEvents(); } diff --git a/vendor/phpunit/phpunit/src/Event/Value/TestSuite/TestSuiteBuilder.php b/vendor/phpunit/phpunit/src/Event/Value/TestSuite/TestSuiteBuilder.php index 4b22be0f..96a29375 100644 --- a/vendor/phpunit/phpunit/src/Event/Value/TestSuite/TestSuiteBuilder.php +++ b/vendor/phpunit/phpunit/src/Event/Value/TestSuite/TestSuiteBuilder.php @@ -22,6 +22,8 @@ use ReflectionMethod; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteBuilder diff --git a/vendor/phpunit/phpunit/src/Event/Value/ThrowableBuilder.php b/vendor/phpunit/phpunit/src/Event/Value/ThrowableBuilder.php index 8d3b634e..4c12b6ed 100644 --- a/vendor/phpunit/phpunit/src/Event/Value/ThrowableBuilder.php +++ b/vendor/phpunit/phpunit/src/Event/Value/ThrowableBuilder.php @@ -15,6 +15,8 @@ use PHPUnit\Util\ThrowableToStringMapper; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ThrowableBuilder diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php index 665ed543..8a0e1b8a 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php @@ -9,6 +9,9 @@ */ namespace PHPUnit\Framework\Constraint; +use Closure; +use ReflectionFunction; + /** * @psalm-template CallbackInput of mixed * @@ -37,14 +40,34 @@ public function toString(): string return 'is accepted by specified callback'; } + /** + * @psalm-suppress ArgumentTypeCoercion + */ + public function isVariadic(): bool + { + foreach ((new ReflectionFunction(Closure::fromCallable($this->callback)))->getParameters() as $parameter) { + if ($parameter->isVariadic()) { + return true; + } + } + + return false; + } + /** * Evaluates the constraint for parameter $value. Returns true if the * constraint is met, false otherwise. * * @psalm-param CallbackInput $other + * + * @psalm-suppress InvalidArgument */ protected function matches(mixed $other): bool { + if ($this->isVariadic()) { + return ($this->callback)(...$other); + } + return ($this->callback)($other); } } diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/Exception.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/Exception.php index 14905e77..3bbae762 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/Exception.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/Exception.php @@ -14,6 +14,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Exception extends Constraint diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionCode.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionCode.php index 255aff33..338588ee 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionCode.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionCode.php @@ -13,6 +13,8 @@ use PHPUnit\Util\Exporter; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ExceptionCode extends Constraint diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessageIsOrContains.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessageIsOrContains.php index 56ab6f0d..ae920903 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessageIsOrContains.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessageIsOrContains.php @@ -14,6 +14,8 @@ use PHPUnit\Util\Exporter; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ExceptionMessageIsOrContains extends Constraint diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessageMatchesRegularExpression.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessageMatchesRegularExpression.php index dfb477d0..611af037 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessageMatchesRegularExpression.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessageMatchesRegularExpression.php @@ -15,6 +15,8 @@ use PHPUnit\Util\Exporter; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ExceptionMessageMatchesRegularExpression extends Constraint diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Operator/UnaryOperator.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Operator/UnaryOperator.php index 10b0cc62..d6ac6e3f 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/Operator/UnaryOperator.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Operator/UnaryOperator.php @@ -95,7 +95,7 @@ protected function failureDescription(mixed $other): string } /** - * Transforms string returned by the memeber constraint's toString() or + * Transforms string returned by the member constraint's toString() or * failureDescription() such that it reflects constraint's participation in * this expression. * diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/String/IsJson.php b/vendor/phpunit/phpunit/src/Framework/Constraint/String/IsJson.php index fdd663cd..79b2c704 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/String/IsJson.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/String/IsJson.php @@ -9,6 +9,12 @@ */ namespace PHPUnit\Framework\Constraint; +use const JSON_ERROR_CTRL_CHAR; +use const JSON_ERROR_DEPTH; +use const JSON_ERROR_NONE; +use const JSON_ERROR_STATE_MISMATCH; +use const JSON_ERROR_SYNTAX; +use const JSON_ERROR_UTF8; use function is_string; use function json_decode; use function json_last_error; diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringMatchesFormatDescription.php b/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringMatchesFormatDescription.php index 8e5072db..f9659e2e 100644 --- a/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringMatchesFormatDescription.php +++ b/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringMatchesFormatDescription.php @@ -10,6 +10,7 @@ namespace PHPUnit\Framework\Constraint; use const DIRECTORY_SEPARATOR; +use const PHP_EOL; use function explode; use function implode; use function preg_match; @@ -86,17 +87,18 @@ private function regularExpressionForFormatDescription(string $string): string preg_quote($string, '/'), [ '%%' => '%', - '%e' => '\\' . DIRECTORY_SEPARATOR, + '%e' => preg_quote(DIRECTORY_SEPARATOR, '/'), '%s' => '[^\r\n]+', '%S' => '[^\r\n]*', - '%a' => '.+', - '%A' => '.*', + '%a' => '.+?', + '%A' => '.*?', '%w' => '\s*', '%i' => '[+-]?\d+', '%d' => '\d+', '%x' => '[0-9a-fA-F]+', - '%f' => '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?', + '%f' => '[+-]?(?:\d+|(?=\.\d))(?:\.\d+)?(?:[Ee][+-]?\d+)?', '%c' => '.', + '%0' => '\x00', ], ); diff --git a/vendor/phpunit/phpunit/src/Framework/DataProviderTestSuite.php b/vendor/phpunit/phpunit/src/Framework/DataProviderTestSuite.php index 6975d1c6..e506cec4 100644 --- a/vendor/phpunit/phpunit/src/Framework/DataProviderTestSuite.php +++ b/vendor/phpunit/phpunit/src/Framework/DataProviderTestSuite.php @@ -14,6 +14,8 @@ use PHPUnit\Metadata\Api\Groups; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class DataProviderTestSuite extends TestSuite diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/AssertionFailedError.php b/vendor/phpunit/phpunit/src/Framework/Exception/AssertionFailedError.php index 0ba25286..6bd59c4a 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/AssertionFailedError.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/AssertionFailedError.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ class AssertionFailedError extends Exception implements SelfDescribing diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/CodeCoverageException.php b/vendor/phpunit/phpunit/src/Framework/Exception/CodeCoverageException.php index 36b07231..41169ff1 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/CodeCoverageException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/CodeCoverageException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ class CodeCoverageException extends Exception diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/EmptyStringException.php b/vendor/phpunit/phpunit/src/Framework/Exception/EmptyStringException.php index e7f4fa9f..f5980cd7 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/EmptyStringException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/EmptyStringException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class EmptyStringException extends InvalidArgumentException diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/Exception.php b/vendor/phpunit/phpunit/src/Framework/Exception/Exception.php index 087729fb..4c2e2957 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/Exception.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/Exception.php @@ -11,6 +11,8 @@ use function array_keys; use function get_object_vars; +use function is_int; +use function sprintf; use RuntimeException; use Throwable; @@ -34,14 +36,28 @@ * * @see http://fabien.potencier.org/article/9/php-serialization-stack-traces-and-exceptions * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ class Exception extends RuntimeException implements \PHPUnit\Exception { protected array $serializableTrace; - public function __construct(string $message = '', int $code = 0, ?Throwable $previous = null) + public function __construct(string $message = '', int|string $code = 0, ?Throwable $previous = null) { + /** + * @see https://github.com/sebastianbergmann/phpunit/issues/5965 + */ + if (!is_int($code)) { + $message .= sprintf( + ' (exception code: %s)', + $code, + ); + + $code = 0; + } + parent::__construct($message, $code, $previous); $this->serializableTrace = $this->getTrace(); diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/ExpectationFailedException.php b/vendor/phpunit/phpunit/src/Framework/Exception/ExpectationFailedException.php index 6d2b1501..bff863f9 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/ExpectationFailedException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/ExpectationFailedException.php @@ -19,6 +19,8 @@ * SebastianBergmann\Comparator\ComparisonFailure which is used to * generate diff output of the failed expectations. * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ExpectationFailedException extends AssertionFailedError diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/GeneratorNotSupportedException.php b/vendor/phpunit/phpunit/src/Framework/Exception/GeneratorNotSupportedException.php index 2a6ff542..b3b17953 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/GeneratorNotSupportedException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/GeneratorNotSupportedException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class GeneratorNotSupportedException extends InvalidArgumentException diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/Incomplete/IncompleteTest.php b/vendor/phpunit/phpunit/src/Framework/Exception/Incomplete/IncompleteTest.php index b77b1aff..4492ef22 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/Incomplete/IncompleteTest.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/Incomplete/IncompleteTest.php @@ -12,6 +12,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface IncompleteTest extends Throwable diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/Incomplete/IncompleteTestError.php b/vendor/phpunit/phpunit/src/Framework/Exception/Incomplete/IncompleteTestError.php index 65f9c8bc..a45564da 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/Incomplete/IncompleteTestError.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/Incomplete/IncompleteTestError.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class IncompleteTestError extends AssertionFailedError implements IncompleteTest diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/InvalidArgumentException.php b/vendor/phpunit/phpunit/src/Framework/Exception/InvalidArgumentException.php index 12a94ec1..700abf03 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/InvalidArgumentException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/InvalidArgumentException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ abstract class InvalidArgumentException extends Exception diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/InvalidCoversTargetException.php b/vendor/phpunit/phpunit/src/Framework/Exception/InvalidCoversTargetException.php index ebf2994a..c6300d9e 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/InvalidCoversTargetException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/InvalidCoversTargetException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class InvalidCoversTargetException extends CodeCoverageException diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/InvalidDataProviderException.php b/vendor/phpunit/phpunit/src/Framework/Exception/InvalidDataProviderException.php index 7e2ef24c..a29f4bde 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/InvalidDataProviderException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/InvalidDataProviderException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class InvalidDataProviderException extends Exception diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/InvalidDependencyException.php b/vendor/phpunit/phpunit/src/Framework/Exception/InvalidDependencyException.php index 3a949554..8a636fd4 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/InvalidDependencyException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/InvalidDependencyException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class InvalidDependencyException extends AssertionFailedError implements SkippedTest diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/NoChildTestSuiteException.php b/vendor/phpunit/phpunit/src/Framework/Exception/NoChildTestSuiteException.php index 7ef4153b..e59df81d 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/NoChildTestSuiteException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/NoChildTestSuiteException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NoChildTestSuiteException extends Exception diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ActualValueIsNotAnObjectException.php b/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ActualValueIsNotAnObjectException.php index c2579df3..258b940a 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ActualValueIsNotAnObjectException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ActualValueIsNotAnObjectException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ActualValueIsNotAnObjectException extends Exception diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotAcceptParameterTypeException.php b/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotAcceptParameterTypeException.php index 19f4a490..74d00a17 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotAcceptParameterTypeException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotAcceptParameterTypeException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ComparisonMethodDoesNotAcceptParameterTypeException extends Exception diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotDeclareBoolReturnTypeException.php b/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotDeclareBoolReturnTypeException.php index 87cd241d..62dc7e8c 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotDeclareBoolReturnTypeException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotDeclareBoolReturnTypeException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ComparisonMethodDoesNotDeclareBoolReturnTypeException extends Exception diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotDeclareExactlyOneParameterException.php b/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotDeclareExactlyOneParameterException.php index b8d61933..d5760744 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotDeclareExactlyOneParameterException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotDeclareExactlyOneParameterException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ComparisonMethodDoesNotDeclareExactlyOneParameterException extends Exception diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotDeclareParameterTypeException.php b/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotDeclareParameterTypeException.php index 937a3b69..65718682 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotDeclareParameterTypeException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotDeclareParameterTypeException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ComparisonMethodDoesNotDeclareParameterTypeException extends Exception diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotExistException.php b/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotExistException.php index a482fb4f..94590b51 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotExistException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/ObjectEquals/ComparisonMethodDoesNotExistException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ComparisonMethodDoesNotExistException extends Exception diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/PhptAssertionFailedError.php b/vendor/phpunit/phpunit/src/Framework/Exception/PhptAssertionFailedError.php index e645e69f..73f602aa 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/PhptAssertionFailedError.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/PhptAssertionFailedError.php @@ -12,6 +12,8 @@ /** * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class PhptAssertionFailedError extends AssertionFailedError diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/ProcessIsolationException.php b/vendor/phpunit/phpunit/src/Framework/Exception/ProcessIsolationException.php index c4086fbb..e59c9c60 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/ProcessIsolationException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/ProcessIsolationException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ProcessIsolationException extends Exception diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/Skipped/SkippedTest.php b/vendor/phpunit/phpunit/src/Framework/Exception/Skipped/SkippedTest.php index a12aa402..ab2f6749 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/Skipped/SkippedTest.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/Skipped/SkippedTest.php @@ -12,6 +12,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface SkippedTest extends Throwable diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/Skipped/SkippedTestSuiteError.php b/vendor/phpunit/phpunit/src/Framework/Exception/Skipped/SkippedTestSuiteError.php index 5448508a..d3a4788b 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/Skipped/SkippedTestSuiteError.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/Skipped/SkippedTestSuiteError.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class SkippedTestSuiteError extends AssertionFailedError implements SkippedTest diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/Skipped/SkippedWithMessageException.php b/vendor/phpunit/phpunit/src/Framework/Exception/Skipped/SkippedWithMessageException.php index 22b73a1c..d09a760a 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/Skipped/SkippedWithMessageException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/Skipped/SkippedWithMessageException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class SkippedWithMessageException extends AssertionFailedError implements SkippedTest diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/UnknownClassOrInterfaceException.php b/vendor/phpunit/phpunit/src/Framework/Exception/UnknownClassOrInterfaceException.php index c3cab6c6..6a10f97f 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/UnknownClassOrInterfaceException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/UnknownClassOrInterfaceException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class UnknownClassOrInterfaceException extends InvalidArgumentException diff --git a/vendor/phpunit/phpunit/src/Framework/Exception/UnknownTypeException.php b/vendor/phpunit/phpunit/src/Framework/Exception/UnknownTypeException.php index b5f9debf..b58b695c 100644 --- a/vendor/phpunit/phpunit/src/Framework/Exception/UnknownTypeException.php +++ b/vendor/phpunit/phpunit/src/Framework/Exception/UnknownTypeException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class UnknownTypeException extends InvalidArgumentException diff --git a/vendor/phpunit/phpunit/src/Framework/ExecutionOrderDependency.php b/vendor/phpunit/phpunit/src/Framework/ExecutionOrderDependency.php index 1138fc88..091628cc 100644 --- a/vendor/phpunit/phpunit/src/Framework/ExecutionOrderDependency.php +++ b/vendor/phpunit/phpunit/src/Framework/ExecutionOrderDependency.php @@ -20,6 +20,8 @@ use Stringable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ExecutionOrderDependency implements Stringable diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/ConfigurableMethod.php b/vendor/phpunit/phpunit/src/Framework/MockObject/ConfigurableMethod.php index d48d6fa1..54d408c0 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/ConfigurableMethod.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/ConfigurableMethod.php @@ -12,6 +12,8 @@ use SebastianBergmann\Type\Type; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ConfigurableMethod diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/BadMethodCallException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/BadMethodCallException.php index 7e655e23..e8ddadda 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/BadMethodCallException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/BadMethodCallException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class BadMethodCallException extends \BadMethodCallException implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseAddMethodsException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseAddMethodsException.php deleted file mode 100644 index 848746b5..00000000 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseAddMethodsException.php +++ /dev/null @@ -1,29 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\MockObject; - -use function sprintf; - -/** - * @internal This class is not covered by the backward compatibility promise for PHPUnit - */ -final class CannotUseAddMethodsException extends \PHPUnit\Framework\Exception implements Exception -{ - public function __construct(string $type, string $methodName) - { - parent::__construct( - sprintf( - 'Trying to configure method "%s" with addMethods(), but it exists in class "%s". Use onlyMethods() for methods that exist in the class', - $methodName, - $type, - ), - ); - } -} diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseOnlyMethodsException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseOnlyMethodsException.php index 61fe0cc5..6cb399e5 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseOnlyMethodsException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseOnlyMethodsException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class CannotUseOnlyMethodsException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/Exception.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/Exception.php index 5880bc03..f7994f20 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/Exception.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/Exception.php @@ -12,6 +12,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface Exception extends Throwable diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/IncompatibleReturnValueException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/IncompatibleReturnValueException.php index 6409204a..faf8a498 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/IncompatibleReturnValueException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/IncompatibleReturnValueException.php @@ -13,6 +13,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class IncompatibleReturnValueException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatchBuilderNotFoundException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatchBuilderNotFoundException.php index f2e1a31e..8bf8967b 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatchBuilderNotFoundException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatchBuilderNotFoundException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MatchBuilderNotFoundException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatcherAlreadyRegisteredException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatcherAlreadyRegisteredException.php index 0972ffaf..de62b867 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatcherAlreadyRegisteredException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatcherAlreadyRegisteredException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MatcherAlreadyRegisteredException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodCannotBeConfiguredException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodCannotBeConfiguredException.php index 2f0bb5a6..4d39b5d9 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodCannotBeConfiguredException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodCannotBeConfiguredException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MethodCannotBeConfiguredException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodNameAlreadyConfiguredException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodNameAlreadyConfiguredException.php index 1e9f2c04..e4a37592 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodNameAlreadyConfiguredException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodNameAlreadyConfiguredException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MethodNameAlreadyConfiguredException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodNameNotConfiguredException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodNameNotConfiguredException.php index 89565b77..25c11341 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodNameNotConfiguredException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodNameNotConfiguredException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MethodNameNotConfiguredException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodParametersAlreadyConfiguredException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodParametersAlreadyConfiguredException.php index 1609c6ff..fba96cf4 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodParametersAlreadyConfiguredException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodParametersAlreadyConfiguredException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MethodParametersAlreadyConfiguredException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReflectionException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReflectionException.php index d6319c69..4981d3a7 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReflectionException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReflectionException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ReflectionException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReturnValueNotConfiguredException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReturnValueNotConfiguredException.php index 0b7bceb3..cf193f10 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReturnValueNotConfiguredException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReturnValueNotConfiguredException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ReturnValueNotConfiguredException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/RuntimeException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/RuntimeException.php index 33b6a5be..b99a903e 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/RuntimeException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/RuntimeException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RuntimeException extends \RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassAlreadyExistsException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassAlreadyExistsException.php deleted file mode 100644 index 4ff72ab5..00000000 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassAlreadyExistsException.php +++ /dev/null @@ -1,28 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\MockObject\Generator; - -use function sprintf; - -/** - * @internal This class is not covered by the backward compatibility promise for PHPUnit - */ -final class ClassAlreadyExistsException extends \PHPUnit\Framework\Exception implements Exception -{ - public function __construct(string $className) - { - parent::__construct( - sprintf( - 'Class "%s" already exists', - $className, - ), - ); - } -} diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsEnumerationException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsEnumerationException.php index 96137c41..e2cde18b 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsEnumerationException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsEnumerationException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ClassIsEnumerationException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsFinalException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsFinalException.php index de9e9430..f10100b9 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsFinalException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsFinalException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ClassIsFinalException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsReadonlyException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsReadonlyException.php index 7cf07fe9..2b549c7a 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsReadonlyException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ClassIsReadonlyException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ClassIsReadonlyException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/DuplicateMethodException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/DuplicateMethodException.php index 71bed992..f9a0a766 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/DuplicateMethodException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/DuplicateMethodException.php @@ -15,6 +15,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class DuplicateMethodException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/Exception.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/Exception.php index 9a3c2588..8d62606f 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/Exception.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/Exception.php @@ -12,6 +12,8 @@ use PHPUnit\Framework\MockObject\Exception as BaseException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This interface is not covered by the backward compatibility promise for PHPUnit */ interface Exception extends BaseException diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/InvalidMethodNameException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/InvalidMethodNameException.php index 4a7bd68e..32296ce3 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/InvalidMethodNameException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/InvalidMethodNameException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class InvalidMethodNameException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/OriginalConstructorInvocationRequiredException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/OriginalConstructorInvocationRequiredException.php index b91e2614..b284d94d 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/OriginalConstructorInvocationRequiredException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/OriginalConstructorInvocationRequiredException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject\Generator; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class OriginalConstructorInvocationRequiredException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ReflectionException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ReflectionException.php index 03efd52d..f4a84f18 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ReflectionException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/ReflectionException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject\Generator; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ReflectionException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/RuntimeException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/RuntimeException.php index 0cca5fa5..eed41c37 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/RuntimeException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/RuntimeException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject\Generator; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RuntimeException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/SoapExtensionNotAvailableException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/SoapExtensionNotAvailableException.php index 37af4913..f6f513b8 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/SoapExtensionNotAvailableException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/SoapExtensionNotAvailableException.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject\Generator; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class SoapExtensionNotAvailableException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/UnknownClassException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/UnknownClassException.php index 64c79e0a..c5127459 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/UnknownClassException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/UnknownClassException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class UnknownClassException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/UnknownTraitException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/UnknownTraitException.php index 67cecfa9..a536b156 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/UnknownTraitException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/UnknownTraitException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5243 diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/UnknownTypeException.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/UnknownTypeException.php index ccda69bb..cd1e1e07 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/UnknownTypeException.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Exception/UnknownTypeException.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class UnknownTypeException extends \PHPUnit\Framework\Exception implements Exception diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Generator.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Generator.php index 6c2bd5d7..e4a63abd 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Generator.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/Generator.php @@ -62,6 +62,8 @@ use Traversable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Generator @@ -92,12 +94,12 @@ final class Generator /** * Returns a test double for the specified class. * - * @throws ClassAlreadyExistsException * @throws ClassIsEnumerationException * @throws ClassIsFinalException * @throws ClassIsReadonlyException * @throws DuplicateMethodException * @throws InvalidMethodNameException + * @throws NameAlreadyInUseException * @throws OriginalConstructorInvocationRequiredException * @throws ReflectionException * @throws RuntimeException @@ -114,7 +116,7 @@ public function testDouble(string $type, bool $mockObject, ?array $methods = [], } $this->ensureValidMethods($methods); - $this->ensureMockedClassDoesNotAlreadyExist($mockClassName); + $this->ensureNameForTestDoubleClassIsAvailable($mockClassName); if (!$callOriginalConstructor && $callOriginalMethods) { throw new OriginalConstructorInvocationRequiredException; @@ -219,13 +221,13 @@ public function testDoubleForInterfaceIntersection(array $interfaces, bool $mock * * Concrete methods to mock can be specified with the $mockedMethods parameter. * - * @throws ClassAlreadyExistsException * @throws ClassIsEnumerationException * @throws ClassIsFinalException * @throws ClassIsReadonlyException * @throws DuplicateMethodException * @throws InvalidArgumentException * @throws InvalidMethodNameException + * @throws NameAlreadyInUseException * @throws OriginalConstructorInvocationRequiredException * @throws ReflectionException * @throws RuntimeException @@ -279,13 +281,13 @@ interface_exists($originalClassName, $callAutoload)) { * * @psalm-param trait-string $traitName * - * @throws ClassAlreadyExistsException * @throws ClassIsEnumerationException * @throws ClassIsFinalException * @throws ClassIsReadonlyException * @throws DuplicateMethodException * @throws InvalidArgumentException * @throws InvalidMethodNameException + * @throws NameAlreadyInUseException * @throws OriginalConstructorInvocationRequiredException * @throws ReflectionException * @throws RuntimeException @@ -922,17 +924,19 @@ private function ensureValidMethods(?array $methods): void } /** - * @throws ClassAlreadyExistsException + * @throws NameAlreadyInUseException * @throws ReflectionException */ - private function ensureMockedClassDoesNotAlreadyExist(string $mockClassName): void + private function ensureNameForTestDoubleClassIsAvailable(string $className): void { - if ($mockClassName !== '' && class_exists($mockClassName, false)) { - $reflector = $this->reflectClass($mockClassName); + if ($className === '') { + return; + } - if (!$reflector->implementsInterface(MockObject::class)) { - throw new ClassAlreadyExistsException($mockClassName); - } + if (class_exists($className, false) || + interface_exists($className, false) || + trait_exists($className, false)) { + throw new NameAlreadyInUseException($className); } } diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockClass.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockClass.php index 7606ea59..8fe3c827 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockClass.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockClass.php @@ -14,6 +14,8 @@ use PHPUnit\Framework\MockObject\ConfigurableMethod; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MockClass implements MockType diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockMethod.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockMethod.php index 4c58e8c6..497cd114 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockMethod.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockMethod.php @@ -17,6 +17,7 @@ use function preg_match; use function preg_replace; use function sprintf; +use function str_contains; use function strlen; use function strpos; use function substr; @@ -30,6 +31,8 @@ use SebastianBergmann\Type\UnknownType; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MockMethod @@ -209,13 +212,21 @@ public function generateCode(): string $template = $this->loadTemplate($templateFile); + $argumentsCount = 0; + + if (str_contains($this->argumentsForCall, '...')) { + $argumentsCount = null; + } elseif (!empty($this->argumentsForCall)) { + $argumentsCount = substr_count($this->argumentsForCall, ',') + 1; + } + $template->setVar( [ 'arguments_decl' => $this->argumentsForDeclaration, 'arguments_call' => $this->argumentsForCall, 'return_declaration' => !empty($this->returnType->asString()) ? (': ' . $this->returnType->asString()) : '', 'return_type' => $this->returnType->asString(), - 'arguments_count' => !empty($this->argumentsForCall) ? substr_count($this->argumentsForCall, ',') + 1 : 0, + 'arguments_count' => $argumentsCount, 'class_name' => $this->className, 'method_name' => $this->methodName, 'modifier' => $this->modifier, diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockMethodSet.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockMethodSet.php index 31f48a6a..92785cc1 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockMethodSet.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockMethodSet.php @@ -14,6 +14,8 @@ use function strtolower; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MockMethodSet diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockTrait.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockTrait.php index 20e9301b..2e78a6a3 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockTrait.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockTrait.php @@ -12,6 +12,8 @@ use function class_exists; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5243 diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockType.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockType.php index 3f7799f0..6003d987 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockType.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/MockType.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject\Generator; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface MockType diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/TemplateLoader.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/TemplateLoader.php index fc3b73a1..37545fc9 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/TemplateLoader.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/TemplateLoader.php @@ -12,6 +12,8 @@ use SebastianBergmann\Template\Template; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This trait is not covered by the backward compatibility promise for PHPUnit */ trait TemplateLoader diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/templates/doubled_method.tpl b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/templates/doubled_method.tpl index 8ecd412c..1b1b663f 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/templates/doubled_method.tpl +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Generator/templates/doubled_method.tpl @@ -17,7 +17,7 @@ $__phpunit_arguments = [{arguments_call}]; $__phpunit_count = func_num_args(); - if ($__phpunit_count > {arguments_count}) { + if ({arguments_count} !== null && $__phpunit_count > {arguments_count}) { $__phpunit_arguments_tmp = func_get_args(); for ($__phpunit_i = {arguments_count}; $__phpunit_i < $__phpunit_count; $__phpunit_i++) { diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/MockBuilder.php b/vendor/phpunit/phpunit/src/Framework/MockObject/MockBuilder.php index 2c751da9..3e99351e 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/MockBuilder.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/MockBuilder.php @@ -14,13 +14,14 @@ use function trait_exists; use PHPUnit\Framework\Exception; use PHPUnit\Framework\InvalidArgumentException; -use PHPUnit\Framework\MockObject\Generator\ClassAlreadyExistsException; +use PHPUnit\Framework\MockObject\Generator\CannotUseAddMethodsException; use PHPUnit\Framework\MockObject\Generator\ClassIsEnumerationException; use PHPUnit\Framework\MockObject\Generator\ClassIsFinalException; use PHPUnit\Framework\MockObject\Generator\ClassIsReadonlyException; use PHPUnit\Framework\MockObject\Generator\DuplicateMethodException; use PHPUnit\Framework\MockObject\Generator\Generator; use PHPUnit\Framework\MockObject\Generator\InvalidMethodNameException; +use PHPUnit\Framework\MockObject\Generator\NameAlreadyInUseException; use PHPUnit\Framework\MockObject\Generator\OriginalConstructorInvocationRequiredException; use PHPUnit\Framework\MockObject\Generator\ReflectionException; use PHPUnit\Framework\MockObject\Generator\RuntimeException; @@ -76,13 +77,13 @@ public function __construct(TestCase $testCase, string $type) /** * Creates a mock object using a fluent interface. * - * @throws ClassAlreadyExistsException * @throws ClassIsEnumerationException * @throws ClassIsFinalException * @throws ClassIsReadonlyException * @throws DuplicateMethodException * @throws InvalidArgumentException * @throws InvalidMethodNameException + * @throws NameAlreadyInUseException * @throws OriginalConstructorInvocationRequiredException * @throws ReflectionException * @throws RuntimeException @@ -345,6 +346,8 @@ public function enableOriginalClone(): self * @return $this * * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5309 + * + * @codeCoverageIgnore */ public function disableAutoload(): self { @@ -401,6 +404,8 @@ public function enableArgumentCloning(): self * @return $this * * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5307 + * + * @codeCoverageIgnore */ public function enableProxyingToOriginalMethods(): self { @@ -430,6 +435,8 @@ public function disableProxyingToOriginalMethods(): self * @return $this * * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5307 + * + * @codeCoverageIgnore */ public function setProxyTarget(object $object): self { diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/DoubledCloneMethod.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/DoubledCloneMethod.php index bb02daf8..17ad85d7 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/DoubledCloneMethod.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/DoubledCloneMethod.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This trait is not covered by the backward compatibility promise for PHPUnit */ trait DoubledCloneMethod diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/Method.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/Method.php index a991eae4..ef77e3cb 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/Method.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/Method.php @@ -15,6 +15,8 @@ use PHPUnit\Framework\MockObject\Rule\AnyInvokedCount; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This trait is not covered by the backward compatibility promise for PHPUnit */ trait Method diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/MockObjectApi.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/MockObjectApi.php index b6b3bd52..28b55d6b 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/MockObjectApi.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/MockObjectApi.php @@ -13,6 +13,8 @@ use PHPUnit\Framework\MockObject\Rule\InvocationOrder; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This trait is not covered by the backward compatibility promise for PHPUnit */ trait MockObjectApi diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/ProxiedCloneMethod.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/ProxiedCloneMethod.php index ae0dbc78..4099a641 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/ProxiedCloneMethod.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/ProxiedCloneMethod.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This trait is not covered by the backward compatibility promise for PHPUnit */ trait ProxiedCloneMethod diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/StubApi.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/StubApi.php index 64bed690..10dfe4cd 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/StubApi.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Api/StubApi.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This trait is not covered by the backward compatibility promise for PHPUnit */ trait StubApi diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/Identity.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/Identity.php index 28c0bc03..07a9d37c 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/Identity.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/Identity.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject\Builder; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface Identity diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/MethodNameMatch.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/MethodNameMatch.php index 46b35e62..c25e8df7 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/MethodNameMatch.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/MethodNameMatch.php @@ -12,6 +12,8 @@ use PHPUnit\Framework\Constraint\Constraint; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface MethodNameMatch extends ParametersMatch diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/ParametersMatch.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/ParametersMatch.php index 656d21b2..96493d44 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/ParametersMatch.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/ParametersMatch.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject\Builder; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface ParametersMatch extends Stub diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/Stub.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/Stub.php index d7cb78fc..fce47549 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/Stub.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Builder/Stub.php @@ -12,6 +12,8 @@ use PHPUnit\Framework\MockObject\Stub\Stub as BaseStub; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface Stub extends Identity diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Interface/MockObjectInternal.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Interface/MockObjectInternal.php index bb84ffac..fe5bbdf6 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Interface/MockObjectInternal.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Interface/MockObjectInternal.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This interface is not covered by the backward compatibility promise for PHPUnit */ interface MockObjectInternal extends MockObject, StubInternal diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Interface/StubInternal.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Interface/StubInternal.php index 79cc6a27..91f6464f 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Interface/StubInternal.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Interface/StubInternal.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\MockObject; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This interface is not covered by the backward compatibility promise for PHPUnit */ interface StubInternal extends Stub diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Invocation.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Invocation.php index e3dbefd4..008b372b 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Invocation.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Invocation.php @@ -21,6 +21,8 @@ use SebastianBergmann\Exporter\Exporter; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Invocation implements SelfDescribing diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/InvocationHandler.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/InvocationHandler.php index 45baebbb..4228d17d 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/InvocationHandler.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/InvocationHandler.php @@ -16,6 +16,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class InvocationHandler diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Matcher.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Matcher.php index f53c1d9f..128a5856 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Matcher.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Matcher.php @@ -22,6 +22,8 @@ use PHPUnit\Util\ThrowableToStringMapper; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Matcher diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/MethodNameConstraint.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/MethodNameConstraint.php index 450331ec..db17134b 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/MethodNameConstraint.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/MethodNameConstraint.php @@ -14,6 +14,8 @@ use PHPUnit\Framework\Constraint\Constraint; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MethodNameConstraint extends Constraint diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/ReturnValueGenerator.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/ReturnValueGenerator.php index d4ad4b23..7cf1cd6a 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/ReturnValueGenerator.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/ReturnValueGenerator.php @@ -25,6 +25,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ReturnValueGenerator @@ -182,6 +184,7 @@ private function newInstanceOf(string $stubClassName, string $className, string { try { return (new ReflectionClass($stubClassName))->newInstanceWithoutConstructor(); + // @codeCoverageIgnoreStart } catch (Throwable $t) { throw new RuntimeException( sprintf( @@ -191,6 +194,7 @@ private function newInstanceOf(string $stubClassName, string $className, string $t->getMessage(), ), ); + // @codeCoverageIgnoreEnd } } @@ -205,6 +209,7 @@ private function testDoubleFor(string $type, string $className, string $methodNa { try { return (new Generator)->testDouble($type, false, [], [], '', false); + // @codeCoverageIgnoreStart } catch (Throwable $t) { throw new RuntimeException( sprintf( @@ -214,6 +219,7 @@ private function testDoubleFor(string $type, string $className, string $methodNa $t->getMessage(), ), ); + // @codeCoverageIgnoreEnd } } @@ -228,6 +234,7 @@ private function testDoubleForIntersectionOfInterfaces(array $types, string $cla { try { return (new Generator)->testDoubleForInterfaceIntersection($types, false); + // @codeCoverageIgnoreStart } catch (Throwable $t) { throw new RuntimeException( sprintf( @@ -237,6 +244,7 @@ private function testDoubleForIntersectionOfInterfaces(array $types, string $cla $t->getMessage(), ), ); + // @codeCoverageIgnoreEnd } } } diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/AnyInvokedCount.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/AnyInvokedCount.php index 1dd52081..382f9308 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/AnyInvokedCount.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/AnyInvokedCount.php @@ -12,6 +12,8 @@ use PHPUnit\Framework\MockObject\Invocation as BaseInvocation; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class AnyInvokedCount extends InvocationOrder diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/AnyParameters.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/AnyParameters.php index 75232027..01a54d1b 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/AnyParameters.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/AnyParameters.php @@ -12,6 +12,8 @@ use PHPUnit\Framework\MockObject\Invocation as BaseInvocation; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class AnyParameters implements ParametersRule diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvocationOrder.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvocationOrder.php index 2d7a7d25..5d8429d8 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvocationOrder.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvocationOrder.php @@ -14,6 +14,8 @@ use PHPUnit\Framework\SelfDescribing; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ abstract class InvocationOrder implements SelfDescribing diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedAtLeastCount.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedAtLeastCount.php index d6d251bd..a78d933d 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedAtLeastCount.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedAtLeastCount.php @@ -14,6 +14,8 @@ use PHPUnit\Framework\MockObject\Invocation as BaseInvocation; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class InvokedAtLeastCount extends InvocationOrder diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedAtLeastOnce.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedAtLeastOnce.php index efe51838..91026f53 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedAtLeastOnce.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedAtLeastOnce.php @@ -13,6 +13,8 @@ use PHPUnit\Framework\MockObject\Invocation as BaseInvocation; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class InvokedAtLeastOnce extends InvocationOrder diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedAtMostCount.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedAtMostCount.php index 64ed9403..0cfda5e1 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedAtMostCount.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedAtMostCount.php @@ -14,6 +14,8 @@ use PHPUnit\Framework\MockObject\Invocation as BaseInvocation; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class InvokedAtMostCount extends InvocationOrder diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedCount.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedCount.php index 638317ca..3f0e505a 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedCount.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/InvokedCount.php @@ -14,6 +14,8 @@ use PHPUnit\Framework\MockObject\Invocation as BaseInvocation; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class InvokedCount extends InvocationOrder diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/MethodName.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/MethodName.php index d6eda846..8ca6da68 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/MethodName.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/MethodName.php @@ -17,6 +17,8 @@ use PHPUnit\Framework\MockObject\MethodNameConstraint; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MethodName diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/Parameters.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/Parameters.php index 4119a0ec..a1f100d0 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/Parameters.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Rule/Parameters.php @@ -12,6 +12,7 @@ use function count; use function sprintf; use Exception; +use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\Constraint\Constraint; use PHPUnit\Framework\Constraint\IsAnything; use PHPUnit\Framework\Constraint\IsEqual; @@ -19,6 +20,8 @@ use PHPUnit\Framework\MockObject\Invocation as BaseInvocation; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Parameters implements ParametersRule @@ -106,8 +109,13 @@ private function doVerify(): bool } foreach ($this->parameters as $i => $parameter) { + if ($parameter instanceof Callback && $parameter->isVariadic()) { + $other = $this->invocation->parameters(); + } else { + $other = $this->invocation->parameters()[$i]; + } $parameter->evaluate( - $this->invocation->parameters()[$i], + $other, sprintf( 'Parameter %s for invocation %s does not match expected ' . 'value.', diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ConsecutiveCalls.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ConsecutiveCalls.php index 155226ee..7b1297de 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ConsecutiveCalls.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ConsecutiveCalls.php @@ -10,22 +10,38 @@ namespace PHPUnit\Framework\MockObject\Stub; use function array_shift; +use function count; use PHPUnit\Framework\MockObject\Invocation; +use PHPUnit\Framework\MockObject\NoMoreReturnValuesConfiguredException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ConsecutiveCalls implements Stub { private array $stack; + private int $numberOfConfiguredReturnValues; public function __construct(array $stack) { - $this->stack = $stack; + $this->stack = $stack; + $this->numberOfConfiguredReturnValues = count($stack); } + /** + * @throws NoMoreReturnValuesConfiguredException + */ public function invoke(Invocation $invocation): mixed { + if (empty($this->stack)) { + throw new NoMoreReturnValuesConfiguredException( + $invocation, + $this->numberOfConfiguredReturnValues, + ); + } + $value = array_shift($this->stack); if ($value instanceof Stub) { diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/Exception.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/Exception.php index c2b349ca..a17fe97b 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/Exception.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/Exception.php @@ -13,6 +13,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Exception implements Stub diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnArgument.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnArgument.php index 4b28813c..18fdce0f 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnArgument.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnArgument.php @@ -12,6 +12,8 @@ use PHPUnit\Framework\MockObject\Invocation; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ReturnArgument implements Stub diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnCallback.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnCallback.php index be4a0151..4e4cd531 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnCallback.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnCallback.php @@ -13,6 +13,8 @@ use PHPUnit\Framework\MockObject\Invocation; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ReturnCallback implements Stub diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnReference.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnReference.php index fd9e34de..448df452 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnReference.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnReference.php @@ -12,6 +12,8 @@ use PHPUnit\Framework\MockObject\Invocation; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ReturnReference implements Stub diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnSelf.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnSelf.php index 059ef18b..4101d71a 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnSelf.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnSelf.php @@ -13,6 +13,8 @@ use PHPUnit\Framework\MockObject\RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ReturnSelf implements Stub diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnStub.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnStub.php index d810ceba..278c4da9 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnStub.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnStub.php @@ -12,6 +12,8 @@ use PHPUnit\Framework\MockObject\Invocation; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ReturnStub implements Stub diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnValueMap.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnValueMap.php index 2cdf1604..b1b62c5f 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnValueMap.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnValueMap.php @@ -15,6 +15,8 @@ use PHPUnit\Framework\MockObject\Invocation; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ReturnValueMap implements Stub diff --git a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/Stub.php b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/Stub.php index e889adfe..46d9e53a 100644 --- a/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/Stub.php +++ b/vendor/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/Stub.php @@ -12,6 +12,8 @@ use PHPUnit\Framework\MockObject\Invocation; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface Stub diff --git a/vendor/phpunit/phpunit/src/Framework/Reorderable.php b/vendor/phpunit/phpunit/src/Framework/Reorderable.php index a75e8b94..cc035d96 100644 --- a/vendor/phpunit/phpunit/src/Framework/Reorderable.php +++ b/vendor/phpunit/phpunit/src/Framework/Reorderable.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface Reorderable diff --git a/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php b/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php index 73034f65..122c31b5 100644 --- a/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php +++ b/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface SelfDescribing diff --git a/vendor/phpunit/phpunit/src/Framework/TestBuilder.php b/vendor/phpunit/phpunit/src/Framework/TestBuilder.php index 8e5e019d..9bf77b31 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestBuilder.php +++ b/vendor/phpunit/phpunit/src/Framework/TestBuilder.php @@ -12,6 +12,7 @@ use function assert; use PHPUnit\Metadata\Api\DataProvider; use PHPUnit\Metadata\Api\Groups; +use PHPUnit\Metadata\Api\Requirements; use PHPUnit\Metadata\BackupGlobals; use PHPUnit\Metadata\BackupStaticProperties; use PHPUnit\Metadata\ExcludeGlobalVariableFromBackup; @@ -22,6 +23,8 @@ use ReflectionClass; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestBuilder @@ -35,10 +38,11 @@ public function build(ReflectionClass $theClass, string $methodName): Test { $className = $theClass->getName(); - $data = (new DataProvider)->providedData( - $className, - $methodName, - ); + $data = null; + + if ($this->requirementsSatisfied($className, $methodName)) { + $data = (new DataProvider)->providedData($className, $methodName); + } if ($data !== null) { return $this->buildDataProviderTestSuite( @@ -266,4 +270,13 @@ private function shouldAllTestMethodsOfTestClassBeRunInSingleSeparateProcess(str { return MetadataRegistry::parser()->forClass($className)->isRunClassInSeparateProcess()->isNotEmpty(); } + + /** + * @psalm-param class-string $className + * @psalm-param non-empty-string $methodName + */ + private function requirementsSatisfied(string $className, string $methodName): bool + { + return (new Requirements)->requirementsNotSatisfiedFor($className, $methodName) === []; + } } diff --git a/vendor/phpunit/phpunit/src/Framework/TestCase.php b/vendor/phpunit/phpunit/src/Framework/TestCase.php index 155c6924..06dcd055 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestCase.php +++ b/vendor/phpunit/phpunit/src/Framework/TestCase.php @@ -18,7 +18,9 @@ use const PATHINFO_FILENAME; use const PHP_EOL; use const PHP_URL_PATH; +use function array_is_list; use function array_keys; +use function array_map; use function array_merge; use function array_values; use function assert; @@ -56,6 +58,7 @@ use DeepCopy\DeepCopy; use PHPUnit\Event; use PHPUnit\Event\NoPreviousThrowableException; +use PHPUnit\Event\RuntimeException; use PHPUnit\Event\TestData\MoreThanOneDataSetFromDataProviderException; use PHPUnit\Framework\Constraint\Exception as ExceptionConstraint; use PHPUnit\Framework\Constraint\ExceptionCode; @@ -91,7 +94,9 @@ use PHPUnit\Util\Test as TestUtil; use ReflectionClass; use ReflectionException; +use ReflectionMethod; use ReflectionObject; +use ReflectionParameter; use SebastianBergmann\CodeCoverage\StaticAnalysisCacheNotConfiguredException; use SebastianBergmann\CodeCoverage\UnintentionallyCoveredCodeException; use SebastianBergmann\Comparator\Comparator; @@ -257,6 +262,8 @@ final public static function atMost(int $allowedInvocations): InvokedAtMostCount /** * @deprecated Use $double->willReturn() instead of $double->will($this->returnValue()) * @see https://github.com/sebastianbergmann/phpunit/issues/5423 + * + * @codeCoverageIgnore */ final public static function returnValue(mixed $value): ReturnStub { @@ -266,6 +273,8 @@ final public static function returnValue(mixed $value): ReturnStub /** * @deprecated Use $double->willReturnMap() instead of $double->will($this->returnValueMap()) * @see https://github.com/sebastianbergmann/phpunit/issues/5423 + * + * @codeCoverageIgnore */ final public static function returnValueMap(array $valueMap): ReturnValueMapStub { @@ -275,6 +284,8 @@ final public static function returnValueMap(array $valueMap): ReturnValueMapStub /** * @deprecated Use $double->willReturnArgument() instead of $double->will($this->returnArgument()) * @see https://github.com/sebastianbergmann/phpunit/issues/5423 + * + * @codeCoverageIgnore */ final public static function returnArgument(int $argumentIndex): ReturnArgumentStub { @@ -284,6 +295,8 @@ final public static function returnArgument(int $argumentIndex): ReturnArgumentS /** * @deprecated Use $double->willReturnCallback() instead of $double->will($this->returnCallback()) * @see https://github.com/sebastianbergmann/phpunit/issues/5423 + * + * @codeCoverageIgnore */ final public static function returnCallback(callable $callback): ReturnCallbackStub { @@ -293,6 +306,8 @@ final public static function returnCallback(callable $callback): ReturnCallbackS /** * @deprecated Use $double->willReturnSelf() instead of $double->will($this->returnSelf()) * @see https://github.com/sebastianbergmann/phpunit/issues/5423 + * + * @codeCoverageIgnore */ final public static function returnSelf(): ReturnSelfStub { @@ -308,6 +323,8 @@ final public static function throwException(Throwable $exception): ExceptionStub * @deprecated Use $double->willReturn() instead of $double->will($this->onConsecutiveCalls()) * @see https://github.com/sebastianbergmann/phpunit/issues/5423 * @see https://github.com/sebastianbergmann/phpunit/issues/5425 + * + * @codeCoverageIgnore */ final public static function onConsecutiveCalls(mixed ...$arguments): ConsecutiveCallsStub { @@ -328,6 +345,8 @@ public function __construct(string $name) /** * This method is called before the first test of this test class is run. + * + * @codeCoverageIgnore */ public static function setUpBeforeClass(): void { @@ -335,6 +354,8 @@ public static function setUpBeforeClass(): void /** * This method is called after the last test of this test class is run. + * + * @codeCoverageIgnore */ public static function tearDownAfterClass(): void { @@ -342,6 +363,8 @@ public static function tearDownAfterClass(): void /** * This method is called before each test. + * + * @codeCoverageIgnore */ protected function setUp(): void { @@ -351,6 +374,8 @@ protected function setUp(): void * Performs assertions shared by all tests of a test case. * * This method is called between setUp() and test. + * + * @codeCoverageIgnore */ protected function assertPreConditions(): void { @@ -360,6 +385,8 @@ protected function assertPreConditions(): void * Performs assertions shared by all tests of a test case. * * This method is called between test and tearDown(). + * + * @codeCoverageIgnore */ protected function assertPostConditions(): void { @@ -367,6 +394,8 @@ protected function assertPostConditions(): void /** * This method is called after each test. + * + * @codeCoverageIgnore */ protected function tearDown(): void { @@ -484,7 +513,7 @@ final public function run(): void return; } - if (!$this->shouldRunInSeparateProcess()) { + if (!$this->shouldRunInSeparateProcess() || $this->requirementsNotSatisfied()) { (new TestRunner)->run($this); } else { (new TestRunner)->runInSeparateProcess( @@ -602,6 +631,8 @@ final public function expectsOutput(): bool * @internal This method is not covered by the backward compatibility promise for PHPUnit * * @deprecated + * + * @codeCoverageIgnore */ final public function registerMockObjectsFromTestArgumentsRecursively(): void { @@ -635,7 +666,9 @@ final public function runBare(): void $hasMetRequirements = true; if ($this->inIsolation) { + // @codeCoverageIgnoreStart $this->invokeBeforeClassHookMethods($hookMethods, $emitter); + // @codeCoverageIgnoreEnd } if (method_exists(static::class, $this->name) && @@ -749,7 +782,9 @@ final public function runBare(): void $this->invokeAfterTestHookMethods($hookMethods, $emitter); if ($this->inIsolation) { + // @codeCoverageIgnoreStart $this->invokeAfterClassHookMethods($hookMethods, $emitter); + // @codeCoverageIgnoreEnd } } } catch (AssertionError|AssertionFailedError $e) { @@ -821,6 +856,8 @@ final public function setDependencies(array $dependencies): void /** * @internal This method is not covered by the backward compatibility promise for PHPUnit + * + * @codeCoverageIgnore */ final public function setDependencyInput(array $dependencyInput): void { @@ -903,6 +940,8 @@ final public function setPreserveGlobalState(bool $preserveGlobalState): void /** * @internal This method is not covered by the backward compatibility promise for PHPUnit + * + * @codeCoverageIgnore */ final public function setInIsolation(bool $inIsolation): void { @@ -911,14 +950,8 @@ final public function setInIsolation(bool $inIsolation): void /** * @internal This method is not covered by the backward compatibility promise for PHPUnit - */ - final public function isInIsolation(): bool - { - return $this->inIsolation; - } - - /** - * @internal This method is not covered by the backward compatibility promise for PHPUnit + * + * @codeCoverageIgnore */ final public function result(): mixed { @@ -1055,12 +1088,45 @@ final public function requires(): array } /** + * @throws RuntimeException + * * @internal This method is not covered by the backward compatibility promise for PHPUnit */ final public function setData(int|string $dataName, array $data): void { $this->dataName = $dataName; $this->data = $data; + + if (array_is_list($data)) { + return; + } + + try { + $reflector = new ReflectionMethod($this, $this->name); + $parameters = array_map(static fn (ReflectionParameter $parameter) => $parameter->name, $reflector->getParameters()); + + foreach (array_keys($data) as $parameter) { + if (is_string($parameter) && !in_array($parameter, $parameters, true)) { + Event\Facade::emitter()->testTriggeredPhpunitDeprecation( + $this->valueObjectForEvents(), + sprintf( + 'Providing invalid named argument $%s for method %s::%s() is deprecated and will not be supported in PHPUnit 11.0.', + $parameter, + $this::class, + $this->name, + ), + ); + } + } + // @codeCoverageIgnoreStart + } catch (ReflectionException $e) { + throw new RuntimeException( + $e->getMessage(), + $e->getCode(), + $e, + ); + } + // @codeCoverageIgnoreEnd } /** @@ -1143,6 +1209,8 @@ protected function runTest(): mixed * @throws Exception * * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5214 + * + * @codeCoverageIgnore */ protected function iniSet(string $varName, string $newValue): void { @@ -1168,6 +1236,8 @@ protected function iniSet(string $varName, string $newValue): void * @throws Exception * * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5216 + * + * @codeCoverageIgnore */ protected function setLocale(mixed ...$arguments): void { @@ -2001,6 +2071,8 @@ private function performAssertionsOnOutput(): void /** * @throws Throwable + * + * @codeCoverageIgnore */ private function invokeBeforeClassHookMethods(array $hookMethods, Event\Emitter $emitter): void { @@ -2066,6 +2138,8 @@ private function invokeAfterTestHookMethods(array $hookMethods, Event\Emitter $e /** * @throws Throwable + * + * @codeCoverageIgnore */ private function invokeAfterClassHookMethods(array $hookMethods, Event\Emitter $emitter): void { @@ -2236,6 +2310,11 @@ private function hasExpectationOnOutput(): bool return is_string($this->outputExpectedString) || is_string($this->outputExpectedRegex); } + private function requirementsNotSatisfied(): bool + { + return (new Requirements)->requirementsNotSatisfiedFor(static::class, $this->name) !== []; + } + /** * Creates a test stub for the specified interface or class. * @@ -2275,7 +2354,7 @@ protected static function createStub(string $originalClassName): Stub */ protected static function createStubForIntersectionOfInterfaces(array $interfaces): Stub { - $stub = (new MockGenerator)->testDoubleForInterfaceIntersection($interfaces, false); + $stub = (new MockGenerator)->testDoubleForInterfaceIntersection($interfaces, true); Event\Facade::emitter()->testCreatedStubForIntersectionOfInterfaces($interfaces); diff --git a/vendor/phpunit/phpunit/src/Framework/TestRunner.php b/vendor/phpunit/phpunit/src/Framework/TestRunner.php index 11da6542..3e2da254 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestRunner.php +++ b/vendor/phpunit/phpunit/src/Framework/TestRunner.php @@ -11,7 +11,6 @@ use const PHP_EOL; use function assert; -use function class_exists; use function defined; use function error_clear_last; use function extension_loaded; @@ -46,6 +45,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestRunner @@ -359,22 +360,22 @@ public function runInSeparateProcess(TestCase $test, bool $runEntireClass, bool */ private function hasCoverageMetadata(string $className, string $methodName): bool { - $metadata = MetadataRegistry::parser()->forClassAndMethod($className, $methodName); - - if ($metadata->isCovers()->isNotEmpty()) { - return true; - } + foreach (MetadataRegistry::parser()->forClassAndMethod($className, $methodName) as $metadata) { + if ($metadata->isCovers()) { + return true; + } - if ($metadata->isCoversClass()->isNotEmpty()) { - return true; - } + if ($metadata->isCoversClass()) { + return true; + } - if ($metadata->isCoversFunction()->isNotEmpty()) { - return true; - } + if ($metadata->isCoversFunction()) { + return true; + } - if ($metadata->isCoversNothing()->isNotEmpty()) { - return true; + if ($metadata->isCoversNothing()) { + return true; + } } return false; @@ -386,12 +387,6 @@ private function canTimeLimitBeEnforced(): bool return $this->timeLimitCanBeEnforced; } - if (!class_exists(Invoker::class)) { - $this->timeLimitCanBeEnforced = false; - - return $this->timeLimitCanBeEnforced; - } - $this->timeLimitCanBeEnforced = (new Invoker)->canInvokeWithTimeout(); return $this->timeLimitCanBeEnforced; diff --git a/vendor/phpunit/phpunit/src/Framework/TestSize/Known.php b/vendor/phpunit/phpunit/src/Framework/TestSize/Known.php index d7dca96e..ea8cb293 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestSize/Known.php +++ b/vendor/phpunit/phpunit/src/Framework/TestSize/Known.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\TestSize; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/Framework/TestSize/Large.php b/vendor/phpunit/phpunit/src/Framework/TestSize/Large.php index bdf00184..833dbc06 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestSize/Large.php +++ b/vendor/phpunit/phpunit/src/Framework/TestSize/Large.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\TestSize; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/Framework/TestSize/Medium.php b/vendor/phpunit/phpunit/src/Framework/TestSize/Medium.php index b16edaa5..dd934bed 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestSize/Medium.php +++ b/vendor/phpunit/phpunit/src/Framework/TestSize/Medium.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\TestSize; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/Framework/TestSize/Small.php b/vendor/phpunit/phpunit/src/Framework/TestSize/Small.php index 1387e930..eb7250db 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestSize/Small.php +++ b/vendor/phpunit/phpunit/src/Framework/TestSize/Small.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\TestSize; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/Framework/TestSize/TestSize.php b/vendor/phpunit/phpunit/src/Framework/TestSize/TestSize.php index 7d876ea4..82b0bb23 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestSize/TestSize.php +++ b/vendor/phpunit/phpunit/src/Framework/TestSize/TestSize.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\TestSize; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/Framework/TestSize/Unknown.php b/vendor/phpunit/phpunit/src/Framework/TestSize/Unknown.php index d0884e92..5089f3f2 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestSize/Unknown.php +++ b/vendor/phpunit/phpunit/src/Framework/TestSize/Unknown.php @@ -10,6 +10,8 @@ namespace PHPUnit\Framework\TestSize; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/Framework/TestStatus/Deprecation.php b/vendor/phpunit/phpunit/src/Framework/TestStatus/Deprecation.php index 67ef6375..545f6aac 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestStatus/Deprecation.php +++ b/vendor/phpunit/phpunit/src/Framework/TestStatus/Deprecation.php @@ -12,6 +12,8 @@ /** * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Deprecation extends Known diff --git a/vendor/phpunit/phpunit/src/Framework/TestStatus/Error.php b/vendor/phpunit/phpunit/src/Framework/TestStatus/Error.php index c7124295..8dedfdfc 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestStatus/Error.php +++ b/vendor/phpunit/phpunit/src/Framework/TestStatus/Error.php @@ -12,6 +12,8 @@ /** * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Error extends Known diff --git a/vendor/phpunit/phpunit/src/Framework/TestStatus/Failure.php b/vendor/phpunit/phpunit/src/Framework/TestStatus/Failure.php index a6028a08..2568445b 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestStatus/Failure.php +++ b/vendor/phpunit/phpunit/src/Framework/TestStatus/Failure.php @@ -12,6 +12,8 @@ /** * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Failure extends Known diff --git a/vendor/phpunit/phpunit/src/Framework/TestStatus/Incomplete.php b/vendor/phpunit/phpunit/src/Framework/TestStatus/Incomplete.php index 6305a5cc..6b81dce9 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestStatus/Incomplete.php +++ b/vendor/phpunit/phpunit/src/Framework/TestStatus/Incomplete.php @@ -12,6 +12,8 @@ /** * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Incomplete extends Known diff --git a/vendor/phpunit/phpunit/src/Framework/TestStatus/Known.php b/vendor/phpunit/phpunit/src/Framework/TestStatus/Known.php index b44955ea..30838d38 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestStatus/Known.php +++ b/vendor/phpunit/phpunit/src/Framework/TestStatus/Known.php @@ -12,6 +12,8 @@ /** * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ abstract class Known extends TestStatus diff --git a/vendor/phpunit/phpunit/src/Framework/TestStatus/Notice.php b/vendor/phpunit/phpunit/src/Framework/TestStatus/Notice.php index 28ab650e..322db6f7 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestStatus/Notice.php +++ b/vendor/phpunit/phpunit/src/Framework/TestStatus/Notice.php @@ -12,6 +12,8 @@ /** * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Notice extends Known diff --git a/vendor/phpunit/phpunit/src/Framework/TestStatus/Risky.php b/vendor/phpunit/phpunit/src/Framework/TestStatus/Risky.php index b9708023..7e7db701 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestStatus/Risky.php +++ b/vendor/phpunit/phpunit/src/Framework/TestStatus/Risky.php @@ -12,6 +12,8 @@ /** * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Risky extends Known diff --git a/vendor/phpunit/phpunit/src/Framework/TestStatus/Skipped.php b/vendor/phpunit/phpunit/src/Framework/TestStatus/Skipped.php index 30dae7e4..345aae95 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestStatus/Skipped.php +++ b/vendor/phpunit/phpunit/src/Framework/TestStatus/Skipped.php @@ -12,6 +12,8 @@ /** * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Skipped extends Known diff --git a/vendor/phpunit/phpunit/src/Framework/TestStatus/Success.php b/vendor/phpunit/phpunit/src/Framework/TestStatus/Success.php index 18cc7c93..973fbdf5 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestStatus/Success.php +++ b/vendor/phpunit/phpunit/src/Framework/TestStatus/Success.php @@ -12,6 +12,8 @@ /** * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Success extends Known diff --git a/vendor/phpunit/phpunit/src/Framework/TestStatus/TestStatus.php b/vendor/phpunit/phpunit/src/Framework/TestStatus/TestStatus.php index fff96a54..44484083 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestStatus/TestStatus.php +++ b/vendor/phpunit/phpunit/src/Framework/TestStatus/TestStatus.php @@ -12,6 +12,8 @@ /** * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ abstract class TestStatus diff --git a/vendor/phpunit/phpunit/src/Framework/TestStatus/Unknown.php b/vendor/phpunit/phpunit/src/Framework/TestStatus/Unknown.php index 258c75b7..7a391638 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestStatus/Unknown.php +++ b/vendor/phpunit/phpunit/src/Framework/TestStatus/Unknown.php @@ -12,6 +12,8 @@ /** * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Unknown extends TestStatus diff --git a/vendor/phpunit/phpunit/src/Framework/TestStatus/Warning.php b/vendor/phpunit/phpunit/src/Framework/TestStatus/Warning.php index a07b5498..ebb05b0f 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestStatus/Warning.php +++ b/vendor/phpunit/phpunit/src/Framework/TestStatus/Warning.php @@ -12,6 +12,8 @@ /** * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Warning extends Known diff --git a/vendor/phpunit/phpunit/src/Framework/TestSuite.php b/vendor/phpunit/phpunit/src/Framework/TestSuite.php index ad40f428..8bbc9f70 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestSuite.php +++ b/vendor/phpunit/phpunit/src/Framework/TestSuite.php @@ -12,6 +12,8 @@ use const PHP_EOL; use function array_keys; use function array_map; +use function array_pop; +use function array_reverse; use function assert; use function call_user_func; use function class_exists; @@ -51,6 +53,8 @@ /** * @template-implements IteratorAggregate * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test @@ -80,6 +84,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test */ private ?array $providedTests = null; private ?Factory $iteratorFilter = null; + private bool $wasRun = false; /** * @psalm-param non-empty-string $name @@ -134,7 +139,7 @@ public static function fromClassReflector(ReflectionClass $class): static $testSuite->addTestMethod($class, $method); } - if (count($testSuite) === 0) { + if ($testSuite->isEmpty()) { Event\Facade::emitter()->testRunnerTriggeredWarning( sprintf( 'No tests found in class "%s".', @@ -287,7 +292,13 @@ public function count(): int public function isEmpty(): bool { - return empty($this->tests); + foreach ($this as $test) { + if (count($test) !== 0) { + return false; + } + } + + return true; } /** @@ -326,7 +337,15 @@ public function groupDetails(): array */ public function run(): void { - if (count($this) === 0) { + if ($this->wasRun) { + // @codeCoverageIgnoreStart + throw new Exception('The tests aggregated by this TestSuite were already run'); + // @codeCoverageIgnoreEnd + } + + $this->wasRun = true; + + if ($this->isEmpty()) { return; } @@ -339,7 +358,19 @@ public function run(): void return; } + /** @psalm-var list $tests */ + $tests = []; + foreach ($this as $test) { + $tests[] = $test; + } + + $tests = array_reverse($tests); + + $this->tests = []; + $this->groups = []; + + while (($test = array_pop($tests)) !== null) { if (TestResultFacade::shouldStop()) { $emitter->testRunnerExecutionAborted(); diff --git a/vendor/phpunit/phpunit/src/Framework/TestSuiteIterator.php b/vendor/phpunit/phpunit/src/Framework/TestSuiteIterator.php index 32ee7c6d..8af01218 100644 --- a/vendor/phpunit/phpunit/src/Framework/TestSuiteIterator.php +++ b/vendor/phpunit/phpunit/src/Framework/TestSuiteIterator.php @@ -16,6 +16,8 @@ /** * @template-implements RecursiveIterator * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteIterator implements RecursiveIterator diff --git a/vendor/phpunit/phpunit/src/Logging/EventLogger.php b/vendor/phpunit/phpunit/src/Logging/EventLogger.php index 993ca5df..08350213 100644 --- a/vendor/phpunit/phpunit/src/Logging/EventLogger.php +++ b/vendor/phpunit/phpunit/src/Logging/EventLogger.php @@ -12,6 +12,7 @@ use const FILE_APPEND; use const LOCK_EX; use const PHP_EOL; +use const PHP_OS_FAMILY; use function file_put_contents; use function implode; use function preg_split; @@ -21,6 +22,8 @@ use PHPUnit\Event\Tracer\Tracer; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class EventLogger implements Tracer @@ -42,7 +45,8 @@ public function trace(Event $event): void $flags = FILE_APPEND; - if (PHP_OS_FAMILY !== 'Windows' || $this->path !== 'php://stdout') { + if (!(PHP_OS_FAMILY === 'Windows' || PHP_OS_FAMILY === 'Darwin') || + $this->path !== 'php://stdout') { $flags |= LOCK_EX; } diff --git a/vendor/phpunit/phpunit/src/Logging/Exception.php b/vendor/phpunit/phpunit/src/Logging/Exception.php index f2e4f8bc..0e9ddad7 100644 --- a/vendor/phpunit/phpunit/src/Logging/Exception.php +++ b/vendor/phpunit/phpunit/src/Logging/Exception.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Exception extends RuntimeException implements \PHPUnit\Exception diff --git a/vendor/phpunit/phpunit/src/Logging/JUnit/JunitXmlLogger.php b/vendor/phpunit/phpunit/src/Logging/JUnit/JunitXmlLogger.php index ec173aff..f68bdc99 100644 --- a/vendor/phpunit/phpunit/src/Logging/JUnit/JunitXmlLogger.php +++ b/vendor/phpunit/phpunit/src/Logging/JUnit/JunitXmlLogger.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\Logging\JUnit; +use const PHP_EOL; use function assert; use function basename; use function is_int; @@ -37,6 +38,8 @@ use PHPUnit\Util\Xml; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class JunitXmlLogger @@ -202,7 +205,7 @@ public function testPrepared(): void */ public function testFinished(Finished $event): void { - if ($this->preparationFailed) { + if (!$this->prepared || $this->preparationFailed) { return; } diff --git a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/Subscriber.php b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/Subscriber.php index c3a7c624..7067461e 100644 --- a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/Subscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/Subscriber.php @@ -10,6 +10,8 @@ namespace PHPUnit\Logging\JUnit; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ abstract class Subscriber diff --git a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestErroredSubscriber.php b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestErroredSubscriber.php index b790d8ab..1c5ca7be 100644 --- a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestErroredSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestErroredSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\ErroredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestErroredSubscriber extends Subscriber implements ErroredSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestFailedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestFailedSubscriber.php index 0c99b913..286012ae 100644 --- a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestFailedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestFailedSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\FailedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestFailedSubscriber extends Subscriber implements FailedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestFinishedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestFinishedSubscriber.php index bb69ee21..3f3ecac1 100644 --- a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestFinishedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestFinishedSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\FinishedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestFinishedSubscriber extends Subscriber implements FinishedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestMarkedIncompleteSubscriber.php b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestMarkedIncompleteSubscriber.php index 84b16ef7..5354427e 100644 --- a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestMarkedIncompleteSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestMarkedIncompleteSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\MarkedIncompleteSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestMarkedIncompleteSubscriber extends Subscriber implements MarkedIncompleteSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestPreparationFailedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestPreparationFailedSubscriber.php index 11617225..d052f8dd 100644 --- a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestPreparationFailedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestPreparationFailedSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\PreparationFailedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestPreparationFailedSubscriber extends Subscriber implements PreparationFailedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestPreparationStartedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestPreparationStartedSubscriber.php index f2c4a908..91ce18f7 100644 --- a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestPreparationStartedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestPreparationStartedSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\PreparationStartedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestPreparationStartedSubscriber extends Subscriber implements PreparationStartedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestPreparedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestPreparedSubscriber.php index 90b3a0c2..d3de506b 100644 --- a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestPreparedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestPreparedSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\PreparedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestPreparedSubscriber extends Subscriber implements PreparedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestRunnerExecutionFinishedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestRunnerExecutionFinishedSubscriber.php index 148ff237..b544b04f 100644 --- a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestRunnerExecutionFinishedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestRunnerExecutionFinishedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\TestRunner\ExecutionFinishedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestRunnerExecutionFinishedSubscriber extends Subscriber implements ExecutionFinishedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestSkippedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestSkippedSubscriber.php index 6b275073..383b89db 100644 --- a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestSkippedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestSkippedSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\SkippedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSkippedSubscriber extends Subscriber implements SkippedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestSuiteFinishedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestSuiteFinishedSubscriber.php index 26e1981f..122f4aa7 100644 --- a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestSuiteFinishedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestSuiteFinishedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\TestSuite\FinishedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteFinishedSubscriber extends Subscriber implements FinishedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestSuiteStartedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestSuiteStartedSubscriber.php index dfec98b4..c213d774 100644 --- a/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestSuiteStartedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/JUnit/Subscriber/TestSuiteStartedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\TestSuite\StartedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteStartedSubscriber extends Subscriber implements StartedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/Subscriber.php b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/Subscriber.php index a2428962..ae72b8b4 100644 --- a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/Subscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/Subscriber.php @@ -10,6 +10,8 @@ namespace PHPUnit\Logging\TeamCity; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ abstract class Subscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestConsideredRiskySubscriber.php b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestConsideredRiskySubscriber.php index 431d1b28..ab266347 100644 --- a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestConsideredRiskySubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestConsideredRiskySubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\ConsideredRiskySubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestConsideredRiskySubscriber extends Subscriber implements ConsideredRiskySubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestErroredSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestErroredSubscriber.php index 318534a4..2c4141b4 100644 --- a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestErroredSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestErroredSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\ErroredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestErroredSubscriber extends Subscriber implements ErroredSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestFailedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestFailedSubscriber.php index 1ada154a..248cc1b5 100644 --- a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestFailedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestFailedSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\FailedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestFailedSubscriber extends Subscriber implements FailedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestFinishedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestFinishedSubscriber.php index 22ba518f..82eaab66 100644 --- a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestFinishedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestFinishedSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\FinishedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestFinishedSubscriber extends Subscriber implements FinishedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestMarkedIncompleteSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestMarkedIncompleteSubscriber.php index c3505f16..d0cb9214 100644 --- a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestMarkedIncompleteSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestMarkedIncompleteSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\MarkedIncompleteSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestMarkedIncompleteSubscriber extends Subscriber implements MarkedIncompleteSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestPreparedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestPreparedSubscriber.php index c1bb537e..34e92007 100644 --- a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestPreparedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestPreparedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PreparedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestPreparedSubscriber extends Subscriber implements PreparedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestRunnerExecutionFinishedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestRunnerExecutionFinishedSubscriber.php index ccec88d9..e87aa21d 100644 --- a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestRunnerExecutionFinishedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestRunnerExecutionFinishedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\TestRunner\ExecutionFinishedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestRunnerExecutionFinishedSubscriber extends Subscriber implements ExecutionFinishedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestSkippedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestSkippedSubscriber.php index e6ef6ae9..17951c36 100644 --- a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestSkippedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestSkippedSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\SkippedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSkippedSubscriber extends Subscriber implements SkippedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestSuiteFinishedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestSuiteFinishedSubscriber.php index d8e73e43..ff96fb22 100644 --- a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestSuiteFinishedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestSuiteFinishedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\TestSuite\FinishedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteFinishedSubscriber extends Subscriber implements FinishedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestSuiteStartedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestSuiteStartedSubscriber.php index 2eb76478..6bebe6a7 100644 --- a/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestSuiteStartedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TeamCity/Subscriber/TestSuiteStartedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\TestSuite\StartedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteStartedSubscriber extends Subscriber implements StartedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TeamCity/TeamCityLogger.php b/vendor/phpunit/phpunit/src/Logging/TeamCity/TeamCityLogger.php index a35b50de..a6e0927c 100644 --- a/vendor/phpunit/phpunit/src/Logging/TeamCity/TeamCityLogger.php +++ b/vendor/phpunit/phpunit/src/Logging/TeamCity/TeamCityLogger.php @@ -40,6 +40,8 @@ use PHPUnit\TextUI\Output\Printer; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TeamCityLogger diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/HtmlRenderer.php b/vendor/phpunit/phpunit/src/Logging/TestDox/HtmlRenderer.php index fd65a309..35bc243e 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/HtmlRenderer.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/HtmlRenderer.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class HtmlRenderer diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/NamePrettifier.php b/vendor/phpunit/phpunit/src/Logging/TestDox/NamePrettifier.php index de739a70..d8b948b2 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/NamePrettifier.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/NamePrettifier.php @@ -48,6 +48,8 @@ use SebastianBergmann\Exporter\Exporter; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NamePrettifier @@ -192,7 +194,7 @@ public function prettifyTestCase(TestCase $test, bool $colorize): string array_keys($providedData), ); - $result = trim(preg_replace($variables, $providedData, $annotation)); + $result = preg_replace($variables, $providedData, $annotation); $annotationWithPlaceholders = true; } @@ -278,7 +280,7 @@ private function mapTestMethodParameterNamesToProvidedDataValues(TestCase $test, } } - $providedData['$' . $parameter->getName()] = $value; + $providedData['$' . $parameter->getName()] = str_replace('$', '\\$', $value); } if ($colorize) { diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/PlainTextRenderer.php b/vendor/phpunit/phpunit/src/Logging/TestDox/PlainTextRenderer.php index 9ddd8776..8d11c1c2 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/PlainTextRenderer.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/PlainTextRenderer.php @@ -12,6 +12,8 @@ use function sprintf; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class PlainTextRenderer diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/Subscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/Subscriber.php index d2779f19..9d7e347c 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/Subscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/Subscriber.php @@ -10,6 +10,8 @@ namespace PHPUnit\Logging\TestDox; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ abstract class Subscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestConsideredRiskySubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestConsideredRiskySubscriber.php index 5bfcceda..9bace366 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestConsideredRiskySubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestConsideredRiskySubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\ConsideredRiskySubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestConsideredRiskySubscriber extends Subscriber implements ConsideredRiskySubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestErroredSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestErroredSubscriber.php index 3a24981d..bd5c56ef 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestErroredSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestErroredSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\ErroredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestErroredSubscriber extends Subscriber implements ErroredSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestFailedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestFailedSubscriber.php index a5647f95..8efe91c1 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestFailedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestFailedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\FailedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestFailedSubscriber extends Subscriber implements FailedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestFinishedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestFinishedSubscriber.php index c7dbdc15..2ec85f87 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestFinishedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestFinishedSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\FinishedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestFinishedSubscriber extends Subscriber implements FinishedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestMarkedIncompleteSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestMarkedIncompleteSubscriber.php index 1846712e..6c2e4077 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestMarkedIncompleteSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestMarkedIncompleteSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\MarkedIncompleteSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestMarkedIncompleteSubscriber extends Subscriber implements MarkedIncompleteSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestPassedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestPassedSubscriber.php index df39fca5..2821d8e3 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestPassedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestPassedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PassedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestPassedSubscriber extends Subscriber implements PassedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestPreparedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestPreparedSubscriber.php index c21e8c17..a2bf06a9 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestPreparedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestPreparedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PreparedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestPreparedSubscriber extends Subscriber implements PreparedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestSkippedSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestSkippedSubscriber.php index 5f291ab3..f6ea04b0 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestSkippedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestSkippedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\SkippedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSkippedSubscriber extends Subscriber implements SkippedSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredDeprecationSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredDeprecationSubscriber.php index 43cde139..15872b72 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredDeprecationSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredDeprecationSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\DeprecationTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredDeprecationSubscriber extends Subscriber implements DeprecationTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredNoticeSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredNoticeSubscriber.php index 0346b3bc..a6d5a0a8 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredNoticeSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredNoticeSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\NoticeTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredNoticeSubscriber extends Subscriber implements NoticeTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpDeprecationSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpDeprecationSubscriber.php index 6b99e1b6..bcdd3947 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpDeprecationSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpDeprecationSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpDeprecationTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpDeprecationSubscriber extends Subscriber implements PhpDeprecationTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpNoticeSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpNoticeSubscriber.php index 31c19f9d..2601c197 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpNoticeSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpNoticeSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpNoticeTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpNoticeSubscriber extends Subscriber implements PhpNoticeTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpWarningSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpWarningSubscriber.php index f479bd5f..3af20b89 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpWarningSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpWarningSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpWarningTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpWarningSubscriber extends Subscriber implements PhpWarningTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpunitDeprecationSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpunitDeprecationSubscriber.php index d6615b2c..9fc4f268 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpunitDeprecationSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpunitDeprecationSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpunitDeprecationTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpunitDeprecationSubscriber extends Subscriber implements PhpunitDeprecationTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpunitErrorSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpunitErrorSubscriber.php index 85020c54..43f32d95 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpunitErrorSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpunitErrorSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpunitErrorTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpunitErrorSubscriber extends Subscriber implements PhpunitErrorTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpunitWarningSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpunitWarningSubscriber.php index 28294e8f..3774b828 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpunitWarningSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredPhpunitWarningSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpunitWarningTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpunitWarningSubscriber extends Subscriber implements PhpunitWarningTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredWarningSubscriber.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredWarningSubscriber.php index 600ceb07..fc8979dc 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredWarningSubscriber.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/Subscriber/TestTriggeredWarningSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\WarningTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredWarningSubscriber extends Subscriber implements WarningTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResult.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResult.php index 59f325a1..74c6e9df 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResult.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResult.php @@ -16,6 +16,8 @@ /** * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestResult diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResultCollection.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResultCollection.php index 98c6f7d5..1ef1d83d 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResultCollection.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResultCollection.php @@ -16,6 +16,8 @@ * * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestResultCollection implements IteratorAggregate diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResultCollectionIterator.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResultCollectionIterator.php index 7f07cb5d..b409fe11 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResultCollectionIterator.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResultCollectionIterator.php @@ -15,6 +15,8 @@ /** * @template-implements Iterator * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestResultCollectionIterator implements Iterator diff --git a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResultCollector.php b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResultCollector.php index 337a9712..df1de66b 100644 --- a/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResultCollector.php +++ b/vendor/phpunit/phpunit/src/Logging/TestDox/TestResult/TestResultCollector.php @@ -41,13 +41,19 @@ use PHPUnit\Event\UnknownSubscriberTypeException; use PHPUnit\Framework\TestStatus\TestStatus; use PHPUnit\Logging\TestDox\TestResult as TestDoxTestMethod; +use PHPUnit\TextUI\Configuration\Source; +use PHPUnit\TextUI\Configuration\SourceFilter; use ReflectionMethod; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestResultCollector { + private readonly Source $source; + /** * @psalm-var array> */ @@ -60,8 +66,10 @@ final class TestResultCollector * @throws EventFacadeIsSealedException * @throws UnknownSubscriberTypeException */ - public function __construct(Facade $facade) + public function __construct(Facade $facade, Source $source) { + $this->source = $source; + $this->registerSubscribers($facade); } @@ -212,6 +220,22 @@ public function testTriggeredDeprecation(DeprecationTriggered $event): void return; } + if ($event->ignoredByTest()) { + return; + } + + if ($event->ignoredByBaseline()) { + return; + } + + if (!$this->source->ignoreSuppressionOfDeprecations() && $event->wasSuppressed()) { + return; + } + + if ($this->source->restrictDeprecations() && !(new SourceFilter)->includes($this->source, $event->file())) { + return; + } + $this->updateTestStatus(TestStatus::deprecation()); } @@ -221,6 +245,18 @@ public function testTriggeredNotice(NoticeTriggered $event): void return; } + if ($event->ignoredByBaseline()) { + return; + } + + if (!$this->source->ignoreSuppressionOfNotices() && $event->wasSuppressed()) { + return; + } + + if ($this->source->restrictNotices() && !(new SourceFilter)->includes($this->source, $event->file())) { + return; + } + $this->updateTestStatus(TestStatus::notice()); } @@ -230,6 +266,18 @@ public function testTriggeredWarning(WarningTriggered $event): void return; } + if ($event->ignoredByBaseline()) { + return; + } + + if (!$this->source->ignoreSuppressionOfWarnings() && $event->wasSuppressed()) { + return; + } + + if ($this->source->restrictWarnings() && !(new SourceFilter)->includes($this->source, $event->file())) { + return; + } + $this->updateTestStatus(TestStatus::warning()); } @@ -239,6 +287,22 @@ public function testTriggeredPhpDeprecation(PhpDeprecationTriggered $event): voi return; } + if ($event->ignoredByTest()) { + return; + } + + if ($event->ignoredByBaseline()) { + return; + } + + if (!$this->source->ignoreSuppressionOfPhpDeprecations() && $event->wasSuppressed()) { + return; + } + + if ($this->source->restrictDeprecations() && !(new SourceFilter)->includes($this->source, $event->file())) { + return; + } + $this->updateTestStatus(TestStatus::deprecation()); } @@ -248,6 +312,18 @@ public function testTriggeredPhpNotice(PhpNoticeTriggered $event): void return; } + if ($event->ignoredByBaseline()) { + return; + } + + if (!$this->source->ignoreSuppressionOfPhpNotices() && $event->wasSuppressed()) { + return; + } + + if ($this->source->restrictNotices() && !(new SourceFilter)->includes($this->source, $event->file())) { + return; + } + $this->updateTestStatus(TestStatus::notice()); } @@ -257,6 +333,18 @@ public function testTriggeredPhpWarning(PhpWarningTriggered $event): void return; } + if ($event->ignoredByBaseline()) { + return; + } + + if (!$this->source->ignoreSuppressionOfPhpWarnings() && $event->wasSuppressed()) { + return; + } + + if ($this->source->restrictWarnings() && !(new SourceFilter)->includes($this->source, $event->file())) { + return; + } + $this->updateTestStatus(TestStatus::warning()); } diff --git a/vendor/phpunit/phpunit/src/Metadata/Api/CodeCoverage.php b/vendor/phpunit/phpunit/src/Metadata/Api/CodeCoverage.php index 719057df..fe5fab56 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Api/CodeCoverage.php +++ b/vendor/phpunit/phpunit/src/Metadata/Api/CodeCoverage.php @@ -38,6 +38,8 @@ use SebastianBergmann\CodeUnit\Mapper; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class CodeCoverage diff --git a/vendor/phpunit/phpunit/src/Metadata/Api/DataProvider.php b/vendor/phpunit/phpunit/src/Metadata/Api/DataProvider.php index 93e85770..6f5921cd 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Api/DataProvider.php +++ b/vendor/phpunit/phpunit/src/Metadata/Api/DataProvider.php @@ -9,12 +9,15 @@ */ namespace PHPUnit\Metadata\Api; +use const JSON_ERROR_NONE; +use const PREG_OFFSET_CAPTURE; use function array_key_exists; -use function array_merge; use function assert; use function explode; +use function get_debug_type; use function is_array; use function is_int; +use function is_string; use function json_decode; use function json_last_error; use function json_last_error_msg; @@ -39,9 +42,10 @@ use ReflectionClass; use ReflectionMethod; use Throwable; -use Traversable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class DataProvider @@ -176,14 +180,11 @@ private function dataProvidedByMethods(string $className, string $methodName, Me ); } - if ($data instanceof Traversable) { - $origData = $data; - $data = []; - - foreach ($origData as $key => $value) { - if (is_int($key)) { - $data[] = $value; - } elseif (array_key_exists($key, $data)) { + foreach ($data as $key => $value) { + if (is_int($key)) { + $result[] = $value; + } elseif (is_string($key)) { + if (array_key_exists($key, $result)) { Event\Facade::emitter()->dataProviderMethodFinished( $testMethod, ...$methodsCalled, @@ -195,14 +196,17 @@ private function dataProvidedByMethods(string $className, string $methodName, Me $key, ), ); - } else { - $data[$key] = $value; } - } - } - if (is_array($data)) { - $result = array_merge($result, $data); + $result[$key] = $value; + } else { + throw new InvalidDataProviderException( + sprintf( + 'The key must be an integer or a string, %s given', + get_debug_type($key), + ), + ); + } } } @@ -256,7 +260,7 @@ private function dataProvidedByTestWithAnnotation(string $className, string $met foreach (explode("\n", $annotationContent) as $candidateRow) { $candidateRow = trim($candidateRow); - if ($candidateRow[0] !== '[') { + if ($candidateRow === '' || $candidateRow[0] !== '[') { break; } diff --git a/vendor/phpunit/phpunit/src/Metadata/Api/Dependencies.php b/vendor/phpunit/phpunit/src/Metadata/Api/Dependencies.php index cda6e099..1b20df98 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Api/Dependencies.php +++ b/vendor/phpunit/phpunit/src/Metadata/Api/Dependencies.php @@ -16,6 +16,8 @@ use PHPUnit\Metadata\Parser\Registry; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Dependencies diff --git a/vendor/phpunit/phpunit/src/Metadata/Api/Groups.php b/vendor/phpunit/phpunit/src/Metadata/Api/Groups.php index 5c78cbdc..dca8ef64 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Api/Groups.php +++ b/vendor/phpunit/phpunit/src/Metadata/Api/Groups.php @@ -26,6 +26,8 @@ use PHPUnit\Metadata\UsesFunction; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Groups diff --git a/vendor/phpunit/phpunit/src/Metadata/Api/HookMethods.php b/vendor/phpunit/phpunit/src/Metadata/Api/HookMethods.php index 1b085597..89b8c2c7 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Api/HookMethods.php +++ b/vendor/phpunit/phpunit/src/Metadata/Api/HookMethods.php @@ -17,6 +17,8 @@ use ReflectionClass; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class HookMethods diff --git a/vendor/phpunit/phpunit/src/Metadata/Api/Requirements.php b/vendor/phpunit/phpunit/src/Metadata/Api/Requirements.php index 70688a11..922421f4 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Api/Requirements.php +++ b/vendor/phpunit/phpunit/src/Metadata/Api/Requirements.php @@ -33,6 +33,8 @@ use PHPUnit\Runner\Version; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Requirements diff --git a/vendor/phpunit/phpunit/src/Metadata/Exception/AnnotationsAreNotSupportedForInternalClassesException.php b/vendor/phpunit/phpunit/src/Metadata/Exception/AnnotationsAreNotSupportedForInternalClassesException.php index 8ef0ba7a..ddff62e0 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Exception/AnnotationsAreNotSupportedForInternalClassesException.php +++ b/vendor/phpunit/phpunit/src/Metadata/Exception/AnnotationsAreNotSupportedForInternalClassesException.php @@ -14,6 +14,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class AnnotationsAreNotSupportedForInternalClassesException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Metadata/Exception/ReflectionException.php b/vendor/phpunit/phpunit/src/Metadata/Exception/ReflectionException.php index 67f26dbb..04e0d229 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Exception/ReflectionException.php +++ b/vendor/phpunit/phpunit/src/Metadata/Exception/ReflectionException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ReflectionException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Metadata/Parser/Annotation/DocBlock.php b/vendor/phpunit/phpunit/src/Metadata/Parser/Annotation/DocBlock.php index b2bcc435..c2afdb26 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Parser/Annotation/DocBlock.php +++ b/vendor/phpunit/phpunit/src/Metadata/Parser/Annotation/DocBlock.php @@ -34,6 +34,8 @@ * allowing us to ask meaningful questions about a specific * reflection symbol. * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class DocBlock @@ -120,6 +122,8 @@ private function __construct(string $docComment, array $symbolAnnotations, int $ * string, * string|array{version: string, operator: string}|array{constraint: string}|array * > + * + * @throws InvalidVersionRequirementException */ public function requirements(): array { diff --git a/vendor/phpunit/phpunit/src/Metadata/Parser/Annotation/Registry.php b/vendor/phpunit/phpunit/src/Metadata/Parser/Annotation/Registry.php index e41e7428..51397a70 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Parser/Annotation/Registry.php +++ b/vendor/phpunit/phpunit/src/Metadata/Parser/Annotation/Registry.php @@ -19,6 +19,8 @@ * Reflection information, and therefore DocBlock information, is static within * a single PHP process. It is therefore okay to use a Singleton registry here. * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Registry diff --git a/vendor/phpunit/phpunit/src/Metadata/Parser/AnnotationParser.php b/vendor/phpunit/phpunit/src/Metadata/Parser/AnnotationParser.php index 4d560ea8..1d485c72 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Parser/AnnotationParser.php +++ b/vendor/phpunit/phpunit/src/Metadata/Parser/AnnotationParser.php @@ -11,18 +11,22 @@ use function array_merge; use function assert; +use function class_exists; use function count; use function explode; use function method_exists; use function preg_replace; use function rtrim; +use function sprintf; use function str_contains; use function str_starts_with; use function strlen; use function substr; use function trim; +use PHPUnit\Event\Facade as EventFacade; use PHPUnit\Metadata\Annotation\Parser\Registry as AnnotationRegistry; use PHPUnit\Metadata\AnnotationsAreNotSupportedForInternalClassesException; +use PHPUnit\Metadata\InvalidVersionRequirementException; use PHPUnit\Metadata\Metadata; use PHPUnit\Metadata\MetadataCollection; use PHPUnit\Metadata\ReflectionException; @@ -32,6 +36,8 @@ use PHPUnit\Util\VersionComparisonOperator; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class AnnotationParser implements Parser @@ -45,6 +51,8 @@ final class AnnotationParser implements Parser */ public function forClass(string $className): MetadataCollection { + assert(class_exists($className)); + $result = []; foreach (AnnotationRegistry::getInstance()->forClassName($className)->symbolAnnotations() as $annotation => $values) { @@ -147,13 +155,23 @@ public function forClass(string $className): MetadataCollection } } - $result = array_merge( - $result, - $this->parseRequirements( - AnnotationRegistry::getInstance()->forClassName($className)->requirements(), - 'class', - ), - ); + try { + $result = array_merge( + $result, + $this->parseRequirements( + AnnotationRegistry::getInstance()->forClassName($className)->requirements(), + 'class', + ), + ); + } catch (InvalidVersionRequirementException $e) { + EventFacade::emitter()->testRunnerTriggeredWarning( + sprintf( + 'Class %s is annotated using an invalid version requirement: %s', + $className, + $e->getMessage(), + ), + ); + } return MetadataCollection::fromArray($result); } @@ -168,6 +186,9 @@ public function forClass(string $className): MetadataCollection */ public function forMethod(string $className, string $methodName): MetadataCollection { + assert(class_exists($className)); + assert(method_exists($className, $methodName)); + $result = []; foreach (AnnotationRegistry::getInstance()->forMethod($className, $methodName)->symbolAnnotations() as $annotation => $values) { @@ -364,13 +385,24 @@ public function forMethod(string $className, string $methodName): MetadataCollec } if (method_exists($className, $methodName)) { - $result = array_merge( - $result, - $this->parseRequirements( - AnnotationRegistry::getInstance()->forMethod($className, $methodName)->requirements(), - 'method', - ), - ); + try { + $result = array_merge( + $result, + $this->parseRequirements( + AnnotationRegistry::getInstance()->forMethod($className, $methodName)->requirements(), + 'method', + ), + ); + } catch (InvalidVersionRequirementException $e) { + EventFacade::emitter()->testRunnerTriggeredWarning( + sprintf( + 'Method %s::%s is annotated using an invalid version requirement: %s', + $className, + $methodName, + $e->getMessage(), + ), + ); + } } return MetadataCollection::fromArray($result); diff --git a/vendor/phpunit/phpunit/src/Metadata/Parser/AttributeParser.php b/vendor/phpunit/phpunit/src/Metadata/Parser/AttributeParser.php index 93e5f1af..9a19f89a 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Parser/AttributeParser.php +++ b/vendor/phpunit/phpunit/src/Metadata/Parser/AttributeParser.php @@ -11,7 +11,9 @@ use const JSON_THROW_ON_ERROR; use function assert; +use function class_exists; use function json_decode; +use function method_exists; use function str_starts_with; use PHPUnit\Framework\Attributes\After; use PHPUnit\Framework\Attributes\AfterClass; @@ -73,6 +75,8 @@ use ReflectionMethod; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class AttributeParser implements Parser @@ -82,6 +86,8 @@ final class AttributeParser implements Parser */ public function forClass(string $className): MetadataCollection { + assert(class_exists($className)); + $result = []; foreach ((new ReflectionClass($className))->getAttributes() as $attribute) { @@ -89,6 +95,10 @@ public function forClass(string $className): MetadataCollection continue; } + if (!class_exists($attribute->getName())) { + continue; + } + $attributeInstance = $attribute->newInstance(); switch ($attribute->getName()) { @@ -333,6 +343,9 @@ public function forClass(string $className): MetadataCollection */ public function forMethod(string $className, string $methodName): MetadataCollection { + assert(class_exists($className)); + assert(method_exists($className, $methodName)); + $result = []; foreach ((new ReflectionMethod($className, $methodName))->getAttributes() as $attribute) { @@ -340,6 +353,10 @@ public function forMethod(string $className, string $methodName): MetadataCollec continue; } + if (!class_exists($attribute->getName())) { + continue; + } + $attributeInstance = $attribute->newInstance(); switch ($attribute->getName()) { diff --git a/vendor/phpunit/phpunit/src/Metadata/Parser/CachingParser.php b/vendor/phpunit/phpunit/src/Metadata/Parser/CachingParser.php index ac5363b4..a383006f 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Parser/CachingParser.php +++ b/vendor/phpunit/phpunit/src/Metadata/Parser/CachingParser.php @@ -9,9 +9,14 @@ */ namespace PHPUnit\Metadata\Parser; +use function assert; +use function class_exists; +use function method_exists; use PHPUnit\Metadata\MetadataCollection; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class CachingParser implements Parser @@ -31,6 +36,8 @@ public function __construct(Parser $reader) */ public function forClass(string $className): MetadataCollection { + assert(class_exists($className)); + if (isset($this->classCache[$className])) { return $this->classCache[$className]; } @@ -46,6 +53,9 @@ public function forClass(string $className): MetadataCollection */ public function forMethod(string $className, string $methodName): MetadataCollection { + assert(class_exists($className)); + assert(method_exists($className, $methodName)); + $key = $className . '::' . $methodName; if (isset($this->methodCache[$key])) { diff --git a/vendor/phpunit/phpunit/src/Metadata/Parser/Parser.php b/vendor/phpunit/phpunit/src/Metadata/Parser/Parser.php index ea61d18f..2af9191d 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Parser/Parser.php +++ b/vendor/phpunit/phpunit/src/Metadata/Parser/Parser.php @@ -12,6 +12,8 @@ use PHPUnit\Metadata\MetadataCollection; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface Parser diff --git a/vendor/phpunit/phpunit/src/Metadata/Parser/ParserChain.php b/vendor/phpunit/phpunit/src/Metadata/Parser/ParserChain.php index f00c52ed..89d69dce 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Parser/ParserChain.php +++ b/vendor/phpunit/phpunit/src/Metadata/Parser/ParserChain.php @@ -9,9 +9,14 @@ */ namespace PHPUnit\Metadata\Parser; +use function assert; +use function class_exists; +use function method_exists; use PHPUnit\Metadata\MetadataCollection; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ParserChain implements Parser @@ -30,6 +35,8 @@ public function __construct(Parser $attributeReader, Parser $annotationReader) */ public function forClass(string $className): MetadataCollection { + assert(class_exists($className)); + $metadata = $this->attributeReader->forClass($className); if (!$metadata->isEmpty()) { @@ -45,6 +52,9 @@ public function forClass(string $className): MetadataCollection */ public function forMethod(string $className, string $methodName): MetadataCollection { + assert(class_exists($className)); + assert(method_exists($className, $methodName)); + $metadata = $this->attributeReader->forMethod($className, $methodName); if (!$metadata->isEmpty()) { diff --git a/vendor/phpunit/phpunit/src/Metadata/Parser/Registry.php b/vendor/phpunit/phpunit/src/Metadata/Parser/Registry.php index f597bc88..a68ab014 100644 --- a/vendor/phpunit/phpunit/src/Metadata/Parser/Registry.php +++ b/vendor/phpunit/phpunit/src/Metadata/Parser/Registry.php @@ -13,6 +13,8 @@ * Attribute and annotation information is static within a single PHP process. * It is therefore okay to use a Singleton registry here. * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Registry diff --git a/vendor/phpunit/phpunit/src/Runner/Baseline/Baseline.php b/vendor/phpunit/phpunit/src/Runner/Baseline/Baseline.php index 4921f318..3e386171 100644 --- a/vendor/phpunit/phpunit/src/Runner/Baseline/Baseline.php +++ b/vendor/phpunit/phpunit/src/Runner/Baseline/Baseline.php @@ -10,6 +10,8 @@ namespace PHPUnit\Runner\Baseline; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Baseline diff --git a/vendor/phpunit/phpunit/src/Runner/Baseline/Exception/CannotLoadBaselineException.php b/vendor/phpunit/phpunit/src/Runner/Baseline/Exception/CannotLoadBaselineException.php index c05e803e..c5590136 100644 --- a/vendor/phpunit/phpunit/src/Runner/Baseline/Exception/CannotLoadBaselineException.php +++ b/vendor/phpunit/phpunit/src/Runner/Baseline/Exception/CannotLoadBaselineException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class CannotLoadBaselineException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Runner/Baseline/Exception/FileDoesNotHaveLineException.php b/vendor/phpunit/phpunit/src/Runner/Baseline/Exception/FileDoesNotHaveLineException.php index 1121fa39..20c6ca03 100644 --- a/vendor/phpunit/phpunit/src/Runner/Baseline/Exception/FileDoesNotHaveLineException.php +++ b/vendor/phpunit/phpunit/src/Runner/Baseline/Exception/FileDoesNotHaveLineException.php @@ -14,6 +14,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class FileDoesNotHaveLineException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Runner/Baseline/Generator.php b/vendor/phpunit/phpunit/src/Runner/Baseline/Generator.php index 6a94baeb..97c89f0a 100644 --- a/vendor/phpunit/phpunit/src/Runner/Baseline/Generator.php +++ b/vendor/phpunit/phpunit/src/Runner/Baseline/Generator.php @@ -23,6 +23,8 @@ use PHPUnit\TextUI\Configuration\SourceFilter; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Generator @@ -60,11 +62,11 @@ public function baseline(): Baseline */ public function testTriggeredIssue(DeprecationTriggered|NoticeTriggered|PhpDeprecationTriggered|PhpNoticeTriggered|PhpWarningTriggered|WarningTriggered $event): void { - if (!$this->source->ignoreSuppressionOfPhpWarnings() && $event->wasSuppressed()) { + if ($event->wasSuppressed() && !$this->isSuppressionIgnored($event)) { return; } - if ($this->source->restrictWarnings() && !(new SourceFilter)->includes($this->source, $event->file())) { + if ($this->restrict($event) && !(new SourceFilter)->includes($this->source, $event->file())) { return; } @@ -77,4 +79,42 @@ public function testTriggeredIssue(DeprecationTriggered|NoticeTriggered|PhpDepre ), ); } + + private function restrict(DeprecationTriggered|NoticeTriggered|PhpDeprecationTriggered|PhpNoticeTriggered|PhpWarningTriggered|WarningTriggered $event): bool + { + if ($event instanceof WarningTriggered || $event instanceof PhpWarningTriggered) { + return $this->source->restrictWarnings(); + } + + if ($event instanceof NoticeTriggered || $event instanceof PhpNoticeTriggered) { + return $this->source->restrictNotices(); + } + + return $this->source->restrictDeprecations(); + } + + private function isSuppressionIgnored(DeprecationTriggered|NoticeTriggered|PhpDeprecationTriggered|PhpNoticeTriggered|PhpWarningTriggered|WarningTriggered $event): bool + { + if ($event instanceof WarningTriggered) { + return $this->source->ignoreSuppressionOfWarnings(); + } + + if ($event instanceof PhpWarningTriggered) { + return $this->source->ignoreSuppressionOfPhpWarnings(); + } + + if ($event instanceof PhpNoticeTriggered) { + return $this->source->ignoreSuppressionOfPhpNotices(); + } + + if ($event instanceof NoticeTriggered) { + return $this->source->ignoreSuppressionOfNotices(); + } + + if ($event instanceof PhpDeprecationTriggered) { + return $this->source->ignoreSuppressionOfPhpDeprecations(); + } + + return $this->source->ignoreSuppressionOfDeprecations(); + } } diff --git a/vendor/phpunit/phpunit/src/Runner/Baseline/Issue.php b/vendor/phpunit/phpunit/src/Runner/Baseline/Issue.php index dfd7d14d..074a8f4e 100644 --- a/vendor/phpunit/phpunit/src/Runner/Baseline/Issue.php +++ b/vendor/phpunit/phpunit/src/Runner/Baseline/Issue.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\Runner\Baseline; +use const FILE_IGNORE_NEW_LINES; use function assert; use function file; use function is_file; @@ -16,6 +17,8 @@ use PHPUnit\Runner\FileDoesNotExistException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Issue @@ -137,7 +140,7 @@ private static function calculateHash(string $file, int $line): string $hash = sha1($lines[$key]); - assert(!empty($hash)); + assert($hash !== ''); return $hash; } diff --git a/vendor/phpunit/phpunit/src/Runner/Baseline/Reader.php b/vendor/phpunit/phpunit/src/Runner/Baseline/Reader.php index ebd529e2..27e9ddb5 100644 --- a/vendor/phpunit/phpunit/src/Runner/Baseline/Reader.php +++ b/vendor/phpunit/phpunit/src/Runner/Baseline/Reader.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\Runner\Baseline; +use const DIRECTORY_SEPARATOR; use function assert; use function dirname; use function file_exists; @@ -22,6 +23,8 @@ use PHPUnit\Util\Xml\XmlException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Reader diff --git a/vendor/phpunit/phpunit/src/Runner/Baseline/RelativePathCalculator.php b/vendor/phpunit/phpunit/src/Runner/Baseline/RelativePathCalculator.php index 06ed7057..5172d617 100644 --- a/vendor/phpunit/phpunit/src/Runner/Baseline/RelativePathCalculator.php +++ b/vendor/phpunit/phpunit/src/Runner/Baseline/RelativePathCalculator.php @@ -22,6 +22,8 @@ use function trim; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @see Copied from https://github.com/phpstan/phpstan-src/blob/1.10.33/src/File/ParentDirectoryRelativePathHelper.php diff --git a/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/Subscriber.php b/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/Subscriber.php index b3ba386c..5007bfc8 100644 --- a/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/Subscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/Subscriber.php @@ -10,6 +10,8 @@ namespace PHPUnit\Runner\Baseline; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ abstract class Subscriber diff --git a/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredDeprecationSubscriber.php b/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredDeprecationSubscriber.php index f26ed2ec..62c8ed16 100644 --- a/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredDeprecationSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredDeprecationSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Runner\FileDoesNotExistException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredDeprecationSubscriber extends Subscriber implements DeprecationTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredNoticeSubscriber.php b/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredNoticeSubscriber.php index a531fbca..9eec35ff 100644 --- a/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredNoticeSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredNoticeSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Runner\FileDoesNotExistException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredNoticeSubscriber extends Subscriber implements NoticeTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredPhpDeprecationSubscriber.php b/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredPhpDeprecationSubscriber.php index a7a5d9f1..43ae6445 100644 --- a/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredPhpDeprecationSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredPhpDeprecationSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Runner\FileDoesNotExistException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpDeprecationSubscriber extends Subscriber implements PhpDeprecationTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredPhpNoticeSubscriber.php b/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredPhpNoticeSubscriber.php index 26085fb6..d3e9625d 100644 --- a/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredPhpNoticeSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredPhpNoticeSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Runner\FileDoesNotExistException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpNoticeSubscriber extends Subscriber implements PhpNoticeTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredPhpWarningSubscriber.php b/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredPhpWarningSubscriber.php index a0e617b4..00bd4b5e 100644 --- a/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredPhpWarningSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredPhpWarningSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Runner\FileDoesNotExistException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpWarningSubscriber extends Subscriber implements PhpWarningTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredWarningSubscriber.php b/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredWarningSubscriber.php index 793b7149..ed21fe86 100644 --- a/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredWarningSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/Baseline/Subscriber/TestTriggeredWarningSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Runner\FileDoesNotExistException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredWarningSubscriber extends Subscriber implements WarningTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/Baseline/Writer.php b/vendor/phpunit/phpunit/src/Runner/Baseline/Writer.php index 28540930..87032697 100644 --- a/vendor/phpunit/phpunit/src/Runner/Baseline/Writer.php +++ b/vendor/phpunit/phpunit/src/Runner/Baseline/Writer.php @@ -15,6 +15,8 @@ use XMLWriter; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Writer diff --git a/vendor/phpunit/phpunit/src/Runner/CodeCoverage.php b/vendor/phpunit/phpunit/src/Runner/CodeCoverage.php index 371ff66f..883e4f32 100644 --- a/vendor/phpunit/phpunit/src/Runner/CodeCoverage.php +++ b/vendor/phpunit/phpunit/src/Runner/CodeCoverage.php @@ -38,7 +38,11 @@ use SebastianBergmann\Timer\Timer; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit + * + * @codeCoverageIgnore */ final class CodeCoverage { @@ -312,7 +316,9 @@ public function generateReports(Printer $printer, Configuration $configuration): $textReport = $processor->process($this->codeCoverage(), $configuration->colors()); if ($configuration->coverageText() === 'php://stdout') { - $printer->print($textReport); + if (!$configuration->noOutput() && !$configuration->debug()) { + $printer->print($textReport); + } } else { file_put_contents($configuration->coverageText(), $textReport); } diff --git a/vendor/phpunit/phpunit/src/Runner/ErrorHandler.php b/vendor/phpunit/phpunit/src/Runner/ErrorHandler.php index e1c5b8a7..f3357f3d 100644 --- a/vendor/phpunit/phpunit/src/Runner/ErrorHandler.php +++ b/vendor/phpunit/phpunit/src/Runner/ErrorHandler.php @@ -24,6 +24,7 @@ use const E_USER_NOTICE; use const E_USER_WARNING; use const E_WARNING; +use function defined; use function error_reporting; use function restore_error_handler; use function set_error_handler; @@ -34,6 +35,8 @@ use PHPUnit\Util\ExcludeList; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ErrorHandler @@ -61,6 +64,15 @@ public function __invoke(int $errorNumber, string $errorString, string $errorFil return false; } + /** + * E_STRICT is deprecated since PHP 8.4. + * + * @see https://github.com/sebastianbergmann/phpunit/issues/5956 + */ + if (defined('E_STRICT') && $errorNumber === @E_STRICT) { + $errorNumber = E_NOTICE; + } + $test = Event\Code\TestMethodBuilder::fromCallStack(); $ignoredByBaseline = $this->ignoredByBaseline($errorFile, $errorLine, $errorString); @@ -68,7 +80,6 @@ public function __invoke(int $errorNumber, string $errorString, string $errorFil switch ($errorNumber) { case E_NOTICE: - case E_STRICT: Event\Facade::emitter()->testTriggeredPhpNotice( $test, $errorString, diff --git a/vendor/phpunit/phpunit/src/Runner/Exception/ClassCannotBeFoundException.php b/vendor/phpunit/phpunit/src/Runner/Exception/ClassCannotBeFoundException.php index e64a3593..701cbb5b 100644 --- a/vendor/phpunit/phpunit/src/Runner/Exception/ClassCannotBeFoundException.php +++ b/vendor/phpunit/phpunit/src/Runner/Exception/ClassCannotBeFoundException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ClassCannotBeFoundException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Runner/Exception/ClassDoesNotExtendTestCaseException.php b/vendor/phpunit/phpunit/src/Runner/Exception/ClassDoesNotExtendTestCaseException.php index 36ef74d6..c9d5474e 100644 --- a/vendor/phpunit/phpunit/src/Runner/Exception/ClassDoesNotExtendTestCaseException.php +++ b/vendor/phpunit/phpunit/src/Runner/Exception/ClassDoesNotExtendTestCaseException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ClassDoesNotExtendTestCaseException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Runner/Exception/ClassIsAbstractException.php b/vendor/phpunit/phpunit/src/Runner/Exception/ClassIsAbstractException.php index 4264bddd..bf947589 100644 --- a/vendor/phpunit/phpunit/src/Runner/Exception/ClassIsAbstractException.php +++ b/vendor/phpunit/phpunit/src/Runner/Exception/ClassIsAbstractException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ClassIsAbstractException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Runner/Exception/DirectoryCannotBeCreatedException.php b/vendor/phpunit/phpunit/src/Runner/Exception/DirectoryCannotBeCreatedException.php deleted file mode 100644 index 77820625..00000000 --- a/vendor/phpunit/phpunit/src/Runner/Exception/DirectoryCannotBeCreatedException.php +++ /dev/null @@ -1,29 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Runner; - -use function sprintf; -use RuntimeException; - -/** - * @internal This class is not covered by the backward compatibility promise for PHPUnit - */ -final class DirectoryCannotBeCreatedException extends RuntimeException implements Exception -{ - public function __construct(string $directory) - { - parent::__construct( - sprintf( - 'Cannot create directory "%s"', - $directory, - ), - ); - } -} diff --git a/vendor/phpunit/phpunit/src/Runner/Exception/ErrorException.php b/vendor/phpunit/phpunit/src/Runner/Exception/ErrorException.php index c4a8cf4a..954684e9 100644 --- a/vendor/phpunit/phpunit/src/Runner/Exception/ErrorException.php +++ b/vendor/phpunit/phpunit/src/Runner/Exception/ErrorException.php @@ -12,6 +12,8 @@ use Error; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ErrorException extends Error implements Exception diff --git a/vendor/phpunit/phpunit/src/Runner/Exception/Exception.php b/vendor/phpunit/phpunit/src/Runner/Exception/Exception.php index 205f76ee..ea0cf424 100644 --- a/vendor/phpunit/phpunit/src/Runner/Exception/Exception.php +++ b/vendor/phpunit/phpunit/src/Runner/Exception/Exception.php @@ -10,6 +10,8 @@ namespace PHPUnit\Runner; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface Exception extends \PHPUnit\Exception diff --git a/vendor/phpunit/phpunit/src/Runner/Exception/FileDoesNotExistException.php b/vendor/phpunit/phpunit/src/Runner/Exception/FileDoesNotExistException.php index f0211ddf..5b84c785 100644 --- a/vendor/phpunit/phpunit/src/Runner/Exception/FileDoesNotExistException.php +++ b/vendor/phpunit/phpunit/src/Runner/Exception/FileDoesNotExistException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class FileDoesNotExistException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Runner/Exception/InvalidOrderException.php b/vendor/phpunit/phpunit/src/Runner/Exception/InvalidOrderException.php index d02d179e..016ec85e 100644 --- a/vendor/phpunit/phpunit/src/Runner/Exception/InvalidOrderException.php +++ b/vendor/phpunit/phpunit/src/Runner/Exception/InvalidOrderException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class InvalidOrderException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Runner/Exception/InvalidPhptFileException.php b/vendor/phpunit/phpunit/src/Runner/Exception/InvalidPhptFileException.php index de8c4ecb..d1f593b8 100644 --- a/vendor/phpunit/phpunit/src/Runner/Exception/InvalidPhptFileException.php +++ b/vendor/phpunit/phpunit/src/Runner/Exception/InvalidPhptFileException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class InvalidPhptFileException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Runner/Exception/NoIgnoredEventException.php b/vendor/phpunit/phpunit/src/Runner/Exception/NoIgnoredEventException.php index 487308f7..69591e0d 100644 --- a/vendor/phpunit/phpunit/src/Runner/Exception/NoIgnoredEventException.php +++ b/vendor/phpunit/phpunit/src/Runner/Exception/NoIgnoredEventException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NoIgnoredEventException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Runner/Exception/ParameterDoesNotExistException.php b/vendor/phpunit/phpunit/src/Runner/Exception/ParameterDoesNotExistException.php index 521fbb53..5d7a0967 100644 --- a/vendor/phpunit/phpunit/src/Runner/Exception/ParameterDoesNotExistException.php +++ b/vendor/phpunit/phpunit/src/Runner/Exception/ParameterDoesNotExistException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ParameterDoesNotExistException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Runner/Exception/PhptExternalFileCannotBeLoadedException.php b/vendor/phpunit/phpunit/src/Runner/Exception/PhptExternalFileCannotBeLoadedException.php index 5cdb1d9f..33977155 100644 --- a/vendor/phpunit/phpunit/src/Runner/Exception/PhptExternalFileCannotBeLoadedException.php +++ b/vendor/phpunit/phpunit/src/Runner/Exception/PhptExternalFileCannotBeLoadedException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class PhptExternalFileCannotBeLoadedException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Runner/Exception/ReflectionException.php b/vendor/phpunit/phpunit/src/Runner/Exception/ReflectionException.php index 39723048..16d1264c 100644 --- a/vendor/phpunit/phpunit/src/Runner/Exception/ReflectionException.php +++ b/vendor/phpunit/phpunit/src/Runner/Exception/ReflectionException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ReflectionException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Runner/Exception/UnsupportedPhptSectionException.php b/vendor/phpunit/phpunit/src/Runner/Exception/UnsupportedPhptSectionException.php index a81d07b0..ca8647e6 100644 --- a/vendor/phpunit/phpunit/src/Runner/Exception/UnsupportedPhptSectionException.php +++ b/vendor/phpunit/phpunit/src/Runner/Exception/UnsupportedPhptSectionException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class UnsupportedPhptSectionException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Runner/Extension/ExtensionBootstrapper.php b/vendor/phpunit/phpunit/src/Runner/Extension/ExtensionBootstrapper.php index 5ee7306a..4a7b5fa7 100644 --- a/vendor/phpunit/phpunit/src/Runner/Extension/ExtensionBootstrapper.php +++ b/vendor/phpunit/phpunit/src/Runner/Extension/ExtensionBootstrapper.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\Runner\Extension; +use const PHP_EOL; use function assert; use function class_exists; use function class_implements; @@ -20,6 +21,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ExtensionBootstrapper diff --git a/vendor/phpunit/phpunit/src/Runner/Extension/PharLoader.php b/vendor/phpunit/phpunit/src/Runner/Extension/PharLoader.php index 6e0943c6..bf79712e 100644 --- a/vendor/phpunit/phpunit/src/Runner/Extension/PharLoader.php +++ b/vendor/phpunit/phpunit/src/Runner/Extension/PharLoader.php @@ -26,6 +26,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class PharLoader diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/ExcludeGroupFilterIterator.php b/vendor/phpunit/phpunit/src/Runner/Filter/ExcludeGroupFilterIterator.php index b4f3a45c..63a26b44 100644 --- a/vendor/phpunit/phpunit/src/Runner/Filter/ExcludeGroupFilterIterator.php +++ b/vendor/phpunit/phpunit/src/Runner/Filter/ExcludeGroupFilterIterator.php @@ -12,6 +12,8 @@ use function in_array; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ExcludeGroupFilterIterator extends GroupFilterIterator diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php b/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php index 89eec09c..4afa5d99 100644 --- a/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php +++ b/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php @@ -16,6 +16,8 @@ use ReflectionClass; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Factory diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/GroupFilterIterator.php b/vendor/phpunit/phpunit/src/Runner/Filter/GroupFilterIterator.php index 2c9a2960..f2114de9 100644 --- a/vendor/phpunit/phpunit/src/Runner/Filter/GroupFilterIterator.php +++ b/vendor/phpunit/phpunit/src/Runner/Filter/GroupFilterIterator.php @@ -19,6 +19,8 @@ use RecursiveIterator; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ abstract class GroupFilterIterator extends RecursiveFilterIterator diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/IncludeGroupFilterIterator.php b/vendor/phpunit/phpunit/src/Runner/Filter/IncludeGroupFilterIterator.php index 8a89e8e5..34b0652a 100644 --- a/vendor/phpunit/phpunit/src/Runner/Filter/IncludeGroupFilterIterator.php +++ b/vendor/phpunit/phpunit/src/Runner/Filter/IncludeGroupFilterIterator.php @@ -12,6 +12,8 @@ use function in_array; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class IncludeGroupFilterIterator extends GroupFilterIterator diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/NameFilterIterator.php b/vendor/phpunit/phpunit/src/Runner/Filter/NameFilterIterator.php index 8d226638..5b0c63bb 100644 --- a/vendor/phpunit/phpunit/src/Runner/Filter/NameFilterIterator.php +++ b/vendor/phpunit/phpunit/src/Runner/Filter/NameFilterIterator.php @@ -14,6 +14,7 @@ use function preg_match; use function sprintf; use function str_replace; +use function substr; use Exception; use PHPUnit\Framework\SelfDescribing; use PHPUnit\Framework\Test; @@ -23,6 +24,8 @@ use RecursiveIterator; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NameFilterIterator extends RecursiveFilterIterator @@ -75,7 +78,7 @@ public function accept(): bool */ private function setFilter(string $filter): void { - if (@preg_match($filter, '') === false) { + if (preg_match('/[a-zA-Z0-9]/', substr($filter, 0, 1)) === 1 || @preg_match($filter, '') === false) { // Handles: // * testAssertEqualsSucceeds#4 // * testAssertEqualsSucceeds#4-8 diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/TestIdFilterIterator.php b/vendor/phpunit/phpunit/src/Runner/Filter/TestIdFilterIterator.php index 6c442896..3c6c7738 100644 --- a/vendor/phpunit/phpunit/src/Runner/Filter/TestIdFilterIterator.php +++ b/vendor/phpunit/phpunit/src/Runner/Filter/TestIdFilterIterator.php @@ -20,6 +20,8 @@ use RecursiveIterator; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestIdFilterIterator extends RecursiveFilterIterator diff --git a/vendor/phpunit/phpunit/src/Runner/GarbageCollection/GarbageCollectionHandler.php b/vendor/phpunit/phpunit/src/Runner/GarbageCollection/GarbageCollectionHandler.php index 354c2af3..be460557 100644 --- a/vendor/phpunit/phpunit/src/Runner/GarbageCollection/GarbageCollectionHandler.php +++ b/vendor/phpunit/phpunit/src/Runner/GarbageCollection/GarbageCollectionHandler.php @@ -17,6 +17,8 @@ use PHPUnit\Event\UnknownSubscriberTypeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class GarbageCollectionHandler diff --git a/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/ExecutionFinishedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/ExecutionFinishedSubscriber.php index 6dabd41d..7721d0d3 100644 --- a/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/ExecutionFinishedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/ExecutionFinishedSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\TestRunner\ExecutionFinishedSubscriber as TestRunnerExecutionFinishedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ExecutionFinishedSubscriber extends Subscriber implements TestRunnerExecutionFinishedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/ExecutionStartedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/ExecutionStartedSubscriber.php index 1bb91769..2cccb217 100644 --- a/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/ExecutionStartedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/ExecutionStartedSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\TestRunner\ExecutionStartedSubscriber as TestRunnerExecutionStartedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ExecutionStartedSubscriber extends Subscriber implements TestRunnerExecutionStartedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/Subscriber.php b/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/Subscriber.php index 74d3d70b..c3b08c6f 100644 --- a/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/Subscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/Subscriber.php @@ -10,6 +10,8 @@ namespace PHPUnit\Runner\GarbageCollection; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ abstract class Subscriber diff --git a/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/TestFinishedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/TestFinishedSubscriber.php index 5736b044..35806c4c 100644 --- a/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/TestFinishedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/GarbageCollection/Subscriber/TestFinishedSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\FinishedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestFinishedSubscriber extends Subscriber implements FinishedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/PhptTestCase.php b/vendor/phpunit/phpunit/src/Runner/PhptTestCase.php index f91121ef..b56ac568 100644 --- a/vendor/phpunit/phpunit/src/Runner/PhptTestCase.php +++ b/vendor/phpunit/phpunit/src/Runner/PhptTestCase.php @@ -67,6 +67,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class PhptTestCase implements Reorderable, SelfDescribing, Test @@ -199,6 +201,8 @@ public function run(): void ); } + $passed = true; + try { $this->assertPhptExpectation($sections, $this->output); } catch (AssertionFailedError $e) { @@ -232,8 +236,16 @@ public function run(): void } else { $emitter->testFailed($this->valueObjectForEvents(), ThrowableBuilder::from($failure), null); } + + $passed = false; } catch (Throwable $t) { $emitter->testErrored($this->valueObjectForEvents(), ThrowableBuilder::from($t)); + + $passed = false; + } + + if ($passed) { + $emitter->testPassed($this->valueObjectForEvents()); } $this->runClean($sections, CodeCoverage::instance()->isActive()); @@ -347,7 +359,7 @@ private function parseEnvSection(string $content): array foreach (explode("\n", trim($content)) as $e) { $e = explode('=', trim($e), 2); - if (!empty($e[0]) && isset($e[1])) { + if ($e[0] !== '' && isset($e[1])) { $env[$e[0]] = $e[1]; } } diff --git a/vendor/phpunit/phpunit/src/Runner/ResultCache/DefaultResultCache.php b/vendor/phpunit/phpunit/src/Runner/ResultCache/DefaultResultCache.php index 965fce95..a9e1eabb 100644 --- a/vendor/phpunit/phpunit/src/Runner/ResultCache/DefaultResultCache.php +++ b/vendor/phpunit/phpunit/src/Runner/ResultCache/DefaultResultCache.php @@ -10,6 +10,7 @@ namespace PHPUnit\Runner\ResultCache; use const DIRECTORY_SEPARATOR; +use const LOCK_EX; use function array_keys; use function assert; use function dirname; @@ -21,11 +22,13 @@ use function json_decode; use function json_encode; use PHPUnit\Framework\TestStatus\TestStatus; -use PHPUnit\Runner\DirectoryCannotBeCreatedException; +use PHPUnit\Runner\DirectoryDoesNotExistException; use PHPUnit\Runner\Exception; use PHPUnit\Util\Filesystem; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class DefaultResultCache implements ResultCache @@ -130,7 +133,7 @@ public function load(): void public function persist(): void { if (!Filesystem::createDirectory(dirname($this->cacheFilename))) { - throw new DirectoryCannotBeCreatedException($this->cacheFilename); + throw new DirectoryDoesNotExistException(dirname($this->cacheFilename)); } $data = [ diff --git a/vendor/phpunit/phpunit/src/Runner/ResultCache/NullResultCache.php b/vendor/phpunit/phpunit/src/Runner/ResultCache/NullResultCache.php index 1e93eeb9..f0cc4c30 100644 --- a/vendor/phpunit/phpunit/src/Runner/ResultCache/NullResultCache.php +++ b/vendor/phpunit/phpunit/src/Runner/ResultCache/NullResultCache.php @@ -12,6 +12,8 @@ use PHPUnit\Framework\TestStatus\TestStatus; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NullResultCache implements ResultCache diff --git a/vendor/phpunit/phpunit/src/Runner/ResultCache/ResultCache.php b/vendor/phpunit/phpunit/src/Runner/ResultCache/ResultCache.php index 95546048..74efe251 100644 --- a/vendor/phpunit/phpunit/src/Runner/ResultCache/ResultCache.php +++ b/vendor/phpunit/phpunit/src/Runner/ResultCache/ResultCache.php @@ -12,6 +12,8 @@ use PHPUnit\Framework\TestStatus\TestStatus; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface ResultCache diff --git a/vendor/phpunit/phpunit/src/Runner/ResultCache/ResultCacheHandler.php b/vendor/phpunit/phpunit/src/Runner/ResultCache/ResultCacheHandler.php index f0b054e2..927725a8 100644 --- a/vendor/phpunit/phpunit/src/Runner/ResultCache/ResultCacheHandler.php +++ b/vendor/phpunit/phpunit/src/Runner/ResultCache/ResultCacheHandler.php @@ -26,6 +26,8 @@ use PHPUnit\Framework\TestStatus\TestStatus; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ResultCacheHandler diff --git a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/Subscriber.php b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/Subscriber.php index 77abb6f1..254b36a4 100644 --- a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/Subscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/Subscriber.php @@ -10,6 +10,8 @@ namespace PHPUnit\Runner\ResultCache; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ abstract class Subscriber diff --git a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestConsideredRiskySubscriber.php b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestConsideredRiskySubscriber.php index 6ca0701a..5675f46d 100644 --- a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestConsideredRiskySubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestConsideredRiskySubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\ConsideredRiskySubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestConsideredRiskySubscriber extends Subscriber implements ConsideredRiskySubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestErroredSubscriber.php b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestErroredSubscriber.php index 954551bd..6acc7fbf 100644 --- a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestErroredSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestErroredSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\ErroredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestErroredSubscriber extends Subscriber implements ErroredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestFailedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestFailedSubscriber.php index effdb0c2..d9528986 100644 --- a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestFailedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestFailedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\FailedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestFailedSubscriber extends Subscriber implements FailedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestFinishedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestFinishedSubscriber.php index ff39f716..d0457379 100644 --- a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestFinishedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestFinishedSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\FinishedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestFinishedSubscriber extends Subscriber implements FinishedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestMarkedIncompleteSubscriber.php b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestMarkedIncompleteSubscriber.php index 69364ac2..e9838359 100644 --- a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestMarkedIncompleteSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestMarkedIncompleteSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\MarkedIncompleteSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestMarkedIncompleteSubscriber extends Subscriber implements MarkedIncompleteSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestPreparedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestPreparedSubscriber.php index eee675b1..6e7cd77a 100644 --- a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestPreparedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestPreparedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PreparedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestPreparedSubscriber extends Subscriber implements PreparedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestSkippedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestSkippedSubscriber.php index 21c748b0..b9ad4e34 100644 --- a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestSkippedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestSkippedSubscriber.php @@ -14,6 +14,8 @@ use PHPUnit\Event\Test\SkippedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSkippedSubscriber extends Subscriber implements SkippedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestSuiteFinishedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestSuiteFinishedSubscriber.php index c252823b..1c6fef3a 100644 --- a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestSuiteFinishedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestSuiteFinishedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\TestSuite\FinishedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteFinishedSubscriber extends Subscriber implements FinishedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestSuiteStartedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestSuiteStartedSubscriber.php index 1c78b0ec..e56874fa 100644 --- a/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestSuiteStartedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/ResultCache/Subscriber/TestSuiteStartedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\TestSuite\StartedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteStartedSubscriber extends Subscriber implements StartedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Collector.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Collector.php index b676911e..c26eef16 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Collector.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Collector.php @@ -47,6 +47,8 @@ use PHPUnit\TextUI\Configuration\SourceFilter; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Collector diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Facade.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Facade.php index 790e9970..75b7471e 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Facade.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Facade.php @@ -15,6 +15,8 @@ use PHPUnit\TextUI\Configuration\Registry as ConfigurationRegistry; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Facade diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Issue.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Issue.php index 93fe6d03..dcfd17f8 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Issue.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Issue.php @@ -12,6 +12,8 @@ use PHPUnit\Event\Code\Test; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Issue diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/PassedTests.php b/vendor/phpunit/phpunit/src/Runner/TestResult/PassedTests.php index 2bd0cf5c..b448bc86 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/PassedTests.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/PassedTests.php @@ -18,6 +18,8 @@ use PHPUnit\Metadata\Api\Groups; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class PassedTests diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/BeforeTestClassMethodErroredSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/BeforeTestClassMethodErroredSubscriber.php index cfa5e9d5..c9facc24 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/BeforeTestClassMethodErroredSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/BeforeTestClassMethodErroredSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\BeforeFirstTestMethodErroredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class BeforeTestClassMethodErroredSubscriber extends Subscriber implements BeforeFirstTestMethodErroredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/ExecutionStartedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/ExecutionStartedSubscriber.php index 2d1c1a5f..56f16d76 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/ExecutionStartedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/ExecutionStartedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\TestRunner\ExecutionStartedSubscriber as TestRunnerExecutionStartedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ExecutionStartedSubscriber extends Subscriber implements TestRunnerExecutionStartedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/Subscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/Subscriber.php index 7bb28d20..f9abbb77 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/Subscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/Subscriber.php @@ -10,6 +10,8 @@ namespace PHPUnit\TestRunner\TestResult; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ abstract class Subscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestConsideredRiskySubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestConsideredRiskySubscriber.php index 777ca47a..b3656e43 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestConsideredRiskySubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestConsideredRiskySubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\ConsideredRiskySubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestConsideredRiskySubscriber extends Subscriber implements ConsideredRiskySubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestErroredSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestErroredSubscriber.php index 132482b7..272c9924 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestErroredSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestErroredSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\ErroredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestErroredSubscriber extends Subscriber implements ErroredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestFailedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestFailedSubscriber.php index 7382b0bb..c0b059df 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestFailedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestFailedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\FailedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestFailedSubscriber extends Subscriber implements FailedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestFinishedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestFinishedSubscriber.php index 44aea9f9..6ce115b4 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestFinishedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestFinishedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\FinishedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestFinishedSubscriber extends Subscriber implements FinishedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestMarkedIncompleteSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestMarkedIncompleteSubscriber.php index 9c486c53..b57a0984 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestMarkedIncompleteSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestMarkedIncompleteSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\MarkedIncompleteSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestMarkedIncompleteSubscriber extends Subscriber implements MarkedIncompleteSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestPreparedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestPreparedSubscriber.php index cc91590d..b68c0d5e 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestPreparedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestPreparedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PreparedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestPreparedSubscriber extends Subscriber implements PreparedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestRunnerTriggeredDeprecationSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestRunnerTriggeredDeprecationSubscriber.php index 4dce071c..0550adae 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestRunnerTriggeredDeprecationSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestRunnerTriggeredDeprecationSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\TestRunner\DeprecationTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestRunnerTriggeredDeprecationSubscriber extends Subscriber implements DeprecationTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestRunnerTriggeredWarningSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestRunnerTriggeredWarningSubscriber.php index ddc2564d..b66e7494 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestRunnerTriggeredWarningSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestRunnerTriggeredWarningSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\TestRunner\WarningTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestRunnerTriggeredWarningSubscriber extends Subscriber implements WarningTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSkippedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSkippedSubscriber.php index 651e12f5..4cc44545 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSkippedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSkippedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\SkippedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSkippedSubscriber extends Subscriber implements SkippedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSuiteFinishedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSuiteFinishedSubscriber.php index b4a51dac..125cd519 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSuiteFinishedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSuiteFinishedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\TestSuite\FinishedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteFinishedSubscriber extends Subscriber implements FinishedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSuiteSkippedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSuiteSkippedSubscriber.php index a16ae17e..bf26b15c 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSuiteSkippedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSuiteSkippedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\TestSuite\SkippedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteSkippedSubscriber extends Subscriber implements SkippedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSuiteStartedSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSuiteStartedSubscriber.php index d50b1232..ef8c8d09 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSuiteStartedSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestSuiteStartedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\TestSuite\StartedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteStartedSubscriber extends Subscriber implements StartedSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredDeprecationSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredDeprecationSubscriber.php index 7692bae3..6185723e 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredDeprecationSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredDeprecationSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\DeprecationTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredDeprecationSubscriber extends Subscriber implements DeprecationTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredErrorSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredErrorSubscriber.php index fc48c2d4..c5daf0d7 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredErrorSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredErrorSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\ErrorTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredErrorSubscriber extends Subscriber implements ErrorTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredNoticeSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredNoticeSubscriber.php index dbedc8bd..e0c4b55a 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredNoticeSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredNoticeSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\NoticeTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredNoticeSubscriber extends Subscriber implements NoticeTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpDeprecationSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpDeprecationSubscriber.php index a1bbc804..b0ddcba0 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpDeprecationSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpDeprecationSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpDeprecationTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpDeprecationSubscriber extends Subscriber implements PhpDeprecationTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpNoticeSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpNoticeSubscriber.php index 16f442c8..3f6e54c3 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpNoticeSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpNoticeSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpNoticeTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpNoticeSubscriber extends Subscriber implements PhpNoticeTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpWarningSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpWarningSubscriber.php index 9ff15316..c8af2899 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpWarningSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpWarningSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpWarningTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpWarningSubscriber extends Subscriber implements PhpWarningTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpunitDeprecationSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpunitDeprecationSubscriber.php index bb3ce03c..704895be 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpunitDeprecationSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpunitDeprecationSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpunitDeprecationTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpunitDeprecationSubscriber extends Subscriber implements PhpunitDeprecationTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpunitErrorSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpunitErrorSubscriber.php index e61bf0b4..0fcb0176 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpunitErrorSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpunitErrorSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpunitErrorTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpunitErrorSubscriber extends Subscriber implements PhpunitErrorTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpunitWarningSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpunitWarningSubscriber.php index 89f24886..6c6c49ad 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpunitWarningSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredPhpunitWarningSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpunitWarningTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpunitWarningSubscriber extends Subscriber implements PhpunitWarningTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredWarningSubscriber.php b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredWarningSubscriber.php index ac34bb27..a68d1e23 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredWarningSubscriber.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/Subscriber/TestTriggeredWarningSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\WarningTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredWarningSubscriber extends Subscriber implements WarningTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/Runner/TestResult/TestResult.php b/vendor/phpunit/phpunit/src/Runner/TestResult/TestResult.php index 0944b7cf..db9d4559 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestResult/TestResult.php +++ b/vendor/phpunit/phpunit/src/Runner/TestResult/TestResult.php @@ -25,6 +25,8 @@ use PHPUnit\TestRunner\TestResult\Issues\Issue; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestResult @@ -490,6 +492,28 @@ public function hasDeprecations(): bool return $this->numberOfDeprecations() > 0; } + public function hasPhpOrUserDeprecations(): bool + { + return $this->numberOfPhpOrUserDeprecations() > 0; + } + + public function numberOfPhpOrUserDeprecations(): int + { + return count($this->deprecations) + + count($this->phpDeprecations); + } + + public function hasPhpunitDeprecations(): bool + { + return $this->numberOfPhpunitDeprecations() > 0; + } + + public function numberOfPhpunitDeprecations(): int + { + return count($this->testTriggeredPhpunitDeprecationEvents) + + count($this->testRunnerTriggeredDeprecationEvents); + } + public function numberOfDeprecations(): int { return count($this->deprecations) + diff --git a/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php b/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php index 84d4b2db..e3b984cf 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php +++ b/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php @@ -12,7 +12,6 @@ use function array_diff; use function array_values; use function basename; -use function class_exists; use function get_declared_classes; use function realpath; use function str_ends_with; @@ -23,6 +22,8 @@ use ReflectionClass; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteLoader @@ -77,11 +78,13 @@ public function load(string $suiteClassFile): ReflectionClass throw $e; } - if (!class_exists($suiteClassName)) { - throw new ClassCannotBeFoundException($suiteClassName, $suiteClassFile); + foreach ($loadedClasses as $className) { + if (str_ends_with(strtolower($className), strtolower($suiteClassName))) { + throw new ClassDoesNotExtendTestCaseException($className, $suiteClassFile); + } } - throw new ClassDoesNotExtendTestCaseException($suiteClassName, $suiteClassFile); + throw new ClassCannotBeFoundException($suiteClassName, $suiteClassFile); } private function classNameFromFileName(string $suiteClassFile): string diff --git a/vendor/phpunit/phpunit/src/Runner/TestSuiteSorter.php b/vendor/phpunit/phpunit/src/Runner/TestSuiteSorter.php index 6d1a78e7..b5c0c19d 100644 --- a/vendor/phpunit/phpunit/src/Runner/TestSuiteSorter.php +++ b/vendor/phpunit/phpunit/src/Runner/TestSuiteSorter.php @@ -27,6 +27,8 @@ use PHPUnit\Runner\ResultCache\ResultCache; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteSorter diff --git a/vendor/phpunit/phpunit/src/Runner/Version.php b/vendor/phpunit/phpunit/src/Runner/Version.php index 00fd54c3..45fd2ae3 100644 --- a/vendor/phpunit/phpunit/src/Runner/Version.php +++ b/vendor/phpunit/phpunit/src/Runner/Version.php @@ -34,7 +34,7 @@ public static function id(): string } if (self::$version === '') { - self::$version = (new VersionId('10.5.17', dirname(__DIR__, 2)))->asString(); + self::$version = (new VersionId('10.5.36', dirname(__DIR__, 2)))->asString(); } return self::$version; diff --git a/vendor/phpunit/phpunit/src/TextUI/Application.php b/vendor/phpunit/phpunit/src/TextUI/Application.php index c8353482..00165586 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Application.php +++ b/vendor/phpunit/phpunit/src/TextUI/Application.php @@ -10,6 +10,7 @@ namespace PHPUnit\TextUI; use const PHP_EOL; +use const PHP_VERSION; use function is_file; use function is_readable; use function printf; @@ -33,6 +34,7 @@ use PHPUnit\Runner\Baseline\Reader; use PHPUnit\Runner\Baseline\Writer; use PHPUnit\Runner\CodeCoverage; +use PHPUnit\Runner\DirectoryDoesNotExistException; use PHPUnit\Runner\ErrorHandler; use PHPUnit\Runner\Extension\ExtensionBootstrapper; use PHPUnit\Runner\Extension\Facade as ExtensionFacade; @@ -76,6 +78,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Application @@ -211,16 +215,36 @@ public function run(array $argv): int if ($testDoxResult !== null && $configuration->hasLogfileTestdoxHtml()) { - OutputFacade::printerFor($configuration->logfileTestdoxHtml())->print( - (new TestDoxHtmlRenderer)->render($testDoxResult), - ); + try { + OutputFacade::printerFor($configuration->logfileTestdoxHtml())->print( + (new TestDoxHtmlRenderer)->render($testDoxResult), + ); + } catch (DirectoryDoesNotExistException|InvalidSocketException $e) { + EventFacade::emitter()->testRunnerTriggeredWarning( + sprintf( + 'Cannot log test results in TestDox HTML format to "%s": %s', + $configuration->logfileTestdoxHtml(), + $e->getMessage(), + ), + ); + } } if ($testDoxResult !== null && $configuration->hasLogfileTestdoxText()) { - OutputFacade::printerFor($configuration->logfileTestdoxText())->print( - (new TestDoxTextRenderer)->render($testDoxResult), - ); + try { + OutputFacade::printerFor($configuration->logfileTestdoxText())->print( + (new TestDoxTextRenderer)->render($testDoxResult), + ); + } catch (DirectoryDoesNotExistException|InvalidSocketException $e) { + EventFacade::emitter()->testRunnerTriggeredWarning( + sprintf( + 'Cannot log test results in TestDox plain text format to "%s": %s', + $configuration->logfileTestdoxText(), + $e->getMessage(), + ), + ); + } } $result = TestResultFacade::result(); @@ -247,6 +271,7 @@ public function run(array $argv): int $shellExitCode = (new ShellExitCodeCalculator)->calculate( $configuration->failOnDeprecation(), + $configuration->failOnPhpunitDeprecation(), $configuration->failOnEmptyTestSuite(), $configuration->failOnIncomplete(), $configuration->failOnNotice(), @@ -266,15 +291,40 @@ public function run(array $argv): int // @codeCoverageIgnoreEnd } - private function execute(Command\Command $command): never + private function execute(Command\Command $command, bool $requiresResultCollectedFromEvents = false): never { + if ($requiresResultCollectedFromEvents) { + try { + TestResultFacade::init(); + EventFacade::instance()->seal(); + + $resultCollectedFromEvents = TestResultFacade::result(); + } catch (EventFacadeIsSealedException|UnknownSubscriberTypeException) { + } + } + print Version::getVersionString() . PHP_EOL . PHP_EOL; $result = $command->execute(); print $result->output(); - exit($result->shellExitCode()); + $shellExitCode = $result->shellExitCode(); + + if (isset($resultCollectedFromEvents) && + $resultCollectedFromEvents->hasTestTriggeredPhpunitErrorEvents()) { + $shellExitCode = Result::EXCEPTION; + + print PHP_EOL . PHP_EOL . 'There were errors:' . PHP_EOL; + + foreach ($resultCollectedFromEvents->testTriggeredPhpunitErrorEvents() as $events) { + foreach ($events as $event) { + print PHP_EOL . trim($event->message()) . PHP_EOL; + } + } + } + + exit($shellExitCode); } private function loadBootstrapScript(string $filename): void @@ -414,11 +464,11 @@ private function executeCommandsThatOnlyRequireCliConfiguration(CliConfiguration private function executeCommandsThatRequireCliConfigurationAndTestSuite(CliConfiguration $cliConfiguration, TestSuite $testSuite): void { if ($cliConfiguration->listGroups()) { - $this->execute(new ListGroupsCommand($testSuite)); + $this->execute(new ListGroupsCommand($testSuite), true); } if ($cliConfiguration->listTests()) { - $this->execute(new ListTestsAsTextCommand($testSuite)); + $this->execute(new ListTestsAsTextCommand($testSuite), true); } if ($cliConfiguration->hasListTestsXml()) { @@ -427,6 +477,7 @@ private function executeCommandsThatRequireCliConfigurationAndTestSuite(CliConfi $cliConfiguration->listTestsXml(), $testSuite, ), + true, ); } } @@ -545,19 +596,39 @@ private function registerLogfileWriters(Configuration $configuration): void } if ($configuration->hasLogfileJunit()) { - new JunitXmlLogger( - OutputFacade::printerFor($configuration->logfileJunit()), - EventFacade::instance(), - ); + try { + new JunitXmlLogger( + OutputFacade::printerFor($configuration->logfileJunit()), + EventFacade::instance(), + ); + } catch (DirectoryDoesNotExistException|InvalidSocketException $e) { + EventFacade::emitter()->testRunnerTriggeredWarning( + sprintf( + 'Cannot log test results in JUnit XML format to "%s": %s', + $configuration->logfileJunit(), + $e->getMessage(), + ), + ); + } } if ($configuration->hasLogfileTeamcity()) { - new TeamCityLogger( - DefaultPrinter::from( - $configuration->logfileTeamcity(), - ), - EventFacade::instance(), - ); + try { + new TeamCityLogger( + DefaultPrinter::from( + $configuration->logfileTeamcity(), + ), + EventFacade::instance(), + ); + } catch (DirectoryDoesNotExistException|InvalidSocketException $e) { + EventFacade::emitter()->testRunnerTriggeredWarning( + sprintf( + 'Cannot log test results in TeamCity format to "%s": %s', + $configuration->logfileTeamcity(), + $e->getMessage(), + ), + ); + } } } @@ -570,7 +641,10 @@ private function testDoxResultCollector(Configuration $configuration): ?TestDoxR if ($configuration->hasLogfileTestdoxHtml() || $configuration->hasLogfileTestdoxText() || $configuration->outputIsTestDox()) { - return new TestDoxResultCollector(EventFacade::instance()); + return new TestDoxResultCollector( + EventFacade::instance(), + $configuration->source(), + ); } return null; diff --git a/vendor/phpunit/phpunit/src/TextUI/Command/Command.php b/vendor/phpunit/phpunit/src/TextUI/Command/Command.php index d340c830..4194551e 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Command/Command.php +++ b/vendor/phpunit/phpunit/src/TextUI/Command/Command.php @@ -10,6 +10,8 @@ namespace PHPUnit\TextUI\Command; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface Command diff --git a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/AtLeastVersionCommand.php b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/AtLeastVersionCommand.php index 2fe62c51..06d78358 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/AtLeastVersionCommand.php +++ b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/AtLeastVersionCommand.php @@ -13,6 +13,8 @@ use PHPUnit\Runner\Version; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class AtLeastVersionCommand implements Command diff --git a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/GenerateConfigurationCommand.php b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/GenerateConfigurationCommand.php index 7f450006..b71d8b04 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/GenerateConfigurationCommand.php +++ b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/GenerateConfigurationCommand.php @@ -9,14 +9,19 @@ */ namespace PHPUnit\TextUI\Command; +use const PHP_EOL; +use const STDIN; use function fgets; use function file_put_contents; use function getcwd; +use function sprintf; use function trim; use PHPUnit\Runner\Version; use PHPUnit\TextUI\XmlConfiguration\Generator; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class GenerateConfigurationCommand implements Command @@ -58,7 +63,7 @@ public function execute(): Result $generator = new Generator; - file_put_contents( + $result = @file_put_contents( 'phpunit.xml', $generator->generateDefaultConfiguration( Version::series(), @@ -69,11 +74,26 @@ public function execute(): Result ), ); - /* @noinspection MissingDirectorySeparatorInspection */ - print PHP_EOL . 'Generated phpunit.xml in ' . getcwd() . '.' . PHP_EOL; - print 'Make sure to exclude the ' . $cacheDirectory . ' directory from version control.' . PHP_EOL; + if ($result !== false) { + return Result::from( + sprintf( + PHP_EOL . 'Generated phpunit.xml in %s.' . PHP_EOL . + 'Make sure to exclude the %s directory from version control.' . PHP_EOL, + getcwd(), + $cacheDirectory, + ), + ); + } - return Result::from(); + // @codeCoverageIgnoreStart + return Result::from( + sprintf( + PHP_EOL . 'Could not write phpunit.xml in %s.' . PHP_EOL, + getcwd(), + ), + Result::EXCEPTION, + ); + // @codeCoverageIgnoreEnd } private function read(): string diff --git a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListGroupsCommand.php b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListGroupsCommand.php index e014d3f0..f5f0fac0 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListGroupsCommand.php +++ b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListGroupsCommand.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\TextUI\Command; +use const PHP_EOL; use function sort; use function sprintf; use function str_starts_with; @@ -16,6 +17,8 @@ use PHPUnit\TextUI\Configuration\Registry; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ListGroupsCommand implements Command diff --git a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListTestSuitesCommand.php b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListTestSuitesCommand.php index 78c17116..77c2cbb6 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListTestSuitesCommand.php +++ b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListTestSuitesCommand.php @@ -9,11 +9,14 @@ */ namespace PHPUnit\TextUI\Command; +use const PHP_EOL; use function sprintf; use PHPUnit\TextUI\Configuration\Registry; use PHPUnit\TextUI\Configuration\TestSuiteCollection; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ListTestSuitesCommand implements Command diff --git a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListTestsAsTextCommand.php b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListTestsAsTextCommand.php index c376a631..0d377011 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListTestsAsTextCommand.php +++ b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListTestsAsTextCommand.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\TextUI\Command; +use const PHP_EOL; use function sprintf; use function str_replace; use PHPUnit\Framework\TestCase; @@ -18,6 +19,8 @@ use RecursiveIteratorIterator; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ListTestsAsTextCommand implements Command diff --git a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListTestsAsXmlCommand.php b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListTestsAsXmlCommand.php index acb4500c..5a1085f1 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListTestsAsXmlCommand.php +++ b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ListTestsAsXmlCommand.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\TextUI\Command; +use const PHP_EOL; use function file_put_contents; use function implode; use function sprintf; @@ -21,6 +22,8 @@ use XMLWriter; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ListTestsAsXmlCommand implements Command diff --git a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/MigrateConfigurationCommand.php b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/MigrateConfigurationCommand.php index 781de3e9..cde391ab 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/MigrateConfigurationCommand.php +++ b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/MigrateConfigurationCommand.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\TextUI\Command; +use const PHP_EOL; use function copy; use function file_put_contents; use function sprintf; @@ -16,6 +17,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MigrateConfigurationCommand implements Command diff --git a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ShowHelpCommand.php b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ShowHelpCommand.php index aae306e5..654cbb88 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ShowHelpCommand.php +++ b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ShowHelpCommand.php @@ -12,6 +12,8 @@ use PHPUnit\TextUI\Help; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ShowHelpCommand implements Command diff --git a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ShowVersionCommand.php b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ShowVersionCommand.php index b5ddfc29..b1e66510 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ShowVersionCommand.php +++ b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/ShowVersionCommand.php @@ -10,6 +10,8 @@ namespace PHPUnit\TextUI\Command; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ShowVersionCommand implements Command diff --git a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/VersionCheckCommand.php b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/VersionCheckCommand.php index 30a3c56a..580ec98a 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/VersionCheckCommand.php +++ b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/VersionCheckCommand.php @@ -9,12 +9,15 @@ */ namespace PHPUnit\TextUI\Command; +use const PHP_EOL; use function file_get_contents; use function sprintf; use function version_compare; use PHPUnit\Runner\Version; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @codeCoverageIgnore diff --git a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/WarmCodeCoverageCacheCommand.php b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/WarmCodeCoverageCacheCommand.php index 86303e13..fa8256e7 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Command/Commands/WarmCodeCoverageCacheCommand.php +++ b/vendor/phpunit/phpunit/src/TextUI/Command/Commands/WarmCodeCoverageCacheCommand.php @@ -19,7 +19,11 @@ use SebastianBergmann\Timer\Timer; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit + * + * @codeCoverageIgnore */ final class WarmCodeCoverageCacheCommand implements Command { diff --git a/vendor/phpunit/phpunit/src/TextUI/Command/Result.php b/vendor/phpunit/phpunit/src/TextUI/Command/Result.php index 7391c6da..b0544e7a 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Command/Result.php +++ b/vendor/phpunit/phpunit/src/TextUI/Command/Result.php @@ -12,6 +12,8 @@ /** * @psalm-immutable * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Result diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/Builder.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/Builder.php index 864e1028..bc3bfd36 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/Builder.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/Builder.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\TextUI\CliArguments; +use const DIRECTORY_SEPARATOR; use function array_map; use function basename; use function explode; @@ -23,6 +24,8 @@ use SebastianBergmann\CliParser\Parser as CliParser; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Builder @@ -47,12 +50,15 @@ final class Builder 'coverage-html=', 'coverage-php=', 'coverage-text==', + 'only-summary-for-coverage-text', + 'show-uncovered-for-coverage-text', 'coverage-xml=', 'path-coverage', 'disallow-test-output', 'display-incomplete', 'display-skipped', 'display-deprecations', + 'display-phpunit-deprecations', 'display-errors', 'display-notices', 'display-warnings', @@ -96,6 +102,7 @@ final class Builder 'static-backup', 'stderr', 'fail-on-deprecation', + 'fail-on-phpunit-deprecation', 'fail-on-empty-test-suite', 'fail-on-incomplete', 'fail-on-notice', @@ -183,6 +190,7 @@ public function fromParameters(array $parameters): Configuration $displayIncomplete = null; $displaySkipped = null; $displayDeprecations = null; + $displayPhpunitDeprecations = null; $displayErrors = null; $displayNotices = null; $displayWarnings = null; @@ -191,6 +199,7 @@ public function fromParameters(array $parameters): Configuration $executionOrder = null; $executionOrderDefects = null; $failOnDeprecation = null; + $failOnPhpunitDeprecation = null; $failOnEmptyTestSuite = null; $failOnIncomplete = null; $failOnNotice = null; @@ -339,9 +348,17 @@ public function fromParameters(array $parameters): Configuration $option[1] = 'php://stdout'; } - $coverageText = $option[1]; - $coverageTextShowUncoveredFiles = false; - $coverageTextShowOnlySummary = false; + $coverageText = $option[1]; + + break; + + case '--only-summary-for-coverage-text': + $coverageTextShowOnlySummary = true; + + break; + + case '--show-uncovered-for-coverage-text': + $coverageTextShowUncoveredFiles = true; break; @@ -556,6 +573,11 @@ public function fromParameters(array $parameters): Configuration break; + case '--fail-on-phpunit-deprecation': + $failOnPhpunitDeprecation = true; + + break; + case '--fail-on-empty-test-suite': $failOnEmptyTestSuite = true; @@ -746,6 +768,11 @@ public function fromParameters(array $parameters): Configuration break; + case '--display-phpunit-deprecations': + $displayPhpunitDeprecations = true; + + break; + case '--display-errors': $displayErrors = true; @@ -788,6 +815,8 @@ public function fromParameters(array $parameters): Configuration $coverageFilter[] = $option[1]; + $optionAllowedMultipleTimes = true; + break; case '--random-order': @@ -896,6 +925,7 @@ public function fromParameters(array $parameters): Configuration $executionOrder, $executionOrderDefects, $failOnDeprecation, + $failOnPhpunitDeprecation, $failOnEmptyTestSuite, $failOnIncomplete, $failOnNotice, @@ -951,6 +981,7 @@ public function fromParameters(array $parameters): Configuration $displayIncomplete, $displaySkipped, $displayDeprecations, + $displayPhpunitDeprecations, $displayErrors, $displayNotices, $displayWarnings, diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/Configuration.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/Configuration.php index b4058e1e..84cb00c1 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/Configuration.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/Configuration.php @@ -10,6 +10,8 @@ namespace PHPUnit\TextUI\CliArguments; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable @@ -53,6 +55,7 @@ final class Configuration private readonly ?int $executionOrder; private readonly ?int $executionOrderDefects; private readonly ?bool $failOnDeprecation; + private readonly ?bool $failOnPhpunitDeprecation; private readonly ?bool $failOnEmptyTestSuite; private readonly ?bool $failOnIncomplete; private readonly ?bool $failOnNotice; @@ -114,6 +117,7 @@ final class Configuration private readonly ?bool $displayDetailsOnIncompleteTests; private readonly ?bool $displayDetailsOnSkippedTests; private readonly ?bool $displayDetailsOnTestsThatTriggerDeprecations; + private readonly ?bool $displayDetailsOnPhpunitDeprecations; private readonly ?bool $displayDetailsOnTestsThatTriggerErrors; private readonly ?bool $displayDetailsOnTestsThatTriggerNotices; private readonly ?bool $displayDetailsOnTestsThatTriggerWarnings; @@ -126,7 +130,7 @@ final class Configuration * @psalm-param list $arguments * @psalm-param ?non-empty-list $testSuffixes */ - public function __construct(array $arguments, ?string $atLeastVersion, ?bool $backupGlobals, ?bool $backupStaticProperties, ?bool $beStrictAboutChangesToGlobalState, ?string $bootstrap, ?string $cacheDirectory, ?bool $cacheResult, ?string $cacheResultFile, bool $checkVersion, ?string $colors, null|int|string $columns, ?string $configurationFile, ?string $coverageClover, ?string $coverageCobertura, ?string $coverageCrap4J, ?string $coverageHtml, ?string $coveragePhp, ?string $coverageText, ?bool $coverageTextShowUncoveredFiles, ?bool $coverageTextShowOnlySummary, ?string $coverageXml, ?bool $pathCoverage, ?string $coverageCacheDirectory, bool $warmCoverageCache, ?int $defaultTimeLimit, ?bool $disableCodeCoverageIgnore, ?bool $disallowTestOutput, ?bool $enforceTimeLimit, ?array $excludeGroups, ?int $executionOrder, ?int $executionOrderDefects, ?bool $failOnDeprecation, ?bool $failOnEmptyTestSuite, ?bool $failOnIncomplete, ?bool $failOnNotice, ?bool $failOnRisky, ?bool $failOnSkipped, ?bool $failOnWarning, ?bool $stopOnDefect, ?bool $stopOnDeprecation, ?bool $stopOnError, ?bool $stopOnFailure, ?bool $stopOnIncomplete, ?bool $stopOnNotice, ?bool $stopOnRisky, ?bool $stopOnSkipped, ?bool $stopOnWarning, ?string $filter, ?string $generateBaseline, ?string $useBaseline, bool $ignoreBaseline, bool $generateConfiguration, bool $migrateConfiguration, ?array $groups, ?array $testsCovering, ?array $testsUsing, bool $help, ?string $includePath, ?array $iniSettings, ?string $junitLogfile, bool $listGroups, bool $listSuites, bool $listTests, ?string $listTestsXml, ?bool $noCoverage, ?bool $noExtensions, ?bool $noOutput, ?bool $noProgress, ?bool $noResults, ?bool $noLogging, ?bool $processIsolation, ?int $randomOrderSeed, ?bool $reportUselessTests, ?bool $resolveDependencies, ?bool $reverseList, ?bool $stderr, ?bool $strictCoverage, ?string $teamcityLogfile, ?string $testdoxHtmlFile, ?string $testdoxTextFile, ?array $testSuffixes, ?string $testSuite, ?string $excludeTestSuite, bool $useDefaultConfiguration, ?bool $displayDetailsOnIncompleteTests, ?bool $displayDetailsOnSkippedTests, ?bool $displayDetailsOnTestsThatTriggerDeprecations, ?bool $displayDetailsOnTestsThatTriggerErrors, ?bool $displayDetailsOnTestsThatTriggerNotices, ?bool $displayDetailsOnTestsThatTriggerWarnings, bool $version, ?array $coverageFilter, ?string $logEventsText, ?string $logEventsVerboseText, ?bool $printerTeamCity, ?bool $printerTestDox, bool $debug) + public function __construct(array $arguments, ?string $atLeastVersion, ?bool $backupGlobals, ?bool $backupStaticProperties, ?bool $beStrictAboutChangesToGlobalState, ?string $bootstrap, ?string $cacheDirectory, ?bool $cacheResult, ?string $cacheResultFile, bool $checkVersion, ?string $colors, null|int|string $columns, ?string $configurationFile, ?string $coverageClover, ?string $coverageCobertura, ?string $coverageCrap4J, ?string $coverageHtml, ?string $coveragePhp, ?string $coverageText, ?bool $coverageTextShowUncoveredFiles, ?bool $coverageTextShowOnlySummary, ?string $coverageXml, ?bool $pathCoverage, ?string $coverageCacheDirectory, bool $warmCoverageCache, ?int $defaultTimeLimit, ?bool $disableCodeCoverageIgnore, ?bool $disallowTestOutput, ?bool $enforceTimeLimit, ?array $excludeGroups, ?int $executionOrder, ?int $executionOrderDefects, ?bool $failOnDeprecation, ?bool $failOnPhpunitDeprecation, ?bool $failOnEmptyTestSuite, ?bool $failOnIncomplete, ?bool $failOnNotice, ?bool $failOnRisky, ?bool $failOnSkipped, ?bool $failOnWarning, ?bool $stopOnDefect, ?bool $stopOnDeprecation, ?bool $stopOnError, ?bool $stopOnFailure, ?bool $stopOnIncomplete, ?bool $stopOnNotice, ?bool $stopOnRisky, ?bool $stopOnSkipped, ?bool $stopOnWarning, ?string $filter, ?string $generateBaseline, ?string $useBaseline, bool $ignoreBaseline, bool $generateConfiguration, bool $migrateConfiguration, ?array $groups, ?array $testsCovering, ?array $testsUsing, bool $help, ?string $includePath, ?array $iniSettings, ?string $junitLogfile, bool $listGroups, bool $listSuites, bool $listTests, ?string $listTestsXml, ?bool $noCoverage, ?bool $noExtensions, ?bool $noOutput, ?bool $noProgress, ?bool $noResults, ?bool $noLogging, ?bool $processIsolation, ?int $randomOrderSeed, ?bool $reportUselessTests, ?bool $resolveDependencies, ?bool $reverseList, ?bool $stderr, ?bool $strictCoverage, ?string $teamcityLogfile, ?string $testdoxHtmlFile, ?string $testdoxTextFile, ?array $testSuffixes, ?string $testSuite, ?string $excludeTestSuite, bool $useDefaultConfiguration, ?bool $displayDetailsOnIncompleteTests, ?bool $displayDetailsOnSkippedTests, ?bool $displayDetailsOnTestsThatTriggerDeprecations, ?bool $displayDetailsOnPhpunitDeprecations, ?bool $displayDetailsOnTestsThatTriggerErrors, ?bool $displayDetailsOnTestsThatTriggerNotices, ?bool $displayDetailsOnTestsThatTriggerWarnings, bool $version, ?array $coverageFilter, ?string $logEventsText, ?string $logEventsVerboseText, ?bool $printerTeamCity, ?bool $printerTestDox, bool $debug) { $this->arguments = $arguments; $this->atLeastVersion = $atLeastVersion; @@ -162,6 +166,7 @@ public function __construct(array $arguments, ?string $atLeastVersion, ?bool $ba $this->executionOrder = $executionOrder; $this->executionOrderDefects = $executionOrderDefects; $this->failOnDeprecation = $failOnDeprecation; + $this->failOnPhpunitDeprecation = $failOnPhpunitDeprecation; $this->failOnEmptyTestSuite = $failOnEmptyTestSuite; $this->failOnIncomplete = $failOnIncomplete; $this->failOnNotice = $failOnNotice; @@ -217,6 +222,7 @@ public function __construct(array $arguments, ?string $atLeastVersion, ?bool $ba $this->displayDetailsOnIncompleteTests = $displayDetailsOnIncompleteTests; $this->displayDetailsOnSkippedTests = $displayDetailsOnSkippedTests; $this->displayDetailsOnTestsThatTriggerDeprecations = $displayDetailsOnTestsThatTriggerDeprecations; + $this->displayDetailsOnPhpunitDeprecations = $displayDetailsOnPhpunitDeprecations; $this->displayDetailsOnTestsThatTriggerErrors = $displayDetailsOnTestsThatTriggerErrors; $this->displayDetailsOnTestsThatTriggerNotices = $displayDetailsOnTestsThatTriggerNotices; $this->displayDetailsOnTestsThatTriggerWarnings = $displayDetailsOnTestsThatTriggerWarnings; @@ -874,6 +880,26 @@ public function failOnDeprecation(): bool return $this->failOnDeprecation; } + /** + * @psalm-assert-if-true !null $this->failOnPhpunitDeprecation + */ + public function hasFailOnPhpunitDeprecation(): bool + { + return $this->failOnPhpunitDeprecation !== null; + } + + /** + * @throws Exception + */ + public function failOnPhpunitDeprecation(): bool + { + if (!$this->hasFailOnPhpunitDeprecation()) { + throw new Exception; + } + + return $this->failOnPhpunitDeprecation; + } + /** * @psalm-assert-if-true !null $this->failOnEmptyTestSuite */ @@ -1896,6 +1922,26 @@ public function displayDetailsOnTestsThatTriggerDeprecations(): bool return $this->displayDetailsOnTestsThatTriggerDeprecations; } + /** + * @psalm-assert-if-true !null $this->displayDetailsOnPhpunitDeprecations + */ + public function hasDisplayDetailsOnPhpunitDeprecations(): bool + { + return $this->displayDetailsOnPhpunitDeprecations !== null; + } + + /** + * @throws Exception + */ + public function displayDetailsOnPhpunitDeprecations(): bool + { + if (!$this->hasDisplayDetailsOnPhpunitDeprecations()) { + throw new Exception; + } + + return $this->displayDetailsOnPhpunitDeprecations; + } + /** * @psalm-assert-if-true !null $this->displayDetailsOnTestsThatTriggerErrors */ diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/Exception.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/Exception.php index dd5536ea..0d9a5a00 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/Exception.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/Exception.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Exception extends RuntimeException implements \PHPUnit\Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/XmlConfigurationFileFinder.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/XmlConfigurationFileFinder.php index 79cbfd15..03ac43a0 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/XmlConfigurationFileFinder.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Cli/XmlConfigurationFileFinder.php @@ -15,6 +15,8 @@ use function realpath; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class XmlConfigurationFileFinder diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/CodeCoverageFilterRegistry.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/CodeCoverageFilterRegistry.php index 3ea7bc96..7051d284 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/CodeCoverageFilterRegistry.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/CodeCoverageFilterRegistry.php @@ -17,6 +17,8 @@ * CLI options and XML configuration are static within a single PHPUnit process. * It is therefore okay to use a Singleton registry here. * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class CodeCoverageFilterRegistry @@ -34,6 +36,9 @@ public static function instance(): self return self::$instance; } + /** + * @codeCoverageIgnore + */ public function get(): Filter { assert($this->filter !== null); @@ -41,6 +46,9 @@ public function get(): Filter return $this->filter; } + /** + * @codeCoverageIgnore + */ public function init(Configuration $configuration, bool $force = false): void { if (!$configuration->hasCoverageReport() && !$force) { @@ -60,6 +68,9 @@ public function init(Configuration $configuration, bool $force = false): void } } + /** + * @codeCoverageIgnore + */ public function configured(): bool { return $this->configured; diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Configuration.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Configuration.php index 12b0cbd0..466c311a 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Configuration.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Configuration.php @@ -54,6 +54,7 @@ final class Configuration private readonly bool $ignoreDeprecatedCodeUnitsFromCodeCoverage; private readonly bool $disableCodeCoverageIgnore; private readonly bool $failOnDeprecation; + private readonly bool $failOnPhpunitDeprecation; private readonly bool $failOnEmptyTestSuite; private readonly bool $failOnIncomplete; private readonly bool $failOnNotice; @@ -98,6 +99,7 @@ final class Configuration private readonly bool $displayDetailsOnIncompleteTests; private readonly bool $displayDetailsOnSkippedTests; private readonly bool $displayDetailsOnTestsThatTriggerDeprecations; + private readonly bool $displayDetailsOnPhpunitDeprecations; private readonly bool $displayDetailsOnTestsThatTriggerErrors; private readonly bool $displayDetailsOnTestsThatTriggerNotices; private readonly bool $displayDetailsOnTestsThatTriggerWarnings; @@ -146,7 +148,7 @@ final class Configuration * @psalm-param non-empty-list $testSuffixes * @psalm-param list}> $extensionBootstrappers */ - public function __construct(array $cliArguments, ?string $configurationFile, ?string $bootstrap, bool $cacheResult, ?string $cacheDirectory, ?string $coverageCacheDirectory, Source $source, string $testResultCacheFile, ?string $coverageClover, ?string $coverageCobertura, ?string $coverageCrap4j, int $coverageCrap4jThreshold, ?string $coverageHtml, int $coverageHtmlLowUpperBound, int $coverageHtmlHighLowerBound, string $coverageHtmlColorSuccessLow, string $coverageHtmlColorSuccessMedium, string $coverageHtmlColorSuccessHigh, string $coverageHtmlColorWarning, string $coverageHtmlColorDanger, ?string $coverageHtmlCustomCssFile, ?string $coveragePhp, ?string $coverageText, bool $coverageTextShowUncoveredFiles, bool $coverageTextShowOnlySummary, ?string $coverageXml, bool $pathCoverage, bool $ignoreDeprecatedCodeUnitsFromCodeCoverage, bool $disableCodeCoverageIgnore, bool $failOnDeprecation, bool $failOnEmptyTestSuite, bool $failOnIncomplete, bool $failOnNotice, bool $failOnRisky, bool $failOnSkipped, bool $failOnWarning, bool $stopOnDefect, bool $stopOnDeprecation, bool $stopOnError, bool $stopOnFailure, bool $stopOnIncomplete, bool $stopOnNotice, bool $stopOnRisky, bool $stopOnSkipped, bool $stopOnWarning, bool $outputToStandardErrorStream, int|string $columns, bool $noExtensions, ?string $pharExtensionDirectory, array $extensionBootstrappers, bool $backupGlobals, bool $backupStaticProperties, bool $beStrictAboutChangesToGlobalState, bool $colors, bool $processIsolation, bool $enforceTimeLimit, int $defaultTimeLimit, int $timeoutForSmallTests, int $timeoutForMediumTests, int $timeoutForLargeTests, bool $reportUselessTests, bool $strictCoverage, bool $disallowTestOutput, bool $displayDetailsOnIncompleteTests, bool $displayDetailsOnSkippedTests, bool $displayDetailsOnTestsThatTriggerDeprecations, bool $displayDetailsOnTestsThatTriggerErrors, bool $displayDetailsOnTestsThatTriggerNotices, bool $displayDetailsOnTestsThatTriggerWarnings, bool $reverseDefectList, bool $requireCoverageMetadata, bool $registerMockObjectsFromTestArgumentsRecursively, bool $noProgress, bool $noResults, bool $noOutput, int $executionOrder, int $executionOrderDefects, bool $resolveDependencies, ?string $logfileTeamcity, ?string $logfileJunit, ?string $logfileTestdoxHtml, ?string $logfileTestdoxText, ?string $logEventsText, ?string $logEventsVerboseText, bool $teamCityOutput, bool $testDoxOutput, ?array $testsCovering, ?array $testsUsing, ?string $filter, ?array $groups, ?array $excludeGroups, int $randomOrderSeed, bool $includeUncoveredFiles, TestSuiteCollection $testSuite, string $includeTestSuite, string $excludeTestSuite, ?string $defaultTestSuite, array $testSuffixes, Php $php, bool $controlGarbageCollector, int $numberOfTestsBeforeGarbageCollection, ?string $generateBaseline, bool $debug) + public function __construct(array $cliArguments, ?string $configurationFile, ?string $bootstrap, bool $cacheResult, ?string $cacheDirectory, ?string $coverageCacheDirectory, Source $source, string $testResultCacheFile, ?string $coverageClover, ?string $coverageCobertura, ?string $coverageCrap4j, int $coverageCrap4jThreshold, ?string $coverageHtml, int $coverageHtmlLowUpperBound, int $coverageHtmlHighLowerBound, string $coverageHtmlColorSuccessLow, string $coverageHtmlColorSuccessMedium, string $coverageHtmlColorSuccessHigh, string $coverageHtmlColorWarning, string $coverageHtmlColorDanger, ?string $coverageHtmlCustomCssFile, ?string $coveragePhp, ?string $coverageText, bool $coverageTextShowUncoveredFiles, bool $coverageTextShowOnlySummary, ?string $coverageXml, bool $pathCoverage, bool $ignoreDeprecatedCodeUnitsFromCodeCoverage, bool $disableCodeCoverageIgnore, bool $failOnDeprecation, bool $failOnPhpunitDeprecation, bool $failOnEmptyTestSuite, bool $failOnIncomplete, bool $failOnNotice, bool $failOnRisky, bool $failOnSkipped, bool $failOnWarning, bool $stopOnDefect, bool $stopOnDeprecation, bool $stopOnError, bool $stopOnFailure, bool $stopOnIncomplete, bool $stopOnNotice, bool $stopOnRisky, bool $stopOnSkipped, bool $stopOnWarning, bool $outputToStandardErrorStream, int|string $columns, bool $noExtensions, ?string $pharExtensionDirectory, array $extensionBootstrappers, bool $backupGlobals, bool $backupStaticProperties, bool $beStrictAboutChangesToGlobalState, bool $colors, bool $processIsolation, bool $enforceTimeLimit, int $defaultTimeLimit, int $timeoutForSmallTests, int $timeoutForMediumTests, int $timeoutForLargeTests, bool $reportUselessTests, bool $strictCoverage, bool $disallowTestOutput, bool $displayDetailsOnIncompleteTests, bool $displayDetailsOnSkippedTests, bool $displayDetailsOnTestsThatTriggerDeprecations, bool $displayDetailsOnPhpunitDeprecations, bool $displayDetailsOnTestsThatTriggerErrors, bool $displayDetailsOnTestsThatTriggerNotices, bool $displayDetailsOnTestsThatTriggerWarnings, bool $reverseDefectList, bool $requireCoverageMetadata, bool $registerMockObjectsFromTestArgumentsRecursively, bool $noProgress, bool $noResults, bool $noOutput, int $executionOrder, int $executionOrderDefects, bool $resolveDependencies, ?string $logfileTeamcity, ?string $logfileJunit, ?string $logfileTestdoxHtml, ?string $logfileTestdoxText, ?string $logEventsText, ?string $logEventsVerboseText, bool $teamCityOutput, bool $testDoxOutput, ?array $testsCovering, ?array $testsUsing, ?string $filter, ?array $groups, ?array $excludeGroups, int $randomOrderSeed, bool $includeUncoveredFiles, TestSuiteCollection $testSuite, string $includeTestSuite, string $excludeTestSuite, ?string $defaultTestSuite, array $testSuffixes, Php $php, bool $controlGarbageCollector, int $numberOfTestsBeforeGarbageCollection, ?string $generateBaseline, bool $debug) { $this->cliArguments = $cliArguments; $this->configurationFile = $configurationFile; @@ -178,6 +180,7 @@ public function __construct(array $cliArguments, ?string $configurationFile, ?st $this->ignoreDeprecatedCodeUnitsFromCodeCoverage = $ignoreDeprecatedCodeUnitsFromCodeCoverage; $this->disableCodeCoverageIgnore = $disableCodeCoverageIgnore; $this->failOnDeprecation = $failOnDeprecation; + $this->failOnPhpunitDeprecation = $failOnPhpunitDeprecation; $this->failOnEmptyTestSuite = $failOnEmptyTestSuite; $this->failOnIncomplete = $failOnIncomplete; $this->failOnNotice = $failOnNotice; @@ -214,6 +217,7 @@ public function __construct(array $cliArguments, ?string $configurationFile, ?st $this->displayDetailsOnIncompleteTests = $displayDetailsOnIncompleteTests; $this->displayDetailsOnSkippedTests = $displayDetailsOnSkippedTests; $this->displayDetailsOnTestsThatTriggerDeprecations = $displayDetailsOnTestsThatTriggerDeprecations; + $this->displayDetailsOnPhpunitDeprecations = $displayDetailsOnPhpunitDeprecations; $this->displayDetailsOnTestsThatTriggerErrors = $displayDetailsOnTestsThatTriggerErrors; $this->displayDetailsOnTestsThatTriggerNotices = $displayDetailsOnTestsThatTriggerNotices; $this->displayDetailsOnTestsThatTriggerWarnings = $displayDetailsOnTestsThatTriggerWarnings; @@ -695,6 +699,11 @@ public function failOnDeprecation(): bool return $this->failOnDeprecation; } + public function failOnPhpunitDeprecation(): bool + { + return $this->failOnPhpunitDeprecation; + } + public function failOnEmptyTestSuite(): bool { return $this->failOnEmptyTestSuite; @@ -903,6 +912,11 @@ public function displayDetailsOnTestsThatTriggerDeprecations(): bool return $this->displayDetailsOnTestsThatTriggerDeprecations; } + public function displayDetailsOnPhpunitDeprecations(): bool + { + return $this->displayDetailsOnPhpunitDeprecations; + } + public function displayDetailsOnTestsThatTriggerErrors(): bool { return $this->displayDetailsOnTestsThatTriggerErrors; diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/CannotFindSchemaException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/CannotFindSchemaException.php index 3e89f932..6eef052d 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/CannotFindSchemaException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/CannotFindSchemaException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class CannotFindSchemaException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/CodeCoverageReportNotConfiguredException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/CodeCoverageReportNotConfiguredException.php index 05243c9a..83faa0a2 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/CodeCoverageReportNotConfiguredException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/CodeCoverageReportNotConfiguredException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class CodeCoverageReportNotConfiguredException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/ConfigurationCannotBeBuiltException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/ConfigurationCannotBeBuiltException.php index 8aef8643..e95e0942 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/ConfigurationCannotBeBuiltException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/ConfigurationCannotBeBuiltException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ConfigurationCannotBeBuiltException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/Exception.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/Exception.php index 8678983b..dc49125a 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/Exception.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/Exception.php @@ -10,6 +10,8 @@ namespace PHPUnit\TextUI\Configuration; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This interface is not covered by the backward compatibility promise for PHPUnit */ interface Exception extends \PHPUnit\TextUI\Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/FilterNotConfiguredException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/FilterNotConfiguredException.php index 9cb4a79a..5ae4331f 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/FilterNotConfiguredException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/FilterNotConfiguredException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class FilterNotConfiguredException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/IncludePathNotConfiguredException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/IncludePathNotConfiguredException.php index e4623b24..3b70fea0 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/IncludePathNotConfiguredException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/IncludePathNotConfiguredException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class IncludePathNotConfiguredException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/LoggingNotConfiguredException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/LoggingNotConfiguredException.php index c10febbb..63cf9b07 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/LoggingNotConfiguredException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/LoggingNotConfiguredException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class LoggingNotConfiguredException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoBaselineException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoBaselineException.php index eb8cf3ba..7611dceb 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoBaselineException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoBaselineException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NoBaselineException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoBootstrapException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoBootstrapException.php index 1abc7e88..ff1bddf0 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoBootstrapException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoBootstrapException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NoBootstrapException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCacheDirectoryException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCacheDirectoryException.php index 36d2499e..215fe21f 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCacheDirectoryException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCacheDirectoryException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NoCacheDirectoryException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCliArgumentException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCliArgumentException.php index 18c5e16f..42ed0d49 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCliArgumentException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCliArgumentException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NoCliArgumentException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoConfigurationFileException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoConfigurationFileException.php index 1d488d3b..f8ceb80b 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoConfigurationFileException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoConfigurationFileException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NoConfigurationFileException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCoverageCacheDirectoryException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCoverageCacheDirectoryException.php index 54eaabbe..113950b5 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCoverageCacheDirectoryException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCoverageCacheDirectoryException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NoCoverageCacheDirectoryException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCustomCssFileException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCustomCssFileException.php index 672b1fc1..e524c8db 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCustomCssFileException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoCustomCssFileException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NoCustomCssFileException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoDefaultTestSuiteException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoDefaultTestSuiteException.php index 28663ff5..96e7a7ad 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoDefaultTestSuiteException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoDefaultTestSuiteException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NoDefaultTestSuiteException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoPharExtensionDirectoryException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoPharExtensionDirectoryException.php index 269be3bd..ce573ca7 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoPharExtensionDirectoryException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Exception/NoPharExtensionDirectoryException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NoPharExtensionDirectoryException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Merger.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Merger.php index b1ce8c28..28a7db0f 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Merger.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Merger.php @@ -10,6 +10,7 @@ namespace PHPUnit\TextUI\Configuration; use const DIRECTORY_SEPARATOR; +use const PATH_SEPARATOR; use function array_diff; use function assert; use function dirname; @@ -31,6 +32,8 @@ use SebastianBergmann\Invoker\Invoker; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Merger @@ -116,6 +119,12 @@ public function merge(CliConfiguration $cliConfiguration, XmlConfiguration $xmlC $failOnDeprecation = $xmlConfiguration->phpunit()->failOnDeprecation(); } + if ($cliConfiguration->hasFailOnPhpunitDeprecation()) { + $failOnPhpunitDeprecation = $cliConfiguration->failOnPhpunitDeprecation(); + } else { + $failOnPhpunitDeprecation = $xmlConfiguration->phpunit()->failOnPhpunitDeprecation(); + } + if ($cliConfiguration->hasFailOnEmptyTestSuite()) { $failOnEmptyTestSuite = $cliConfiguration->failOnEmptyTestSuite(); } else { @@ -345,6 +354,14 @@ public function merge(CliConfiguration $cliConfiguration, XmlConfiguration $xmlC $coverageTextShowOnlySummary = $xmlConfiguration->codeCoverage()->text()->showOnlySummary(); } + if ($cliConfiguration->hasCoverageTextShowUncoveredFiles()) { + $coverageTextShowUncoveredFiles = $cliConfiguration->coverageTextShowUncoveredFiles(); + } + + if ($cliConfiguration->hasCoverageTextShowOnlySummary()) { + $coverageTextShowOnlySummary = $cliConfiguration->coverageTextShowOnlySummary(); + } + if ($cliConfiguration->hasCoverageText()) { $coverageText = $cliConfiguration->coverageText(); } elseif ($coverageFromXmlConfiguration && $xmlConfiguration->codeCoverage()->hasText()) { @@ -439,6 +456,12 @@ public function merge(CliConfiguration $cliConfiguration, XmlConfiguration $xmlC $displayDetailsOnTestsThatTriggerDeprecations = $xmlConfiguration->phpunit()->displayDetailsOnTestsThatTriggerDeprecations(); } + if ($cliConfiguration->hasDisplayDetailsOnPhpunitDeprecations()) { + $displayDetailsOnPhpunitDeprecations = $cliConfiguration->displayDetailsOnPhpunitDeprecations(); + } else { + $displayDetailsOnPhpunitDeprecations = $xmlConfiguration->phpunit()->displayDetailsOnPhpunitDeprecations(); + } + if ($cliConfiguration->hasDisplayDetailsOnTestsThatTriggerErrors()) { $displayDetailsOnTestsThatTriggerErrors = $cliConfiguration->displayDetailsOnTestsThatTriggerErrors(); } else { @@ -764,6 +787,7 @@ public function merge(CliConfiguration $cliConfiguration, XmlConfiguration $xmlC $xmlConfiguration->codeCoverage()->ignoreDeprecatedCodeUnits(), $disableCodeCoverageIgnore, $failOnDeprecation, + $failOnPhpunitDeprecation, $failOnEmptyTestSuite, $failOnIncomplete, $failOnNotice, @@ -800,6 +824,7 @@ public function merge(CliConfiguration $cliConfiguration, XmlConfiguration $xmlC $displayDetailsOnIncompleteTests, $displayDetailsOnSkippedTests, $displayDetailsOnTestsThatTriggerDeprecations, + $displayDetailsOnPhpunitDeprecations, $displayDetailsOnTestsThatTriggerErrors, $displayDetailsOnTestsThatTriggerNotices, $displayDetailsOnTestsThatTriggerWarnings, diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/PhpHandler.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/PhpHandler.php index 4417c713..8bd727f2 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/PhpHandler.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/PhpHandler.php @@ -20,6 +20,8 @@ use function putenv; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class PhpHandler diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Registry.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Registry.php index 80720bc9..bde319a7 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Registry.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Registry.php @@ -24,6 +24,8 @@ * CLI options and XML configuration are static within a single PHPUnit process. * It is therefore okay to use a Singleton registry here. * + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Registry @@ -41,13 +43,17 @@ public static function saveTo(string $path): bool return true; } + // @codeCoverageIgnoreStart return false; + // @codeCoverageIgnoreEnd } /** * This method is used by the "run test(s) in separate process" templates. * * @noinspection PhpUnused + * + * @codeCoverageIgnore */ public static function loadFrom(string $path): void { diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/SourceFilter.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/SourceFilter.php index 1586a649..a6b1262b 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/SourceFilter.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/SourceFilter.php @@ -10,6 +10,8 @@ namespace PHPUnit\TextUI\Configuration; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class SourceFilter diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/SourceMapper.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/SourceMapper.php index 8e42dbf8..f5d837f9 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/SourceMapper.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/SourceMapper.php @@ -14,6 +14,8 @@ use SplObjectStorage; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class SourceMapper diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/TestSuiteBuilder.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/TestSuiteBuilder.php index 1b5a09c1..0b948059 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/TestSuiteBuilder.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/TestSuiteBuilder.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\TextUI\Configuration; +use const PHP_EOL; use function assert; use function count; use function is_dir; @@ -26,6 +27,8 @@ use SebastianBergmann\FileIterator\Facade as FileIteratorFacade; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteBuilder diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/CodeCoverage.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/CodeCoverage.php index b38feefc..4450970f 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/CodeCoverage.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/CodeCoverage.php @@ -23,6 +23,8 @@ use PHPUnit\TextUI\XmlConfiguration\Exception; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Clover.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Clover.php index 0d59cef5..a815dc46 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Clover.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Clover.php @@ -12,6 +12,8 @@ use PHPUnit\TextUI\Configuration\File; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Cobertura.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Cobertura.php index 5c15cf27..c8b560d7 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Cobertura.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Cobertura.php @@ -12,6 +12,8 @@ use PHPUnit\TextUI\Configuration\File; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Crap4j.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Crap4j.php index 3e292df3..eff20d6b 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Crap4j.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Crap4j.php @@ -12,6 +12,8 @@ use PHPUnit\TextUI\Configuration\File; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Html.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Html.php index 8a5841d2..db6fa53d 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Html.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Html.php @@ -13,6 +13,8 @@ use PHPUnit\TextUI\Configuration\NoCustomCssFileException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Php.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Php.php index 121287a1..39a3762d 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Php.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Php.php @@ -12,6 +12,8 @@ use PHPUnit\TextUI\Configuration\File; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Text.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Text.php index 749c32cf..6ff3c8ce 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Text.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Text.php @@ -12,6 +12,8 @@ use PHPUnit\TextUI\Configuration\File; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Xml.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Xml.php index 2f891e97..09dddc0c 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Xml.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/CodeCoverage/Report/Xml.php @@ -12,6 +12,8 @@ use PHPUnit\TextUI\Configuration\Directory; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Configuration.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Configuration.php index c78d58f5..d9a74fa8 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Configuration.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Configuration.php @@ -17,6 +17,8 @@ use PHPUnit\TextUI\XmlConfiguration\Logging\Logging; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/DefaultConfiguration.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/DefaultConfiguration.php index 5c652e95..7ec3a168 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/DefaultConfiguration.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/DefaultConfiguration.php @@ -25,6 +25,8 @@ use PHPUnit\TextUI\XmlConfiguration\Logging\Logging; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable @@ -109,6 +111,7 @@ public static function create(): self false, false, false, + false, null, false, false, @@ -127,6 +130,7 @@ public static function create(): self false, false, false, + false, null, false, false, diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Exception.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Exception.php index 162b37e8..60c3c9ac 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Exception.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Exception.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Exception extends RuntimeException implements \PHPUnit\Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Generator.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Generator.php index 39e7095f..865fb5d4 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Generator.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Generator.php @@ -12,6 +12,8 @@ use function str_replace; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Generator @@ -29,6 +31,8 @@ final class Generator requireCoverageMetadata="true" beStrictAboutCoverageMetadata="true" beStrictAboutOutputDuringTests="true" + displayDetailsOnPhpunitDeprecations="true" + failOnPhpunitDeprecation="true" failOnRisky="true" failOnWarning="true"> diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Groups.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Groups.php index e8f61b5e..d89908ca 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Groups.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Groups.php @@ -12,6 +12,8 @@ use PHPUnit\TextUI\Configuration\GroupCollection; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/LoadedFromFileConfiguration.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/LoadedFromFileConfiguration.php index cf7274d6..31106ed9 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/LoadedFromFileConfiguration.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/LoadedFromFileConfiguration.php @@ -17,6 +17,8 @@ use PHPUnit\TextUI\XmlConfiguration\Logging\Logging; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Loader.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Loader.php index 93cd6c96..228dc785 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Loader.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Loader.php @@ -75,6 +75,8 @@ use SebastianBergmann\CodeCoverage\Report\Thresholds; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Loader @@ -816,6 +818,7 @@ private function phpunit(string $filename, DOMDocument $document): PHPUnit $this->getBooleanAttribute($document->documentElement, 'displayDetailsOnIncompleteTests', false), $this->getBooleanAttribute($document->documentElement, 'displayDetailsOnSkippedTests', false), $this->getBooleanAttribute($document->documentElement, 'displayDetailsOnTestsThatTriggerDeprecations', false), + $this->getBooleanAttribute($document->documentElement, 'displayDetailsOnPhpunitDeprecations', false), $this->getBooleanAttribute($document->documentElement, 'displayDetailsOnTestsThatTriggerErrors', false), $this->getBooleanAttribute($document->documentElement, 'displayDetailsOnTestsThatTriggerNotices', false), $this->getBooleanAttribute($document->documentElement, 'displayDetailsOnTestsThatTriggerWarnings', false), @@ -824,6 +827,7 @@ private function phpunit(string $filename, DOMDocument $document): PHPUnit $bootstrap, $this->getBooleanAttribute($document->documentElement, 'processIsolation', false), $this->getBooleanAttribute($document->documentElement, 'failOnDeprecation', false), + $this->getBooleanAttribute($document->documentElement, 'failOnPhpunitDeprecation', false), $this->getBooleanAttribute($document->documentElement, 'failOnEmptyTestSuite', false), $this->getBooleanAttribute($document->documentElement, 'failOnIncomplete', false), $this->getBooleanAttribute($document->documentElement, 'failOnNotice', false), diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/Junit.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/Junit.php index 020144b8..406aaf2b 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/Junit.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/Junit.php @@ -12,6 +12,8 @@ use PHPUnit\TextUI\Configuration\File; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/Logging.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/Logging.php index 587f727f..8fc34394 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/Logging.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/Logging.php @@ -14,6 +14,8 @@ use PHPUnit\TextUI\XmlConfiguration\Logging\TestDox\Text as TestDoxText; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/TeamCity.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/TeamCity.php index 263fcf0d..2025c1f4 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/TeamCity.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/TeamCity.php @@ -12,6 +12,8 @@ use PHPUnit\TextUI\Configuration\File; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/TestDox/Html.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/TestDox/Html.php index 8cfb00e2..e52587bb 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/TestDox/Html.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/TestDox/Html.php @@ -12,6 +12,8 @@ use PHPUnit\TextUI\Configuration\File; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/TestDox/Text.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/TestDox/Text.php index b91c793d..db47a3ef 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/TestDox/Text.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Logging/TestDox/Text.php @@ -12,6 +12,8 @@ use PHPUnit\TextUI\Configuration\File; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/MigrationBuilder.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/MigrationBuilder.php index 86b92e76..45970689 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/MigrationBuilder.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/MigrationBuilder.php @@ -12,6 +12,8 @@ use function version_compare; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MigrationBuilder diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/MigrationBuilderException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/MigrationBuilderException.php index ebee6e91..2b670963 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/MigrationBuilderException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/MigrationBuilderException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MigrationBuilderException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/MigrationException.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/MigrationException.php index 9fa4068c..bb35aca6 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/MigrationException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/MigrationException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MigrationException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/ConvertLogTypes.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/ConvertLogTypes.php index 697bbe08..43a9bf15 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/ConvertLogTypes.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/ConvertLogTypes.php @@ -13,6 +13,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ConvertLogTypes implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageCloverToReport.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageCloverToReport.php index ccefbfbc..7d3ee496 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageCloverToReport.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageCloverToReport.php @@ -12,6 +12,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class CoverageCloverToReport extends LogToReportMigration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageCrap4jToReport.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageCrap4jToReport.php index afbaaec1..2b494780 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageCrap4jToReport.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageCrap4jToReport.php @@ -12,6 +12,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class CoverageCrap4jToReport extends LogToReportMigration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageHtmlToReport.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageHtmlToReport.php index 7e12095b..64af982d 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageHtmlToReport.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageHtmlToReport.php @@ -12,6 +12,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class CoverageHtmlToReport extends LogToReportMigration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoveragePhpToReport.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoveragePhpToReport.php index bfa10030..93868c47 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoveragePhpToReport.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoveragePhpToReport.php @@ -12,6 +12,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class CoveragePhpToReport extends LogToReportMigration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageTextToReport.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageTextToReport.php index 063d8df0..f50be1d7 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageTextToReport.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageTextToReport.php @@ -12,6 +12,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class CoverageTextToReport extends LogToReportMigration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageXmlToReport.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageXmlToReport.php index 480d7777..2ea7cdc8 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageXmlToReport.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/CoverageXmlToReport.php @@ -12,6 +12,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class CoverageXmlToReport extends LogToReportMigration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/IntroduceCacheDirectoryAttribute.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/IntroduceCacheDirectoryAttribute.php index 4ac7331c..fe0e0a2b 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/IntroduceCacheDirectoryAttribute.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/IntroduceCacheDirectoryAttribute.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class IntroduceCacheDirectoryAttribute implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/IntroduceCoverageElement.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/IntroduceCoverageElement.php index de52857e..54b5485d 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/IntroduceCoverageElement.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/IntroduceCoverageElement.php @@ -12,6 +12,8 @@ use DOMDocument; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class IntroduceCoverageElement implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/LogToReportMigration.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/LogToReportMigration.php index c07de0ec..321260b5 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/LogToReportMigration.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/LogToReportMigration.php @@ -15,6 +15,8 @@ use DOMXPath; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ abstract class LogToReportMigration implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/Migration.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/Migration.php index fa4092a9..05359a2d 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/Migration.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/Migration.php @@ -12,6 +12,8 @@ use DOMDocument; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ interface Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveAttributesFromFilterWhitelistToCoverage.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveAttributesFromFilterWhitelistToCoverage.php index a7aab5e5..b6ed401a 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveAttributesFromFilterWhitelistToCoverage.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveAttributesFromFilterWhitelistToCoverage.php @@ -13,6 +13,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MoveAttributesFromFilterWhitelistToCoverage implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveAttributesFromRootToCoverage.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveAttributesFromRootToCoverage.php index 1e0fb4c9..40b95fec 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveAttributesFromRootToCoverage.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveAttributesFromRootToCoverage.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MoveAttributesFromRootToCoverage implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveCoverageDirectoriesToSource.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveCoverageDirectoriesToSource.php index bf87fcea..737c473f 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveCoverageDirectoriesToSource.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveCoverageDirectoriesToSource.php @@ -15,6 +15,8 @@ use DOMXPath; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MoveCoverageDirectoriesToSource implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveWhitelistExcludesToCoverage.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveWhitelistExcludesToCoverage.php index 40132156..311fb567 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveWhitelistExcludesToCoverage.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveWhitelistExcludesToCoverage.php @@ -15,6 +15,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MoveWhitelistExcludesToCoverage implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveWhitelistIncludesToCoverage.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveWhitelistIncludesToCoverage.php index 2b1b23ed..19c1f140 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveWhitelistIncludesToCoverage.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/MoveWhitelistIncludesToCoverage.php @@ -13,6 +13,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class MoveWhitelistIncludesToCoverage implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveBeStrictAboutResourceUsageDuringSmallTestsAttribute.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveBeStrictAboutResourceUsageDuringSmallTestsAttribute.php index c88ff348..ee49fcfc 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveBeStrictAboutResourceUsageDuringSmallTestsAttribute.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveBeStrictAboutResourceUsageDuringSmallTestsAttribute.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemoveBeStrictAboutResourceUsageDuringSmallTestsAttribute implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveBeStrictAboutTodoAnnotatedTestsAttribute.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveBeStrictAboutTodoAnnotatedTestsAttribute.php index 84b92ef8..d7ab28f6 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveBeStrictAboutTodoAnnotatedTestsAttribute.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveBeStrictAboutTodoAnnotatedTestsAttribute.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemoveBeStrictAboutTodoAnnotatedTestsAttribute implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCacheResultFileAttribute.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCacheResultFileAttribute.php index 6a9aae9e..e283b64d 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCacheResultFileAttribute.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCacheResultFileAttribute.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemoveCacheResultFileAttribute implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCacheTokensAttribute.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCacheTokensAttribute.php index faf16f2e..5ab7e041 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCacheTokensAttribute.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCacheTokensAttribute.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemoveCacheTokensAttribute implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveConversionToExceptionsAttributes.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveConversionToExceptionsAttributes.php index 267ff0e8..339b3e20 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveConversionToExceptionsAttributes.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveConversionToExceptionsAttributes.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemoveConversionToExceptionsAttributes implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCoverageElementCacheDirectoryAttribute.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCoverageElementCacheDirectoryAttribute.php index f34518e3..4a71bbb8 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCoverageElementCacheDirectoryAttribute.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCoverageElementCacheDirectoryAttribute.php @@ -13,6 +13,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemoveCoverageElementCacheDirectoryAttribute implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCoverageElementProcessUncoveredFilesAttribute.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCoverageElementProcessUncoveredFilesAttribute.php index 7a55eacf..720b65c5 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCoverageElementProcessUncoveredFilesAttribute.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveCoverageElementProcessUncoveredFilesAttribute.php @@ -13,6 +13,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemoveCoverageElementProcessUncoveredFilesAttribute implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveEmptyFilter.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveEmptyFilter.php index 8f1a6d54..2d8fea52 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveEmptyFilter.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveEmptyFilter.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemoveEmptyFilter implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveListeners.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveListeners.php index 3095c03b..b493d1c7 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveListeners.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveListeners.php @@ -13,6 +13,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemoveListeners implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveLogTypes.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveLogTypes.php index 7419204e..9591f8c9 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveLogTypes.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveLogTypes.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemoveLogTypes implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveLoggingElements.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveLoggingElements.php index cf59ce71..de09f8c4 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveLoggingElements.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveLoggingElements.php @@ -14,6 +14,8 @@ use DOMXPath; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemoveLoggingElements implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveNoInteractionAttribute.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveNoInteractionAttribute.php index 5efaefad..c3dd3f10 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveNoInteractionAttribute.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveNoInteractionAttribute.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemoveNoInteractionAttribute implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemovePrinterAttributes.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemovePrinterAttributes.php index 5281cc3a..2d1d03fa 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemovePrinterAttributes.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemovePrinterAttributes.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemovePrinterAttributes implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveTestDoxGroupsElement.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveTestDoxGroupsElement.php index 50906f15..eb2f1359 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveTestDoxGroupsElement.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveTestDoxGroupsElement.php @@ -13,6 +13,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemoveTestDoxGroupsElement implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveTestSuiteLoaderAttributes.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveTestSuiteLoaderAttributes.php index 4b15dc73..823c9647 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveTestSuiteLoaderAttributes.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveTestSuiteLoaderAttributes.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemoveTestSuiteLoaderAttributes implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveVerboseAttribute.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveVerboseAttribute.php index 6091cd5a..0233d8b4 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveVerboseAttribute.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RemoveVerboseAttribute.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RemoveVerboseAttribute implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RenameBackupStaticAttributesAttribute.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RenameBackupStaticAttributesAttribute.php index 3fe871d9..b04bbdb2 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RenameBackupStaticAttributesAttribute.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RenameBackupStaticAttributesAttribute.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RenameBackupStaticAttributesAttribute implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RenameBeStrictAboutCoversAnnotationAttribute.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RenameBeStrictAboutCoversAnnotationAttribute.php index eba48730..3950e2a3 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RenameBeStrictAboutCoversAnnotationAttribute.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RenameBeStrictAboutCoversAnnotationAttribute.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RenameBeStrictAboutCoversAnnotationAttribute implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RenameForceCoversAnnotationAttribute.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RenameForceCoversAnnotationAttribute.php index b1b41f5d..c384be21 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RenameForceCoversAnnotationAttribute.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/RenameForceCoversAnnotationAttribute.php @@ -14,6 +14,8 @@ use DOMElement; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RenameForceCoversAnnotationAttribute implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/UpdateSchemaLocation.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/UpdateSchemaLocation.php index d8f65d6a..6f39eb4c 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/UpdateSchemaLocation.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrations/UpdateSchemaLocation.php @@ -15,6 +15,8 @@ use PHPUnit\Runner\Version; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class UpdateSchemaLocation implements Migration diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrator.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrator.php index 78adfae8..b28e70d0 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrator.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/Migrator.php @@ -14,6 +14,8 @@ use PHPUnit\Util\Xml\XmlException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Migrator diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/SnapshotNodeList.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/SnapshotNodeList.php index a760c3f2..c87d0546 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/SnapshotNodeList.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Migration/SnapshotNodeList.php @@ -17,6 +17,8 @@ use IteratorAggregate; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @template-implements IteratorAggregate diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/PHPUnit.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/PHPUnit.php index febe11df..ddae10a9 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/PHPUnit.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/PHPUnit.php @@ -10,6 +10,8 @@ namespace PHPUnit\TextUI\XmlConfiguration; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable @@ -25,6 +27,7 @@ final class PHPUnit private readonly bool $displayDetailsOnIncompleteTests; private readonly bool $displayDetailsOnSkippedTests; private readonly bool $displayDetailsOnTestsThatTriggerDeprecations; + private readonly bool $displayDetailsOnPhpunitDeprecations; private readonly bool $displayDetailsOnTestsThatTriggerErrors; private readonly bool $displayDetailsOnTestsThatTriggerNotices; private readonly bool $displayDetailsOnTestsThatTriggerWarnings; @@ -33,6 +36,7 @@ final class PHPUnit private readonly ?string $bootstrap; private readonly bool $processIsolation; private readonly bool $failOnDeprecation; + private readonly bool $failOnPhpunitDeprecation; private readonly bool $failOnEmptyTestSuite; private readonly bool $failOnIncomplete; private readonly bool $failOnNotice; @@ -76,7 +80,7 @@ final class PHPUnit /** * @psalm-param ?non-empty-string $extensionsDirectory */ - public function __construct(?string $cacheDirectory, bool $cacheResult, ?string $cacheResultFile, int|string $columns, string $colors, bool $stderr, bool $displayDetailsOnIncompleteTests, bool $displayDetailsOnSkippedTests, bool $displayDetailsOnTestsThatTriggerDeprecations, bool $displayDetailsOnTestsThatTriggerErrors, bool $displayDetailsOnTestsThatTriggerNotices, bool $displayDetailsOnTestsThatTriggerWarnings, bool $reverseDefectList, bool $requireCoverageMetadata, ?string $bootstrap, bool $processIsolation, bool $failOnDeprecation, bool $failOnEmptyTestSuite, bool $failOnIncomplete, bool $failOnNotice, bool $failOnRisky, bool $failOnSkipped, bool $failOnWarning, bool $stopOnDefect, bool $stopOnDeprecation, bool $stopOnError, bool $stopOnFailure, bool $stopOnIncomplete, bool $stopOnNotice, bool $stopOnRisky, bool $stopOnSkipped, bool $stopOnWarning, ?string $extensionsDirectory, bool $beStrictAboutChangesToGlobalState, bool $beStrictAboutOutputDuringTests, bool $beStrictAboutTestsThatDoNotTestAnything, bool $beStrictAboutCoverageMetadata, bool $enforceTimeLimit, int $defaultTimeLimit, int $timeoutForSmallTests, int $timeoutForMediumTests, int $timeoutForLargeTests, ?string $defaultTestSuite, int $executionOrder, bool $resolveDependencies, bool $defectsFirst, bool $backupGlobals, bool $backupStaticProperties, bool $registerMockObjectsFromTestArgumentsRecursively, bool $testdoxPrinter, bool $controlGarbageCollector, int $numberOfTestsBeforeGarbageCollection) + public function __construct(?string $cacheDirectory, bool $cacheResult, ?string $cacheResultFile, int|string $columns, string $colors, bool $stderr, bool $displayDetailsOnIncompleteTests, bool $displayDetailsOnSkippedTests, bool $displayDetailsOnTestsThatTriggerDeprecations, bool $displayDetailsOnPhpunitDeprecations, bool $displayDetailsOnTestsThatTriggerErrors, bool $displayDetailsOnTestsThatTriggerNotices, bool $displayDetailsOnTestsThatTriggerWarnings, bool $reverseDefectList, bool $requireCoverageMetadata, ?string $bootstrap, bool $processIsolation, bool $failOnDeprecation, bool $failOnPhpunitDeprecation, bool $failOnEmptyTestSuite, bool $failOnIncomplete, bool $failOnNotice, bool $failOnRisky, bool $failOnSkipped, bool $failOnWarning, bool $stopOnDefect, bool $stopOnDeprecation, bool $stopOnError, bool $stopOnFailure, bool $stopOnIncomplete, bool $stopOnNotice, bool $stopOnRisky, bool $stopOnSkipped, bool $stopOnWarning, ?string $extensionsDirectory, bool $beStrictAboutChangesToGlobalState, bool $beStrictAboutOutputDuringTests, bool $beStrictAboutTestsThatDoNotTestAnything, bool $beStrictAboutCoverageMetadata, bool $enforceTimeLimit, int $defaultTimeLimit, int $timeoutForSmallTests, int $timeoutForMediumTests, int $timeoutForLargeTests, ?string $defaultTestSuite, int $executionOrder, bool $resolveDependencies, bool $defectsFirst, bool $backupGlobals, bool $backupStaticProperties, bool $registerMockObjectsFromTestArgumentsRecursively, bool $testdoxPrinter, bool $controlGarbageCollector, int $numberOfTestsBeforeGarbageCollection) { $this->cacheDirectory = $cacheDirectory; $this->cacheResult = $cacheResult; @@ -87,6 +91,7 @@ public function __construct(?string $cacheDirectory, bool $cacheResult, ?string $this->displayDetailsOnIncompleteTests = $displayDetailsOnIncompleteTests; $this->displayDetailsOnSkippedTests = $displayDetailsOnSkippedTests; $this->displayDetailsOnTestsThatTriggerDeprecations = $displayDetailsOnTestsThatTriggerDeprecations; + $this->displayDetailsOnPhpunitDeprecations = $displayDetailsOnPhpunitDeprecations; $this->displayDetailsOnTestsThatTriggerErrors = $displayDetailsOnTestsThatTriggerErrors; $this->displayDetailsOnTestsThatTriggerNotices = $displayDetailsOnTestsThatTriggerNotices; $this->displayDetailsOnTestsThatTriggerWarnings = $displayDetailsOnTestsThatTriggerWarnings; @@ -95,6 +100,7 @@ public function __construct(?string $cacheDirectory, bool $cacheResult, ?string $this->bootstrap = $bootstrap; $this->processIsolation = $processIsolation; $this->failOnDeprecation = $failOnDeprecation; + $this->failOnPhpunitDeprecation = $failOnPhpunitDeprecation; $this->failOnEmptyTestSuite = $failOnEmptyTestSuite; $this->failOnIncomplete = $failOnIncomplete; $this->failOnNotice = $failOnNotice; @@ -211,6 +217,11 @@ public function displayDetailsOnTestsThatTriggerDeprecations(): bool return $this->displayDetailsOnTestsThatTriggerDeprecations; } + public function displayDetailsOnPhpunitDeprecations(): bool + { + return $this->displayDetailsOnPhpunitDeprecations; + } + public function displayDetailsOnTestsThatTriggerErrors(): bool { return $this->displayDetailsOnTestsThatTriggerErrors; @@ -266,6 +277,11 @@ public function failOnDeprecation(): bool return $this->failOnDeprecation; } + public function failOnPhpunitDeprecation(): bool + { + return $this->failOnPhpunitDeprecation; + } + public function failOnEmptyTestSuite(): bool { return $this->failOnEmptyTestSuite; diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/FailedSchemaDetectionResult.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/FailedSchemaDetectionResult.php index 82124a2c..ef413ca0 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/FailedSchemaDetectionResult.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/FailedSchemaDetectionResult.php @@ -10,6 +10,8 @@ namespace PHPUnit\TextUI\XmlConfiguration; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/SchemaDetectionResult.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/SchemaDetectionResult.php index 09182612..7f036f9f 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/SchemaDetectionResult.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/SchemaDetectionResult.php @@ -12,6 +12,8 @@ use PHPUnit\Util\Xml\XmlException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/SchemaDetector.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/SchemaDetector.php index ca2ee8f2..9ad74c61 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/SchemaDetector.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/SchemaDetector.php @@ -13,6 +13,8 @@ use PHPUnit\Util\Xml\XmlException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class SchemaDetector diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/SuccessfulSchemaDetectionResult.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/SuccessfulSchemaDetectionResult.php index 002dfe87..d7eabb11 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/SuccessfulSchemaDetectionResult.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaDetector/SuccessfulSchemaDetectionResult.php @@ -10,6 +10,8 @@ namespace PHPUnit\TextUI\XmlConfiguration; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaFinder.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaFinder.php index b6b620d9..b86e8d80 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaFinder.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/SchemaFinder.php @@ -18,6 +18,8 @@ use PHPUnit\Runner\Version; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class SchemaFinder diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/TestSuiteMapper.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/TestSuiteMapper.php index 530ae10b..7721ca4e 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/TestSuiteMapper.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/TestSuiteMapper.php @@ -27,6 +27,8 @@ use SebastianBergmann\FileIterator\Facade; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteMapper diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Validator/ValidationResult.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Validator/ValidationResult.php index 66b9aaab..d62a38b9 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Validator/ValidationResult.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Validator/ValidationResult.php @@ -9,11 +9,14 @@ */ namespace PHPUnit\TextUI\XmlConfiguration; +use const PHP_EOL; use function sprintf; use function trim; use LibXMLError; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @psalm-immutable diff --git a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Validator/Validator.php b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Validator/Validator.php index b93f961a..7f7889e0 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Validator/Validator.php +++ b/vendor/phpunit/phpunit/src/TextUI/Configuration/Xml/Validator/Validator.php @@ -16,6 +16,8 @@ use DOMDocument; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Validator diff --git a/vendor/phpunit/phpunit/src/TextUI/Exception/DirectoryDoesNotExistException.php b/vendor/phpunit/phpunit/src/TextUI/Exception/DirectoryDoesNotExistException.php deleted file mode 100644 index e3b11dea..00000000 --- a/vendor/phpunit/phpunit/src/TextUI/Exception/DirectoryDoesNotExistException.php +++ /dev/null @@ -1,29 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\TextUI; - -use function sprintf; -use RuntimeException; - -/** - * @internal This class is not covered by the backward compatibility promise for PHPUnit - */ -final class DirectoryDoesNotExistException extends RuntimeException implements Exception -{ - public function __construct(string $directory) - { - parent::__construct( - sprintf( - 'Directory "%s" does not exist and could not be created', - $directory, - ), - ); - } -} diff --git a/vendor/phpunit/phpunit/src/TextUI/Exception/Exception.php b/vendor/phpunit/phpunit/src/TextUI/Exception/Exception.php index ee2ae4ff..6b370ca0 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Exception/Exception.php +++ b/vendor/phpunit/phpunit/src/TextUI/Exception/Exception.php @@ -12,6 +12,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This interface is not covered by the backward compatibility promise for PHPUnit */ interface Exception extends Throwable diff --git a/vendor/phpunit/phpunit/src/TextUI/Exception/ExtensionsNotConfiguredException.php b/vendor/phpunit/phpunit/src/TextUI/Exception/ExtensionsNotConfiguredException.php index c192e753..40cfe3f0 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Exception/ExtensionsNotConfiguredException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Exception/ExtensionsNotConfiguredException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ExtensionsNotConfiguredException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Exception/InvalidSocketException.php b/vendor/phpunit/phpunit/src/TextUI/Exception/InvalidSocketException.php index 6c9e9216..441afd2a 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Exception/InvalidSocketException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Exception/InvalidSocketException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class InvalidSocketException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Exception/ReflectionException.php b/vendor/phpunit/phpunit/src/TextUI/Exception/ReflectionException.php index 5e041444..7c5541ba 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Exception/ReflectionException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Exception/ReflectionException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ReflectionException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Exception/RuntimeException.php b/vendor/phpunit/phpunit/src/TextUI/Exception/RuntimeException.php index 61902319..875a0487 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Exception/RuntimeException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Exception/RuntimeException.php @@ -10,6 +10,8 @@ namespace PHPUnit\TextUI; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class RuntimeException extends \RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Exception/TestDirectoryNotFoundException.php b/vendor/phpunit/phpunit/src/TextUI/Exception/TestDirectoryNotFoundException.php index da15966c..9b35390c 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Exception/TestDirectoryNotFoundException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Exception/TestDirectoryNotFoundException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestDirectoryNotFoundException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Exception/TestFileNotFoundException.php b/vendor/phpunit/phpunit/src/TextUI/Exception/TestFileNotFoundException.php index 247690d0..46c9df80 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Exception/TestFileNotFoundException.php +++ b/vendor/phpunit/phpunit/src/TextUI/Exception/TestFileNotFoundException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestFileNotFoundException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/TextUI/Help.php b/vendor/phpunit/phpunit/src/TextUI/Help.php index 4270b346..4e2b6afa 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Help.php +++ b/vendor/phpunit/phpunit/src/TextUI/Help.php @@ -23,6 +23,8 @@ use SebastianBergmann\Environment\Console; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Help @@ -210,6 +212,7 @@ private function elements(): array ['arg' => '--fail-on-warning', 'desc' => 'Signal failure using shell exit code when a warning was triggered'], ['arg' => '--fail-on-risky', 'desc' => 'Signal failure using shell exit code when a test was considered risky'], ['arg' => '--fail-on-deprecation', 'desc' => 'Signal failure using shell exit code when a deprecation was triggered'], + ['arg' => '--fail-on-phpunit-deprecation', 'desc' => 'Signal failure using shell exit code when a PHPUnit deprecation was triggered'], ['arg' => '--fail-on-notice', 'desc' => 'Signal failure using shell exit code when a notice was triggered'], ['arg' => '--fail-on-skipped', 'desc' => 'Signal failure using shell exit code when a test was skipped'], ['arg' => '--fail-on-incomplete', 'desc' => 'Signal failure using shell exit code when a test was marked incomplete'], @@ -238,6 +241,7 @@ private function elements(): array ['arg' => '--display-incomplete', 'desc' => 'Display details for incomplete tests'], ['arg' => '--display-skipped', 'desc' => 'Display details for skipped tests'], ['arg' => '--display-deprecations', 'desc' => 'Display details for deprecations triggered by tests'], + ['arg' => '--display-phpunit-deprecations', 'desc' => 'Display details for PHPUnit deprecations'], ['arg' => '--display-errors', 'desc' => 'Display details for errors triggered by tests'], ['arg' => '--display-notices', 'desc' => 'Display details for notices triggered by tests'], ['arg' => '--display-warnings', 'desc' => 'Display details for warnings triggered by tests'], @@ -268,6 +272,8 @@ private function elements(): array ['arg' => '--coverage-html ', 'desc' => 'Write code coverage report in HTML format to directory'], ['arg' => '--coverage-php ', 'desc' => 'Write serialized code coverage data to file'], ['arg' => '--coverage-text=', 'desc' => 'Write code coverage report in text format to file [default: standard output]'], + ['arg' => '--only-summary-for-coverage-text', 'desc' => 'Option for code coverage report in text format: only show summary'], + ['arg' => '--show-uncovered-for-coverage-text', 'desc' => 'Option for code coverage report in text format: show uncovered files'], ['arg' => '--coverage-xml ', 'desc' => 'Write code coverage report in XML format to directory'], ['arg' => '--warm-coverage-cache', 'desc' => 'Warm static analysis cache'], ['arg' => '--coverage-filter ', 'desc' => 'Include in code coverage reporting'], diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/ProgressPrinter.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/ProgressPrinter.php index 03001477..ec8d3b6c 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/ProgressPrinter.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/ProgressPrinter.php @@ -33,6 +33,8 @@ use PHPUnit\Util\Color; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ProgressPrinter diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/BeforeTestClassMethodErroredSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/BeforeTestClassMethodErroredSubscriber.php index 742aa95c..85e63159 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/BeforeTestClassMethodErroredSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/BeforeTestClassMethodErroredSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\BeforeFirstTestMethodErroredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class BeforeTestClassMethodErroredSubscriber extends Subscriber implements BeforeFirstTestMethodErroredSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/Subscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/Subscriber.php index 46aa73d2..f238ed22 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/Subscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/Subscriber.php @@ -10,6 +10,8 @@ namespace PHPUnit\TextUI\Output\Default\ProgressPrinter; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ abstract class Subscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestConsideredRiskySubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestConsideredRiskySubscriber.php index a18303bc..f72056de 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestConsideredRiskySubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestConsideredRiskySubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\ConsideredRiskySubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestConsideredRiskySubscriber extends Subscriber implements ConsideredRiskySubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestErroredSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestErroredSubscriber.php index d9fbacd7..2c07b789 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestErroredSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestErroredSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\ErroredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestErroredSubscriber extends Subscriber implements ErroredSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestFailedSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestFailedSubscriber.php index 48ed642c..27f33037 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestFailedSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestFailedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\FailedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestFailedSubscriber extends Subscriber implements FailedSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestFinishedSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestFinishedSubscriber.php index 6322c128..fa4d95cb 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestFinishedSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestFinishedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\FinishedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestFinishedSubscriber extends Subscriber implements FinishedSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestMarkedIncompleteSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestMarkedIncompleteSubscriber.php index aa3bdb92..2be2d1f1 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestMarkedIncompleteSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestMarkedIncompleteSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\MarkedIncompleteSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestMarkedIncompleteSubscriber extends Subscriber implements MarkedIncompleteSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestPreparedSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestPreparedSubscriber.php index 0924178e..2225ea0e 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestPreparedSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestPreparedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PreparedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestPreparedSubscriber extends Subscriber implements PreparedSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestRunnerExecutionStartedSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestRunnerExecutionStartedSubscriber.php index 6735462c..666dcc93 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestRunnerExecutionStartedSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestRunnerExecutionStartedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\TestRunner\ExecutionStartedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestRunnerExecutionStartedSubscriber extends Subscriber implements ExecutionStartedSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestSkippedSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestSkippedSubscriber.php index c7b29fe2..2b05a753 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestSkippedSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestSkippedSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\SkippedSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSkippedSubscriber extends Subscriber implements SkippedSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredDeprecationSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredDeprecationSubscriber.php index f734cf55..d7eb7970 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredDeprecationSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredDeprecationSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\DeprecationTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredDeprecationSubscriber extends Subscriber implements DeprecationTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredErrorSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredErrorSubscriber.php index 9c4cb0b0..049a1e6d 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredErrorSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredErrorSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\ErrorTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredErrorSubscriber extends Subscriber implements ErrorTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredNoticeSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredNoticeSubscriber.php index 410fa531..e396c961 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredNoticeSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredNoticeSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\NoticeTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredNoticeSubscriber extends Subscriber implements NoticeTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpDeprecationSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpDeprecationSubscriber.php index 97de0032..65a24208 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpDeprecationSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpDeprecationSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpDeprecationTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpDeprecationSubscriber extends Subscriber implements PhpDeprecationTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpNoticeSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpNoticeSubscriber.php index 861e2b8c..f783fbc1 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpNoticeSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpNoticeSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpNoticeTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpNoticeSubscriber extends Subscriber implements PhpNoticeTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpWarningSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpWarningSubscriber.php index 87bec210..18e723bd 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpWarningSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpWarningSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpWarningTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpWarningSubscriber extends Subscriber implements PhpWarningTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpunitDeprecationSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpunitDeprecationSubscriber.php index 8bceec7a..f273f8aa 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpunitDeprecationSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpunitDeprecationSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpunitDeprecationTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpunitDeprecationSubscriber extends Subscriber implements PhpunitDeprecationTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpunitWarningSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpunitWarningSubscriber.php index 69a94585..12087c4d 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpunitWarningSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpunitWarningSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\PhpunitWarningTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredPhpunitWarningSubscriber extends Subscriber implements PhpunitWarningTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredWarningSubscriber.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredWarningSubscriber.php index c80a3f5a..05188dce 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredWarningSubscriber.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredWarningSubscriber.php @@ -13,6 +13,8 @@ use PHPUnit\Event\Test\WarningTriggeredSubscriber; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestTriggeredWarningSubscriber extends Subscriber implements WarningTriggeredSubscriber diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ResultPrinter.php b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ResultPrinter.php index ea01b509..2d7f7bbd 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Default/ResultPrinter.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Default/ResultPrinter.php @@ -43,6 +43,8 @@ use PHPUnit\TextUI\Output\Printer; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ResultPrinter diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Facade.php b/vendor/phpunit/phpunit/src/TextUI/Output/Facade.php index 4a7f0997..f08b2d7b 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Facade.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Facade.php @@ -9,15 +9,17 @@ */ namespace PHPUnit\TextUI\Output; +use const PHP_EOL; use function assert; use PHPUnit\Event\EventFacadeIsSealedException; use PHPUnit\Event\Facade as EventFacade; use PHPUnit\Event\UnknownSubscriberTypeException; use PHPUnit\Logging\TeamCity\TeamCityLogger; use PHPUnit\Logging\TestDox\TestResultCollection; +use PHPUnit\Runner\DirectoryDoesNotExistException; use PHPUnit\TestRunner\TestResult\TestResult; +use PHPUnit\TextUI\CannotOpenSocketException; use PHPUnit\TextUI\Configuration\Configuration; -use PHPUnit\TextUI\DirectoryDoesNotExistException; use PHPUnit\TextUI\InvalidSocketException; use PHPUnit\TextUI\Output\Default\ProgressPrinter\ProgressPrinter as DefaultProgressPrinter; use PHPUnit\TextUI\Output\Default\ResultPrinter as DefaultResultPrinter; @@ -27,6 +29,8 @@ use SebastianBergmann\Timer\ResourceUsageFormatter; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Facade @@ -101,6 +105,7 @@ public static function printResult(TestResult $result, ?array $testDoxResult, Du } /** + * @throws CannotOpenSocketException * @throws DirectoryDoesNotExistException * @throws InvalidSocketException */ @@ -201,7 +206,7 @@ private static function createResultPrinter(Configuration $configuration): void self::$printer, true, true, - true, + $configuration->displayDetailsOnPhpunitDeprecations(), false, false, true, @@ -234,7 +239,7 @@ private static function createResultPrinter(Configuration $configuration): void self::$printer, true, true, - true, + $configuration->displayDetailsOnPhpunitDeprecations(), true, true, true, diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Printer/DefaultPrinter.php b/vendor/phpunit/phpunit/src/TextUI/Output/Printer/DefaultPrinter.php index 6db31798..38f3b2b5 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Printer/DefaultPrinter.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Printer/DefaultPrinter.php @@ -17,14 +17,16 @@ use function fopen; use function fsockopen; use function fwrite; -use function sprintf; use function str_replace; use function str_starts_with; -use PHPUnit\TextUI\DirectoryDoesNotExistException; +use PHPUnit\Runner\DirectoryDoesNotExistException; +use PHPUnit\TextUI\CannotOpenSocketException; use PHPUnit\TextUI\InvalidSocketException; use PHPUnit\Util\Filesystem; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class DefaultPrinter implements Printer @@ -37,6 +39,7 @@ final class DefaultPrinter implements Printer private bool $isOpen; /** + * @throws CannotOpenSocketException * @throws DirectoryDoesNotExistException * @throws InvalidSocketException */ @@ -46,6 +49,7 @@ public static function from(string $out): self } /** + * @throws CannotOpenSocketException * @throws DirectoryDoesNotExistException * @throws InvalidSocketException */ @@ -55,6 +59,7 @@ public static function standardOutput(): self } /** + * @throws CannotOpenSocketException * @throws DirectoryDoesNotExistException * @throws InvalidSocketException */ @@ -64,6 +69,7 @@ public static function standardError(): self } /** + * @throws CannotOpenSocketException * @throws DirectoryDoesNotExistException * @throws InvalidSocketException */ @@ -75,15 +81,16 @@ private function __construct(string $out) $tmp = explode(':', str_replace('socket://', '', $out)); if (count($tmp) !== 2) { - throw new InvalidSocketException( - sprintf( - '"%s" does not match "socket://hostname:port" format', - $out, - ), - ); + throw new InvalidSocketException($out); + } + + $stream = @fsockopen($tmp[0], (int) $tmp[1]); + + if ($stream === false) { + throw new CannotOpenSocketException($tmp[0], (int) $tmp[1]); } - $this->stream = fsockopen($tmp[0], (int) $tmp[1]); + $this->stream = $stream; $this->isOpen = true; return; diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Printer/NullPrinter.php b/vendor/phpunit/phpunit/src/TextUI/Output/Printer/NullPrinter.php index e4a50101..cf27e6b3 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Printer/NullPrinter.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Printer/NullPrinter.php @@ -10,6 +10,8 @@ namespace PHPUnit\TextUI\Output; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class NullPrinter implements Printer diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/Printer/Printer.php b/vendor/phpunit/phpunit/src/TextUI/Output/Printer/Printer.php index bc2e8bb5..c9b0fb97 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/Printer/Printer.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/Printer/Printer.php @@ -10,6 +10,8 @@ namespace PHPUnit\TextUI\Output; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This interface is not covered by the backward compatibility promise for PHPUnit */ interface Printer diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/SummaryPrinter.php b/vendor/phpunit/phpunit/src/TextUI/Output/SummaryPrinter.php index 7168815c..0c540bb5 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/SummaryPrinter.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/SummaryPrinter.php @@ -9,11 +9,14 @@ */ namespace PHPUnit\TextUI\Output; +use const PHP_EOL; use function sprintf; use PHPUnit\TestRunner\TestResult\TestResult; use PHPUnit\Util\Color; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class SummaryPrinter @@ -110,7 +113,8 @@ public function print(TestResult $result): void $this->printCountString($result->numberOfErrors(), 'Errors', $color); $this->printCountString($result->numberOfTestFailedEvents(), 'Failures', $color); $this->printCountString($result->numberOfWarnings(), 'Warnings', $color); - $this->printCountString($result->numberOfDeprecations(), 'Deprecations', $color); + $this->printCountString($result->numberOfPhpOrUserDeprecations(), 'Deprecations', $color); + $this->printCountString($result->numberOfPhpunitDeprecations(), 'PHPUnit Deprecations', $color); $this->printCountString($result->numberOfNotices(), 'Notices', $color); $this->printCountString($result->numberOfTestSuiteSkippedEvents() + $result->numberOfTestSkippedEvents(), 'Skipped', $color); $this->printCountString($result->numberOfTestMarkedIncompleteEvents(), 'Incomplete', $color); diff --git a/vendor/phpunit/phpunit/src/TextUI/Output/TestDox/ResultPrinter.php b/vendor/phpunit/phpunit/src/TextUI/Output/TestDox/ResultPrinter.php index 8959a4f8..d61d2911 100644 --- a/vendor/phpunit/phpunit/src/TextUI/Output/TestDox/ResultPrinter.php +++ b/vendor/phpunit/phpunit/src/TextUI/Output/TestDox/ResultPrinter.php @@ -27,6 +27,8 @@ use PHPUnit\Util\Color; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ResultPrinter diff --git a/vendor/phpunit/phpunit/src/TextUI/ShellExitCodeCalculator.php b/vendor/phpunit/phpunit/src/TextUI/ShellExitCodeCalculator.php index 38fe77e7..6a1aad60 100644 --- a/vendor/phpunit/phpunit/src/TextUI/ShellExitCodeCalculator.php +++ b/vendor/phpunit/phpunit/src/TextUI/ShellExitCodeCalculator.php @@ -12,6 +12,8 @@ use PHPUnit\TestRunner\TestResult\TestResult; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ShellExitCodeCalculator @@ -20,7 +22,7 @@ final class ShellExitCodeCalculator private const FAILURE_EXIT = 1; private const EXCEPTION_EXIT = 2; - public function calculate(bool $failOnDeprecation, bool $failOnEmptyTestSuite, bool $failOnIncomplete, bool $failOnNotice, bool $failOnRisky, bool $failOnSkipped, bool $failOnWarning, TestResult $result): int + public function calculate(bool $failOnDeprecation, bool $failOnPhpunitDeprecation, bool $failOnEmptyTestSuite, bool $failOnIncomplete, bool $failOnNotice, bool $failOnRisky, bool $failOnSkipped, bool $failOnWarning, TestResult $result): int { $returnCode = self::FAILURE_EXIT; @@ -33,7 +35,11 @@ public function calculate(bool $failOnDeprecation, bool $failOnEmptyTestSuite, b } if ($result->wasSuccessfulIgnoringPhpunitWarnings()) { - if ($failOnDeprecation && $result->hasDeprecations()) { + if ($failOnDeprecation && $result->hasPhpOrUserDeprecations()) { + $returnCode = self::FAILURE_EXIT; + } + + if ($failOnPhpunitDeprecation && $result->hasPhpunitDeprecations()) { $returnCode = self::FAILURE_EXIT; } diff --git a/vendor/phpunit/phpunit/src/TextUI/TestRunner.php b/vendor/phpunit/phpunit/src/TextUI/TestRunner.php index 724e4041..2363ca29 100644 --- a/vendor/phpunit/phpunit/src/TextUI/TestRunner.php +++ b/vendor/phpunit/phpunit/src/TextUI/TestRunner.php @@ -18,6 +18,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestRunner diff --git a/vendor/phpunit/phpunit/src/TextUI/TestSuiteFilterProcessor.php b/vendor/phpunit/phpunit/src/TextUI/TestSuiteFilterProcessor.php index 5d597e95..63ba1b38 100644 --- a/vendor/phpunit/phpunit/src/TextUI/TestSuiteFilterProcessor.php +++ b/vendor/phpunit/phpunit/src/TextUI/TestSuiteFilterProcessor.php @@ -17,6 +17,8 @@ use PHPUnit\TextUI\Configuration\FilterNotConfiguredException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class TestSuiteFilterProcessor diff --git a/vendor/phpunit/phpunit/src/Util/Cloner.php b/vendor/phpunit/phpunit/src/Util/Cloner.php index 16d2bead..7e3e5aa0 100644 --- a/vendor/phpunit/phpunit/src/Util/Cloner.php +++ b/vendor/phpunit/phpunit/src/Util/Cloner.php @@ -12,6 +12,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Cloner diff --git a/vendor/phpunit/phpunit/src/Util/Color.php b/vendor/phpunit/phpunit/src/Util/Color.php index 0f6bee49..0e3642ca 100644 --- a/vendor/phpunit/phpunit/src/Util/Color.php +++ b/vendor/phpunit/phpunit/src/Util/Color.php @@ -26,6 +26,8 @@ use function trim; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Color diff --git a/vendor/phpunit/phpunit/src/Util/Exception/Exception.php b/vendor/phpunit/phpunit/src/Util/Exception/Exception.php index a66f00b0..58f42db7 100644 --- a/vendor/phpunit/phpunit/src/Util/Exception/Exception.php +++ b/vendor/phpunit/phpunit/src/Util/Exception/Exception.php @@ -12,6 +12,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This interface is not covered by the backward compatibility promise for PHPUnit */ interface Exception extends Throwable diff --git a/vendor/phpunit/phpunit/src/Util/Exception/InvalidDirectoryException.php b/vendor/phpunit/phpunit/src/Util/Exception/InvalidDirectoryException.php index bdfa84b5..623af2de 100644 --- a/vendor/phpunit/phpunit/src/Util/Exception/InvalidDirectoryException.php +++ b/vendor/phpunit/phpunit/src/Util/Exception/InvalidDirectoryException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class InvalidDirectoryException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Util/Exception/InvalidJsonException.php b/vendor/phpunit/phpunit/src/Util/Exception/InvalidJsonException.php index 3d30ce4b..224f7115 100644 --- a/vendor/phpunit/phpunit/src/Util/Exception/InvalidJsonException.php +++ b/vendor/phpunit/phpunit/src/Util/Exception/InvalidJsonException.php @@ -12,6 +12,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class InvalidJsonException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Util/Exception/InvalidVersionOperatorException.php b/vendor/phpunit/phpunit/src/Util/Exception/InvalidVersionOperatorException.php index 49b50e4b..bc2fe9a0 100644 --- a/vendor/phpunit/phpunit/src/Util/Exception/InvalidVersionOperatorException.php +++ b/vendor/phpunit/phpunit/src/Util/Exception/InvalidVersionOperatorException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class InvalidVersionOperatorException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Util/Exception/PhpProcessException.php b/vendor/phpunit/phpunit/src/Util/Exception/PhpProcessException.php index 0a6b6ee7..05069ef0 100644 --- a/vendor/phpunit/phpunit/src/Util/Exception/PhpProcessException.php +++ b/vendor/phpunit/phpunit/src/Util/Exception/PhpProcessException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class PhpProcessException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Util/Exception/XmlException.php b/vendor/phpunit/phpunit/src/Util/Exception/XmlException.php index f2dc45d3..127e1eca 100644 --- a/vendor/phpunit/phpunit/src/Util/Exception/XmlException.php +++ b/vendor/phpunit/phpunit/src/Util/Exception/XmlException.php @@ -13,6 +13,8 @@ use RuntimeException; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class XmlException extends RuntimeException implements Exception diff --git a/vendor/phpunit/phpunit/src/Util/ExcludeList.php b/vendor/phpunit/phpunit/src/Util/ExcludeList.php index f0f7f23a..88e80ba4 100644 --- a/vendor/phpunit/phpunit/src/Util/ExcludeList.php +++ b/vendor/phpunit/phpunit/src/Util/ExcludeList.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\Util; +use const PHP_OS_FAMILY; use function class_exists; use function defined; use function dirname; diff --git a/vendor/phpunit/phpunit/src/Util/Exporter.php b/vendor/phpunit/phpunit/src/Util/Exporter.php index 49e42c63..20cf6f4b 100644 --- a/vendor/phpunit/phpunit/src/Util/Exporter.php +++ b/vendor/phpunit/phpunit/src/Util/Exporter.php @@ -14,6 +14,8 @@ use SebastianBergmann\RecursionContext\Context; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @deprecated diff --git a/vendor/phpunit/phpunit/src/Util/Filesystem.php b/vendor/phpunit/phpunit/src/Util/Filesystem.php index d683696a..948ee285 100644 --- a/vendor/phpunit/phpunit/src/Util/Filesystem.php +++ b/vendor/phpunit/phpunit/src/Util/Filesystem.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\Util; +use const DIRECTORY_SEPARATOR; use function basename; use function dirname; use function is_dir; @@ -17,6 +18,8 @@ use function str_starts_with; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Filesystem diff --git a/vendor/phpunit/phpunit/src/Util/Filter.php b/vendor/phpunit/phpunit/src/Util/Filter.php index 2faa3b91..424e35af 100644 --- a/vendor/phpunit/phpunit/src/Util/Filter.php +++ b/vendor/phpunit/phpunit/src/Util/Filter.php @@ -21,6 +21,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Filter diff --git a/vendor/phpunit/phpunit/src/Util/GlobalState.php b/vendor/phpunit/phpunit/src/Util/GlobalState.php index a364bca6..0e298392 100644 --- a/vendor/phpunit/phpunit/src/Util/GlobalState.php +++ b/vendor/phpunit/phpunit/src/Util/GlobalState.php @@ -32,6 +32,8 @@ use Closure; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class GlobalState diff --git a/vendor/phpunit/phpunit/src/Util/Json.php b/vendor/phpunit/phpunit/src/Util/Json.php index cd52c7cd..a9b5e2dc 100644 --- a/vendor/phpunit/phpunit/src/Util/Json.php +++ b/vendor/phpunit/phpunit/src/Util/Json.php @@ -12,15 +12,17 @@ use const JSON_PRETTY_PRINT; use const JSON_UNESCAPED_SLASHES; use const JSON_UNESCAPED_UNICODE; -use function count; -use function is_array; +use const SORT_STRING; use function is_object; +use function is_scalar; use function json_decode; use function json_encode; use function json_last_error; use function ksort; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Json @@ -70,24 +72,31 @@ public static function canonicalize(string $json): array */ private static function recursiveSort(mixed &$json): void { - if (!is_array($json)) { - // If the object is not empty, change it to an associative array - // so we can sort the keys (and we will still re-encode it - // correctly, since PHP encodes associative arrays as JSON objects.) - // But EMPTY objects MUST remain empty objects. (Otherwise we will - // re-encode it as a JSON array rather than a JSON object.) - // See #2919. - if (is_object($json) && count((array) $json) > 0) { - $json = (array) $json; - } else { - return; - } + // Nulls, empty arrays, and scalars need no further handling. + if (!$json || is_scalar($json)) { + return; } - ksort($json); + $isObject = is_object($json); + + if ($isObject) { + // Objects need to be sorted during canonicalization to ensure + // correct comparsion since JSON objects are unordered. It must be + // kept as an object so that the value correctly stays as a JSON + // object instead of potentially being converted to an array. This + // approach ensures that numeric string JSON keys are preserved and + // don't risk being flattened due to PHP's array semantics. + // See #2919, #4584, #4674 + $json = (array) $json; + ksort($json, SORT_STRING); + } foreach ($json as &$value) { self::recursiveSort($value); } + + if ($isObject) { + $json = (object) $json; + } } } diff --git a/vendor/phpunit/phpunit/src/Util/PHP/AbstractPhpProcess.php b/vendor/phpunit/phpunit/src/Util/PHP/AbstractPhpProcess.php index 1a901099..178df116 100644 --- a/vendor/phpunit/phpunit/src/Util/PHP/AbstractPhpProcess.php +++ b/vendor/phpunit/phpunit/src/Util/PHP/AbstractPhpProcess.php @@ -38,6 +38,8 @@ use SebastianBergmann\Environment\Runtime; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ abstract class AbstractPhpProcess diff --git a/vendor/phpunit/phpunit/src/Util/PHP/DefaultPhpProcess.php b/vendor/phpunit/phpunit/src/Util/PHP/DefaultPhpProcess.php index 963109de..e933c24e 100644 --- a/vendor/phpunit/phpunit/src/Util/PHP/DefaultPhpProcess.php +++ b/vendor/phpunit/phpunit/src/Util/PHP/DefaultPhpProcess.php @@ -24,6 +24,8 @@ use PHPUnit\Framework\Exception; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ class DefaultPhpProcess extends AbstractPhpProcess diff --git a/vendor/phpunit/phpunit/src/Util/Reflection.php b/vendor/phpunit/phpunit/src/Util/Reflection.php index 421fac47..0aac9259 100644 --- a/vendor/phpunit/phpunit/src/Util/Reflection.php +++ b/vendor/phpunit/phpunit/src/Util/Reflection.php @@ -19,6 +19,8 @@ use ReflectionMethod; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Reflection diff --git a/vendor/phpunit/phpunit/src/Util/Test.php b/vendor/phpunit/phpunit/src/Util/Test.php index 56333f95..51d90769 100644 --- a/vendor/phpunit/phpunit/src/Util/Test.php +++ b/vendor/phpunit/phpunit/src/Util/Test.php @@ -14,6 +14,8 @@ use ReflectionMethod; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Test diff --git a/vendor/phpunit/phpunit/src/Util/ThrowableToStringMapper.php b/vendor/phpunit/phpunit/src/Util/ThrowableToStringMapper.php index 358b7703..a0c1289a 100644 --- a/vendor/phpunit/phpunit/src/Util/ThrowableToStringMapper.php +++ b/vendor/phpunit/phpunit/src/Util/ThrowableToStringMapper.php @@ -17,6 +17,8 @@ use Throwable; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class ThrowableToStringMapper diff --git a/vendor/phpunit/phpunit/src/Util/Xml/Loader.php b/vendor/phpunit/phpunit/src/Util/Xml/Loader.php index 7df5fd5b..3a027619 100644 --- a/vendor/phpunit/phpunit/src/Util/Xml/Loader.php +++ b/vendor/phpunit/phpunit/src/Util/Xml/Loader.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\Util\Xml; +use const PHP_OS_FAMILY; use function chdir; use function dirname; use function error_reporting; @@ -20,6 +21,8 @@ use DOMDocument; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Loader diff --git a/vendor/phpunit/phpunit/src/Util/Xml/Xml.php b/vendor/phpunit/phpunit/src/Util/Xml/Xml.php index 5e96faa9..70c5fec7 100644 --- a/vendor/phpunit/phpunit/src/Util/Xml/Xml.php +++ b/vendor/phpunit/phpunit/src/Util/Xml/Xml.php @@ -17,6 +17,8 @@ use function strlen; /** + * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit + * * @internal This class is not covered by the backward compatibility promise for PHPUnit */ final class Xml diff --git a/vendor/psr/log/src/LoggerInterface.php b/vendor/psr/log/src/LoggerInterface.php index 8afabc90..cb4cf648 100644 --- a/vendor/psr/log/src/LoggerInterface.php +++ b/vendor/psr/log/src/LoggerInterface.php @@ -89,6 +89,7 @@ public function debug(string|\Stringable $message, array $context = []): void; /** * Logs with an arbitrary level. * + * @param mixed $level * @param mixed[] $context * * @throws \Psr\Log\InvalidArgumentException diff --git a/vendor/ramsey/uuid/composer.json b/vendor/ramsey/uuid/composer.json index 9ea4e06b..8139b54e 100644 --- a/vendor/ramsey/uuid/composer.json +++ b/vendor/ramsey/uuid/composer.json @@ -11,7 +11,7 @@ "require": { "php": "^8.0", "ext-json": "*", - "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11", + "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12", "ramsey/collection": "^1.2 || ^2.0" }, "require-dev": { diff --git a/vendor/ramsey/uuid/src/Math/BrickMathCalculator.php b/vendor/ramsey/uuid/src/Math/BrickMathCalculator.php index f2d86788..f065acd4 100644 --- a/vendor/ramsey/uuid/src/Math/BrickMathCalculator.php +++ b/vendor/ramsey/uuid/src/Math/BrickMathCalculator.php @@ -136,9 +136,11 @@ public function toInteger(Hexadecimal $value): IntegerObject /** * Maps ramsey/uuid rounding modes to those used by brick/math + * + * @return BrickMathRounding::* */ - private function getBrickRoundingMode(int $roundingMode): int + private function getBrickRoundingMode(int $roundingMode) { - return self::ROUNDING_MODE_MAP[$roundingMode] ?? 0; + return self::ROUNDING_MODE_MAP[$roundingMode] ?? BrickMathRounding::UNNECESSARY; } } diff --git a/vendor/sebastian/comparator/ChangeLog.md b/vendor/sebastian/comparator/ChangeLog.md index c6d122d5..d0ce173f 100644 --- a/vendor/sebastian/comparator/ChangeLog.md +++ b/vendor/sebastian/comparator/ChangeLog.md @@ -2,6 +2,12 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. +## [5.0.3] - 2024-10-18 + +### Fixed + +* Reverted [#113](https://github.com/sebastianbergmann/comparator/pull/113) as it broke backward compatibility + ## [5.0.2] - 2024-08-12 ### Fixed @@ -150,6 +156,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt * Added `SebastianBergmann\Comparator\Factory::reset()` to unregister all non-default comparators * Added support for `phpunit/phpunit-mock-objects` version `^5.0` +[5.0.3]: https://github.com/sebastianbergmann/comparator/compare/5.0.2...5.0.3 [5.0.2]: https://github.com/sebastianbergmann/comparator/compare/5.0.1...5.0.2 [5.0.1]: https://github.com/sebastianbergmann/comparator/compare/5.0.0...5.0.1 [5.0.0]: https://github.com/sebastianbergmann/comparator/compare/4.0.8...5.0.0 diff --git a/vendor/sebastian/comparator/composer.json b/vendor/sebastian/comparator/composer.json index 1886cbb5..16bf5255 100644 --- a/vendor/sebastian/comparator/composer.json +++ b/vendor/sebastian/comparator/composer.json @@ -35,7 +35,7 @@ "ext-mbstring": "*" }, "require-dev": { - "phpunit/phpunit": "^10.4" + "phpunit/phpunit": "^10.5" }, "config": { "platform": { diff --git a/vendor/sebastian/comparator/src/ArrayComparator.php b/vendor/sebastian/comparator/src/ArrayComparator.php index b2a4dc62..75508327 100644 --- a/vendor/sebastian/comparator/src/ArrayComparator.php +++ b/vendor/sebastian/comparator/src/ArrayComparator.php @@ -9,7 +9,6 @@ */ namespace SebastianBergmann\Comparator; -use function array_is_list; use function array_key_exists; use function assert; use function is_array; @@ -40,13 +39,8 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0, assert(is_array($actual)); if ($canonicalize) { - if (array_is_list($expected)) { - sort($expected); - } - - if (array_is_list($actual)) { - sort($actual); - } + sort($expected); + sort($actual); } $remaining = $actual; diff --git a/vendor/symfony/console/Application.php b/vendor/symfony/console/Application.php index b97d0872..dc710e8c 100644 --- a/vendor/symfony/console/Application.php +++ b/vendor/symfony/console/Application.php @@ -169,9 +169,9 @@ public function run(?InputInterface $input = null, ?OutputInterface $output = nu } } - $this->configureIO($input, $output); - try { + $this->configureIO($input, $output); + $exitCode = $this->doRun($input, $output); } catch (\Throwable $e) { if ($e instanceof \Exception && !$this->catchExceptions) { @@ -875,7 +875,7 @@ protected function doRenderThrowable(\Throwable $e, OutputInterface $output): vo } if (str_contains($message, "@anonymous\0")) { - $message = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $message); + $message = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)?[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $message); } $width = $this->terminal->getWidth() ? $this->terminal->getWidth() - 1 : \PHP_INT_MAX; diff --git a/vendor/symfony/console/Terminal.php b/vendor/symfony/console/Terminal.php index 3eda0376..f094aded 100644 --- a/vendor/symfony/console/Terminal.php +++ b/vendor/symfony/console/Terminal.php @@ -217,8 +217,7 @@ private static function readFromProcess(string|array $command): ?string $cp = \function_exists('sapi_windows_cp_set') ? sapi_windows_cp_get() : 0; - $process = proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true]); - if (!\is_resource($process)) { + if (!$process = @proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true])) { return null; } diff --git a/vendor/symfony/error-handler/Error/FatalError.php b/vendor/symfony/error-handler/Error/FatalError.php index d2abe062..a0657b7b 100644 --- a/vendor/symfony/error-handler/Error/FatalError.php +++ b/vendor/symfony/error-handler/Error/FatalError.php @@ -31,7 +31,7 @@ public function __construct(string $message, int $code, array $error, ?int $trac } } } elseif (null !== $traceOffset) { - if (\function_exists('xdebug_get_function_stack') && $trace = @xdebug_get_function_stack()) { + if (\function_exists('xdebug_get_function_stack') && \in_array(\ini_get('xdebug.mode'), ['develop', false], true) && $trace = @xdebug_get_function_stack()) { if (0 < $traceOffset) { array_splice($trace, -$traceOffset); } diff --git a/vendor/symfony/error-handler/ErrorHandler.php b/vendor/symfony/error-handler/ErrorHandler.php index d82ce6c7..052baf27 100644 --- a/vendor/symfony/error-handler/ErrorHandler.php +++ b/vendor/symfony/error-handler/ErrorHandler.php @@ -55,7 +55,6 @@ class ErrorHandler \E_USER_DEPRECATED => 'User Deprecated', \E_NOTICE => 'Notice', \E_USER_NOTICE => 'User Notice', - \E_STRICT => 'Runtime Notice', \E_WARNING => 'Warning', \E_USER_WARNING => 'User Warning', \E_COMPILE_WARNING => 'Compile Warning', @@ -73,7 +72,6 @@ class ErrorHandler \E_USER_DEPRECATED => [null, LogLevel::INFO], \E_NOTICE => [null, LogLevel::WARNING], \E_USER_NOTICE => [null, LogLevel::WARNING], - \E_STRICT => [null, LogLevel::WARNING], \E_WARNING => [null, LogLevel::WARNING], \E_USER_WARNING => [null, LogLevel::WARNING], \E_COMPILE_WARNING => [null, LogLevel::WARNING], @@ -181,6 +179,11 @@ public static function call(callable $function, mixed ...$arguments): mixed public function __construct(?BufferingLogger $bootstrappingLogger = null, bool $debug = false) { + if (\PHP_VERSION_ID < 80400) { + $this->levels[\E_STRICT] = 'Runtime Notice'; + $this->loggers[\E_STRICT] = [null, LogLevel::WARNING]; + } + if ($bootstrappingLogger) { $this->bootstrappingLogger = $bootstrappingLogger; $this->setDefaultLogger($bootstrappingLogger); @@ -739,6 +742,6 @@ private function cleanTrace(array $backtrace, int $type, string &$file, int &$li */ private function parseAnonymousClass(string $message): string { - return preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', static fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $message); + return preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)?[0-9a-fA-F]++/', static fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $message); } } diff --git a/vendor/symfony/error-handler/ErrorRenderer/HtmlErrorRenderer.php b/vendor/symfony/error-handler/ErrorRenderer/HtmlErrorRenderer.php index b6d76ff1..032f194d 100644 --- a/vendor/symfony/error-handler/ErrorRenderer/HtmlErrorRenderer.php +++ b/vendor/symfony/error-handler/ErrorRenderer/HtmlErrorRenderer.php @@ -61,7 +61,7 @@ public function render(\Throwable $exception): FlattenException { $headers = ['Content-Type' => 'text/html; charset='.$this->charset]; if (\is_bool($this->debug) ? $this->debug : ($this->debug)($exception)) { - $headers['X-Debug-Exception'] = rawurlencode($exception->getMessage()); + $headers['X-Debug-Exception'] = rawurlencode(substr($exception->getMessage(), 0, 2000)); $headers['X-Debug-Exception-File'] = rawurlencode($exception->getFile()).':'.$exception->getLine(); } @@ -252,10 +252,10 @@ private function fileExcerpt(string $file, int $line, int $srcContext = 3): stri if (\PHP_VERSION_ID >= 80300) { // remove main pre/code tags $code = preg_replace('#^\s*(.*)\s*#s', '\\1', $code); - // split multiline code tags - $code = preg_replace_callback('#]++)>((?:[^<]*+\\n)++[^<]*+)#', fn ($m) => "".str_replace("\n", "\n", $m[2]).'', $code); - // Convert spaces to html entities to preserve indentation when rendered - $code = str_replace(' ', ' ', $code); + // split multiline span tags + $code = preg_replace_callback('#]++)>((?:[^<\\n]*+\\n)++[^<]*+)#', function ($m) { + return "".str_replace("\n", "\n", $m[2]).''; + }, $code); $content = explode("\n", $code); } else { // remove main code/span tags diff --git a/vendor/symfony/error-handler/ErrorRenderer/SerializerErrorRenderer.php b/vendor/symfony/error-handler/ErrorRenderer/SerializerErrorRenderer.php index a42ce3f2..b09a6e00 100644 --- a/vendor/symfony/error-handler/ErrorRenderer/SerializerErrorRenderer.php +++ b/vendor/symfony/error-handler/ErrorRenderer/SerializerErrorRenderer.php @@ -47,7 +47,7 @@ public function render(\Throwable $exception): FlattenException $headers = ['Vary' => 'Accept']; $debug = \is_bool($this->debug) ? $this->debug : ($this->debug)($exception); if ($debug) { - $headers['X-Debug-Exception'] = rawurlencode($exception->getMessage()); + $headers['X-Debug-Exception'] = rawurlencode(substr($exception->getMessage(), 0, 2000)); $headers['X-Debug-Exception-File'] = rawurlencode($exception->getFile()).':'.$exception->getLine(); } diff --git a/vendor/symfony/error-handler/Exception/FlattenException.php b/vendor/symfony/error-handler/Exception/FlattenException.php index 39473151..f8ec1faf 100644 --- a/vendor/symfony/error-handler/Exception/FlattenException.php +++ b/vendor/symfony/error-handler/Exception/FlattenException.php @@ -228,7 +228,7 @@ public function getMessage(): string public function setMessage(string $message): static { if (str_contains($message, "@anonymous\0")) { - $message = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $message); + $message = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)?[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $message); } $this->message = $message; diff --git a/vendor/symfony/error-handler/Resources/assets/css/exception.css b/vendor/symfony/error-handler/Resources/assets/css/exception.css index 3e6eae5a..e4d1f11e 100644 --- a/vendor/symfony/error-handler/Resources/assets/css/exception.css +++ b/vendor/symfony/error-handler/Resources/assets/css/exception.css @@ -349,7 +349,7 @@ header .container { display: flex; justify-content: space-between; } .trace-code li { color: #969896; margin: 0; padding-left: 10px; float: left; width: 100%; } .trace-code li + li { margin-top: 5px; } .trace-code li.selected { background: var(--trace-selected-background); margin-top: 2px; } -.trace-code li code { color: var(--base-6); white-space: nowrap; } +.trace-code li code { color: var(--base-6); white-space: pre; } .trace-as-text .stacktrace { line-height: 1.8; margin: 0 0 15px; white-space: pre-wrap; } diff --git a/vendor/symfony/event-dispatcher/Debug/WrappedListener.php b/vendor/symfony/event-dispatcher/Debug/WrappedListener.php index 4dba8835..59f7c136 100644 --- a/vendor/symfony/event-dispatcher/Debug/WrappedListener.php +++ b/vendor/symfony/event-dispatcher/Debug/WrappedListener.php @@ -48,7 +48,7 @@ public function __construct(callable|array $listener, ?string $name, Stopwatch $ $this->callableRef .= '::'.$listener[1]; } elseif ($listener instanceof \Closure) { $r = new \ReflectionFunction($listener); - if (str_contains($r->name, '{closure}')) { + if (str_contains($r->name, '{closure')) { $this->pretty = $this->name = 'closure'; } elseif ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) { $this->name = $class->name; diff --git a/vendor/symfony/http-foundation/BinaryFileResponse.php b/vendor/symfony/http-foundation/BinaryFileResponse.php index 41c3166d..41a244b8 100644 --- a/vendor/symfony/http-foundation/BinaryFileResponse.php +++ b/vendor/symfony/http-foundation/BinaryFileResponse.php @@ -217,8 +217,12 @@ public function prepare(Request $request): static } if ('x-accel-redirect' === strtolower($type)) { // Do X-Accel-Mapping substitutions. - // @link https://www.nginx.com/resources/wiki/start/topics/examples/x-accel/#x-accel-redirect - $parts = HeaderUtils::split($request->headers->get('X-Accel-Mapping', ''), ',='); + // @link https://github.com/rack/rack/blob/main/lib/rack/sendfile.rb + // @link https://mattbrictson.com/blog/accelerated-rails-downloads + if (!$request->headers->has('X-Accel-Mapping')) { + throw new \LogicException('The "X-Accel-Mapping" header must be set when "X-Sendfile-Type" is set to "X-Accel-Redirect".'); + } + $parts = HeaderUtils::split($request->headers->get('X-Accel-Mapping'), ',='); foreach ($parts as $part) { [$pathPrefix, $location] = $part; if (str_starts_with($path, $pathPrefix)) { diff --git a/vendor/symfony/http-foundation/Request.php b/vendor/symfony/http-foundation/Request.php index b482a76d..c45170e3 100644 --- a/vendor/symfony/http-foundation/Request.php +++ b/vendor/symfony/http-foundation/Request.php @@ -11,6 +11,7 @@ namespace Symfony\Component\HttpFoundation; +use Symfony\Component\HttpFoundation\Exception\BadRequestException; use Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException; use Symfony\Component\HttpFoundation\Exception\JsonException; use Symfony\Component\HttpFoundation\Exception\SessionNotFoundException; @@ -326,6 +327,8 @@ public static function createFromGlobals(): static * @param array $files The request files ($_FILES) * @param array $server The server parameters ($_SERVER) * @param string|resource|null $content The raw body data + * + * @throws BadRequestException When the URI is invalid */ public static function create(string $uri, string $method = 'GET', array $parameters = [], array $cookies = [], array $files = [], array $server = [], $content = null): static { @@ -348,11 +351,26 @@ public static function create(string $uri, string $method = 'GET', array $parame $server['PATH_INFO'] = ''; $server['REQUEST_METHOD'] = strtoupper($method); - $components = parse_url($uri); - if (false === $components) { + if (false === ($components = parse_url($uri)) && '/' === ($uri[0] ?? '')) { trigger_deprecation('symfony/http-foundation', '6.3', 'Calling "%s()" with an invalid URI is deprecated.', __METHOD__); - $components = []; + $components = parse_url($uri.'#'); + unset($components['fragment']); + } + + if (false === $components) { + throw new BadRequestException('Invalid URI.'); } + + if (false !== ($i = strpos($uri, '\\')) && $i < strcspn($uri, '?#')) { + throw new BadRequestException('Invalid URI: A URI cannot contain a backslash.'); + } + if (\strlen($uri) !== strcspn($uri, "\r\n\t")) { + throw new BadRequestException('Invalid URI: A URI cannot contain CR/LF/TAB characters.'); + } + if ('' !== $uri && (\ord($uri[0]) <= 32 || \ord($uri[-1]) <= 32)) { + throw new BadRequestException('Invalid URI: A URI must not start nor end with ASCII control characters or spaces.'); + } + if (isset($components['host'])) { $server['SERVER_NAME'] = $components['host']; $server['HTTP_HOST'] = $components['host']; @@ -1230,7 +1248,7 @@ public function getMethod(): string } if (!preg_match('/^[A-Z]++$/D', $method)) { - throw new SuspiciousOperationException(sprintf('Invalid method override "%s".', $method)); + throw new SuspiciousOperationException('Invalid HTTP method override.'); } return $this->method = $method; diff --git a/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php b/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php index 5d180256..f02793d3 100644 --- a/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php +++ b/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php @@ -216,7 +216,7 @@ public function getMetadataBag(): MetadataBag */ protected function generateId(): string { - return hash('sha256', uniqid('ss_mock_', true)); + return bin2hex(random_bytes(16)); } /** diff --git a/vendor/symfony/http-foundation/composer.json b/vendor/symfony/http-foundation/composer.json index be85696e..732a011e 100644 --- a/vendor/symfony/http-foundation/composer.json +++ b/vendor/symfony/http-foundation/composer.json @@ -24,7 +24,7 @@ "require-dev": { "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1|^2.0", - "symfony/cache": "^6.3|^7.0", + "symfony/cache": "^6.4.12|^7.1.5", "symfony/dependency-injection": "^5.4|^6.0|^7.0", "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0", "symfony/mime": "^5.4|^6.0|^7.0", @@ -32,7 +32,7 @@ "symfony/rate-limiter": "^5.4|^6.0|^7.0" }, "conflict": { - "symfony/cache": "<6.3" + "symfony/cache": "<6.4.12|>=7.0,<7.1.5" }, "autoload": { "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" }, diff --git a/vendor/symfony/mime/Header/AbstractHeader.php b/vendor/symfony/mime/Header/AbstractHeader.php index 9994ec61..3dc7fafb 100644 --- a/vendor/symfony/mime/Header/AbstractHeader.php +++ b/vendor/symfony/mime/Header/AbstractHeader.php @@ -188,6 +188,20 @@ protected function getEncodableWordTokens(string $string): array $tokens[] = $encodedToken; } + foreach ($tokens as $i => $token) { + // whitespace(s) between 2 encoded tokens + if ( + 0 < $i + && isset($tokens[$i + 1]) + && preg_match('~^[\t ]+$~', $token) + && $this->tokenNeedsEncoding($tokens[$i - 1]) + && $this->tokenNeedsEncoding($tokens[$i + 1]) + ) { + $tokens[$i - 1] .= $token.$tokens[$i + 1]; + array_splice($tokens, $i, 2); + } + } + return $tokens; } diff --git a/vendor/symfony/mime/RawMessage.php b/vendor/symfony/mime/RawMessage.php index 484ffb00..2b1b52cd 100644 --- a/vendor/symfony/mime/RawMessage.php +++ b/vendor/symfony/mime/RawMessage.php @@ -18,11 +18,14 @@ */ class RawMessage { - /** @var iterable|string|resource */ + /** @var iterable|string|resource */ private $message; private bool $isGeneratorClosed; - public function __construct(iterable|string $message) + /** + * @param iterable|string|resource $message + */ + public function __construct(mixed $message) { $this->message = $message; } diff --git a/vendor/symfony/polyfill-ctype/composer.json b/vendor/symfony/polyfill-ctype/composer.json index b222fdab..131ca7ad 100644 --- a/vendor/symfony/polyfill-ctype/composer.json +++ b/vendor/symfony/polyfill-ctype/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" diff --git a/vendor/symfony/polyfill-intl-grapheme/composer.json b/vendor/symfony/polyfill-intl-grapheme/composer.json index a20d3faa..0eea417d 100644 --- a/vendor/symfony/polyfill-intl-grapheme/composer.json +++ b/vendor/symfony/polyfill-intl-grapheme/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": ">=7.1" + "php": ">=7.2" }, "autoload": { "psr-4": { "Symfony\\Polyfill\\Intl\\Grapheme\\": "" }, diff --git a/vendor/symfony/polyfill-intl-idn/Idn.php b/vendor/symfony/polyfill-intl-idn/Idn.php index eb6bada0..334f8ee7 100644 --- a/vendor/symfony/polyfill-intl-idn/Idn.php +++ b/vendor/symfony/polyfill-intl-idn/Idn.php @@ -145,7 +145,7 @@ final class Idn */ public static function idn_to_ascii($domainName, $options = self::IDNA_DEFAULT, $variant = self::INTL_IDNA_VARIANT_UTS46, &$idna_info = []) { - if (\PHP_VERSION_ID >= 70200 && self::INTL_IDNA_VARIANT_2003 === $variant) { + if (self::INTL_IDNA_VARIANT_2003 === $variant) { @trigger_error('idn_to_ascii(): INTL_IDNA_VARIANT_2003 is deprecated', \E_USER_DEPRECATED); } @@ -198,7 +198,7 @@ public static function idn_to_ascii($domainName, $options = self::IDNA_DEFAULT, */ public static function idn_to_utf8($domainName, $options = self::IDNA_DEFAULT, $variant = self::INTL_IDNA_VARIANT_UTS46, &$idna_info = []) { - if (\PHP_VERSION_ID >= 70200 && self::INTL_IDNA_VARIANT_2003 === $variant) { + if (self::INTL_IDNA_VARIANT_2003 === $variant) { @trigger_error('idn_to_utf8(): INTL_IDNA_VARIANT_2003 is deprecated', \E_USER_DEPRECATED); } diff --git a/vendor/symfony/polyfill-intl-idn/composer.json b/vendor/symfony/polyfill-intl-idn/composer.json index 12f75bce..760debcd 100644 --- a/vendor/symfony/polyfill-intl-idn/composer.json +++ b/vendor/symfony/polyfill-intl-idn/composer.json @@ -20,9 +20,8 @@ } ], "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" + "php": ">=7.2", + "symfony/polyfill-intl-normalizer": "^1.10" }, "autoload": { "psr-4": { "Symfony\\Polyfill\\Intl\\Idn\\": "" }, diff --git a/vendor/symfony/polyfill-intl-normalizer/composer.json b/vendor/symfony/polyfill-intl-normalizer/composer.json index 1b93573a..9bd04e88 100644 --- a/vendor/symfony/polyfill-intl-normalizer/composer.json +++ b/vendor/symfony/polyfill-intl-normalizer/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": ">=7.1" + "php": ">=7.2" }, "autoload": { "psr-4": { "Symfony\\Polyfill\\Intl\\Normalizer\\": "" }, diff --git a/vendor/symfony/polyfill-mbstring/Mbstring.php b/vendor/symfony/polyfill-mbstring/Mbstring.php index 1ad33a86..3d45c9d9 100644 --- a/vendor/symfony/polyfill-mbstring/Mbstring.php +++ b/vendor/symfony/polyfill-mbstring/Mbstring.php @@ -50,6 +50,9 @@ * - mb_substr_count - Count the number of substring occurrences * - mb_ucfirst - Make a string's first character uppercase * - mb_lcfirst - Make a string's first character lowercase + * - mb_trim - Strip whitespace (or other characters) from the beginning and end of a string + * - mb_ltrim - Strip whitespace (or other characters) from the beginning of a string + * - mb_rtrim - Strip whitespace (or other characters) from the end of a string * * Not implemented: * - mb_convert_kana - Convert "kana" one from another ("zen-kaku", "han-kaku" and more) @@ -83,12 +86,6 @@ final class Mbstring public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null) { if (\is_array($s)) { - if (PHP_VERSION_ID < 70200) { - trigger_error('mb_convert_encoding() expects parameter 1 to be string, array given', \E_USER_WARNING); - - return null; - } - $r = []; foreach ($s as $str) { $r[] = self::mb_convert_encoding($str, $toEncoding, $fromEncoding); @@ -427,12 +424,6 @@ public static function mb_encoding_aliases($encoding) public static function mb_check_encoding($var = null, $encoding = null) { - if (\PHP_VERSION_ID < 70200 && \is_array($var)) { - trigger_error('mb_check_encoding() expects parameter 1 to be string, array given', \E_USER_WARNING); - - return null; - } - if (null === $encoding) { if (null === $var) { return false; @@ -980,17 +971,75 @@ private static function getEncoding($encoding) return $encoding; } + public static function mb_trim(string $string, ?string $characters = null, ?string $encoding = null): string + { + return self::mb_internal_trim('{^[%s]+|[%1$s]+$}Du', $string, $characters, $encoding, __FUNCTION__); + } + + public static function mb_ltrim(string $string, ?string $characters = null, ?string $encoding = null): string + { + return self::mb_internal_trim('{^[%s]+}Du', $string, $characters, $encoding, __FUNCTION__); + } + + public static function mb_rtrim(string $string, ?string $characters = null, ?string $encoding = null): string + { + return self::mb_internal_trim('{[%s]+$}D', $string, $characters, $encoding, __FUNCTION__); + } + + private static function mb_internal_trim(string $regex, string $string, ?string $characters, ?string $encoding, string $function): string + { + if (null === $encoding) { + $encoding = self::mb_internal_encoding(); + } else { + self::assertEncoding($encoding, $function.'(): Argument #3 ($encoding) must be a valid encoding, "%s" given'); + } + + if ('' === $characters) { + return null === $encoding ? $string : self::mb_convert_encoding($string, $encoding); + } + + if ('UTF-8' === $encoding) { + $encoding = null; + if (!preg_match('//u', $string)) { + $string = @iconv('UTF-8', 'UTF-8//IGNORE', $string); + } + if (null !== $characters && !preg_match('//u', $characters)) { + $characters = @iconv('UTF-8', 'UTF-8//IGNORE', $characters); + } + } else { + $string = iconv($encoding, 'UTF-8//IGNORE', $string); + + if (null !== $characters) { + $characters = iconv($encoding, 'UTF-8//IGNORE', $characters); + } + } + + if (null === $characters) { + $characters = "\\0 \f\n\r\t\v\u{00A0}\u{1680}\u{2000}\u{2001}\u{2002}\u{2003}\u{2004}\u{2005}\u{2006}\u{2007}\u{2008}\u{2009}\u{200A}\u{2028}\u{2029}\u{202F}\u{205F}\u{3000}\u{0085}\u{180E}"; + } else { + $characters = preg_quote($characters); + } + + $string = preg_replace(sprintf($regex, $characters), '', $string); + + if (null === $encoding) { + return $string; + } + + return iconv('UTF-8', $encoding.'//IGNORE', $string); + } + private static function assertEncoding(string $encoding, string $errorFormat): void { try { $validEncoding = @self::mb_check_encoding('', $encoding); } catch (\ValueError $e) { - throw new \ValueError(\sprintf($errorFormat, $encoding)); + throw new \ValueError(sprintf($errorFormat, $encoding)); } // BC for PHP 7.3 and lower if (!$validEncoding) { - throw new \ValueError(\sprintf($errorFormat, $encoding)); + throw new \ValueError(sprintf($errorFormat, $encoding)); } } } diff --git a/vendor/symfony/polyfill-mbstring/bootstrap.php b/vendor/symfony/polyfill-mbstring/bootstrap.php index 6e4b5fce..ff51ae07 100644 --- a/vendor/symfony/polyfill-mbstring/bootstrap.php +++ b/vendor/symfony/polyfill-mbstring/bootstrap.php @@ -144,6 +144,19 @@ function mb_ucfirst(string $string, ?string $encoding = null): string { return p function mb_lcfirst(string $string, ?string $encoding = null): string { return p\Mbstring::mb_lcfirst($string, $encoding); } } +if (!function_exists('mb_trim')) { + function mb_trim(string $string, ?string $characters = null, ?string $encoding = null): string { return p\Mbstring::mb_trim($string, $characters, $encoding); } +} + +if (!function_exists('mb_ltrim')) { + function mb_ltrim(string $string, ?string $characters = null, ?string $encoding = null): string { return p\Mbstring::mb_ltrim($string, $characters, $encoding); } +} + +if (!function_exists('mb_rtrim')) { + function mb_rtrim(string $string, ?string $characters = null, ?string $encoding = null): string { return p\Mbstring::mb_rtrim($string, $characters, $encoding); } +} + + if (extension_loaded('mbstring')) { return; } diff --git a/vendor/symfony/polyfill-mbstring/bootstrap80.php b/vendor/symfony/polyfill-mbstring/bootstrap80.php index ec2ae427..5be7d201 100644 --- a/vendor/symfony/polyfill-mbstring/bootstrap80.php +++ b/vendor/symfony/polyfill-mbstring/bootstrap80.php @@ -93,7 +93,7 @@ function mb_strrpos(?string $haystack, ?string $needle, ?int $offset = 0, ?strin function mb_strstr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_strstr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); } } if (!function_exists('mb_get_info')) { - function mb_get_info(?string $type = 'all'): array|string|int|false { return p\Mbstring::mb_get_info((string) $type); } + function mb_get_info(?string $type = 'all'): array|string|int|false|null { return p\Mbstring::mb_get_info((string) $type); } } if (!function_exists('mb_http_output')) { function mb_http_output(?string $encoding = null): string|bool { return p\Mbstring::mb_http_output($encoding); } @@ -140,6 +140,18 @@ function mb_ucfirst($string, ?string $encoding = null): string { return p\Mbstri function mb_lcfirst($string, ?string $encoding = null): string { return p\Mbstring::mb_lcfirst($string, $encoding); } } +if (!function_exists('mb_trim')) { + function mb_trim(string $string, ?string $characters = null, ?string $encoding = null): string { return p\Mbstring::mb_trim($string, $characters, $encoding); } +} + +if (!function_exists('mb_ltrim')) { + function mb_ltrim(string $string, ?string $characters = null, ?string $encoding = null): string { return p\Mbstring::mb_ltrim($string, $characters, $encoding); } +} + +if (!function_exists('mb_rtrim')) { + function mb_rtrim(string $string, ?string $characters = null, ?string $encoding = null): string { return p\Mbstring::mb_rtrim($string, $characters, $encoding); } +} + if (extension_loaded('mbstring')) { return; } diff --git a/vendor/symfony/polyfill-mbstring/composer.json b/vendor/symfony/polyfill-mbstring/composer.json index bd99d4b9..4ed241a3 100644 --- a/vendor/symfony/polyfill-mbstring/composer.json +++ b/vendor/symfony/polyfill-mbstring/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" diff --git a/vendor/symfony/polyfill-php72/LICENSE b/vendor/symfony/polyfill-php72/LICENSE deleted file mode 100644 index 6e3afce6..00000000 --- a/vendor/symfony/polyfill-php72/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2015-present Fabien Potencier - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/vendor/symfony/polyfill-php72/Php72.php b/vendor/symfony/polyfill-php72/Php72.php deleted file mode 100644 index e97b1b27..00000000 --- a/vendor/symfony/polyfill-php72/Php72.php +++ /dev/null @@ -1,218 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Polyfill\Php72; - -/** - * @author Nicolas Grekas - * @author Dariusz Rumiński - * - * @internal - */ -final class Php72 -{ - private static $hashMask; - - public static function utf8_encode($s) - { - $s .= $s; - $len = \strlen($s); - - for ($i = $len >> 1, $j = 0; $i < $len; ++$i, ++$j) { - switch (true) { - case $s[$i] < "\x80": $s[$j] = $s[$i]; break; - case $s[$i] < "\xC0": $s[$j] = "\xC2"; $s[++$j] = $s[$i]; break; - default: $s[$j] = "\xC3"; $s[++$j] = \chr(\ord($s[$i]) - 64); break; - } - } - - return substr($s, 0, $j); - } - - public static function utf8_decode($s) - { - $s = (string) $s; - $len = \strlen($s); - - for ($i = 0, $j = 0; $i < $len; ++$i, ++$j) { - switch ($s[$i] & "\xF0") { - case "\xC0": - case "\xD0": - $c = (\ord($s[$i] & "\x1F") << 6) | \ord($s[++$i] & "\x3F"); - $s[$j] = $c < 256 ? \chr($c) : '?'; - break; - - case "\xF0": - ++$i; - // no break - - case "\xE0": - $s[$j] = '?'; - $i += 2; - break; - - default: - $s[$j] = $s[$i]; - } - } - - return substr($s, 0, $j); - } - - public static function php_os_family() - { - if ('\\' === \DIRECTORY_SEPARATOR) { - return 'Windows'; - } - - $map = [ - 'Darwin' => 'Darwin', - 'DragonFly' => 'BSD', - 'FreeBSD' => 'BSD', - 'NetBSD' => 'BSD', - 'OpenBSD' => 'BSD', - 'Linux' => 'Linux', - 'SunOS' => 'Solaris', - ]; - - return $map[\PHP_OS] ?? 'Unknown'; - } - - public static function spl_object_id($object) - { - if (null === self::$hashMask) { - self::initHashMask(); - } - if (null === $hash = spl_object_hash($object)) { - return; - } - - // On 32-bit systems, PHP_INT_SIZE is 4, - return self::$hashMask ^ hexdec(substr($hash, 16 - (\PHP_INT_SIZE * 2 - 1), \PHP_INT_SIZE * 2 - 1)); - } - - public static function sapi_windows_vt100_support($stream, $enable = null) - { - if (!\is_resource($stream)) { - trigger_error('sapi_windows_vt100_support() expects parameter 1 to be resource, '.\gettype($stream).' given', \E_USER_WARNING); - - return false; - } - - $meta = stream_get_meta_data($stream); - - if ('STDIO' !== $meta['stream_type']) { - trigger_error('sapi_windows_vt100_support() was not able to analyze the specified stream', \E_USER_WARNING); - - return false; - } - - // We cannot actually disable vt100 support if it is set - if (false === $enable || !self::stream_isatty($stream)) { - return false; - } - - // The native function does not apply to stdin - $meta = array_map('strtolower', $meta); - $stdin = 'php://stdin' === $meta['uri'] || 'php://fd/0' === $meta['uri']; - - return !$stdin - && (false !== getenv('ANSICON') - || 'ON' === getenv('ConEmuANSI') - || 'xterm' === getenv('TERM') - || 'Hyper' === getenv('TERM_PROGRAM')); - } - - public static function stream_isatty($stream) - { - if (!\is_resource($stream)) { - trigger_error('stream_isatty() expects parameter 1 to be resource, '.\gettype($stream).' given', \E_USER_WARNING); - - return false; - } - - if ('\\' === \DIRECTORY_SEPARATOR) { - $stat = @fstat($stream); - - // Check if formatted mode is S_IFCHR - return $stat ? 0020000 === ($stat['mode'] & 0170000) : false; - } - - return \function_exists('posix_isatty') && @posix_isatty($stream); - } - - private static function initHashMask() - { - $obj = (object) []; - self::$hashMask = -1; - - // check if we are nested in an output buffering handler to prevent a fatal error with ob_start() below - $obFuncs = ['ob_clean', 'ob_end_clean', 'ob_flush', 'ob_end_flush', 'ob_get_contents', 'ob_get_flush']; - foreach (debug_backtrace(\PHP_VERSION_ID >= 50400 ? \DEBUG_BACKTRACE_IGNORE_ARGS : false) as $frame) { - if (isset($frame['function'][0]) && !isset($frame['class']) && 'o' === $frame['function'][0] && \in_array($frame['function'], $obFuncs)) { - $frame['line'] = 0; - break; - } - } - if (!empty($frame['line'])) { - ob_start(); - debug_zval_dump($obj); - self::$hashMask = (int) substr(ob_get_clean(), 17); - } - - self::$hashMask ^= hexdec(substr(spl_object_hash($obj), 16 - (\PHP_INT_SIZE * 2 - 1), \PHP_INT_SIZE * 2 - 1)); - } - - public static function mb_chr($code, $encoding = null) - { - if (0x80 > $code %= 0x200000) { - $s = \chr($code); - } elseif (0x800 > $code) { - $s = \chr(0xC0 | $code >> 6).\chr(0x80 | $code & 0x3F); - } elseif (0x10000 > $code) { - $s = \chr(0xE0 | $code >> 12).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F); - } else { - $s = \chr(0xF0 | $code >> 18).\chr(0x80 | $code >> 12 & 0x3F).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F); - } - - if ('UTF-8' !== $encoding = $encoding ?? mb_internal_encoding()) { - $s = mb_convert_encoding($s, $encoding, 'UTF-8'); - } - - return $s; - } - - public static function mb_ord($s, $encoding = null) - { - if (null === $encoding) { - $s = mb_convert_encoding($s, 'UTF-8'); - } elseif ('UTF-8' !== $encoding) { - $s = mb_convert_encoding($s, 'UTF-8', $encoding); - } - - if (1 === \strlen($s)) { - return \ord($s); - } - - $code = ($s = unpack('C*', substr($s, 0, 4))) ? $s[1] : 0; - if (0xF0 <= $code) { - return (($code - 0xF0) << 18) + (($s[2] - 0x80) << 12) + (($s[3] - 0x80) << 6) + $s[4] - 0x80; - } - if (0xE0 <= $code) { - return (($code - 0xE0) << 12) + (($s[2] - 0x80) << 6) + $s[3] - 0x80; - } - if (0xC0 <= $code) { - return (($code - 0xC0) << 6) + $s[2] - 0x80; - } - - return $code; - } -} diff --git a/vendor/symfony/polyfill-php72/README.md b/vendor/symfony/polyfill-php72/README.md deleted file mode 100644 index ed190505..00000000 --- a/vendor/symfony/polyfill-php72/README.md +++ /dev/null @@ -1,35 +0,0 @@ -Symfony Polyfill / Php72 -======================== - -This component provides functions added to PHP 7.2 core: - -- [`spl_object_id`](https://php.net/spl_object_id) -- [`stream_isatty`](https://php.net/stream_isatty) - -And also functions added to PHP 7.2 mbstring: - -- [`mb_ord`](https://php.net/mb_ord) -- [`mb_chr`](https://php.net/mb_chr) -- [`mb_scrub`](https://php.net/mb_scrub) - -On Windows only: - -- [`sapi_windows_vt100_support`](https://php.net/sapi_windows_vt100_support) - -Moved to core since 7.2 (was in the optional XML extension earlier): - -- [`utf8_encode`](https://php.net/utf8_encode) -- [`utf8_decode`](https://php.net/utf8_decode) - -Also, it provides constants added to PHP 7.2: - -- [`PHP_FLOAT_*`](https://php.net/reserved.constants#constant.php-float-dig) -- [`PHP_OS_FAMILY`](https://php.net/reserved.constants#constant.php-os-family) - -More information can be found in the -[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md). - -License -======= - -This library is released under the [MIT license](LICENSE). diff --git a/vendor/symfony/polyfill-php72/bootstrap.php b/vendor/symfony/polyfill-php72/bootstrap.php deleted file mode 100644 index b5c92d4c..00000000 --- a/vendor/symfony/polyfill-php72/bootstrap.php +++ /dev/null @@ -1,57 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -use Symfony\Polyfill\Php72 as p; - -if (\PHP_VERSION_ID >= 70200) { - return; -} - -if (!defined('PHP_FLOAT_DIG')) { - define('PHP_FLOAT_DIG', 15); -} -if (!defined('PHP_FLOAT_EPSILON')) { - define('PHP_FLOAT_EPSILON', 2.2204460492503E-16); -} -if (!defined('PHP_FLOAT_MIN')) { - define('PHP_FLOAT_MIN', 2.2250738585072E-308); -} -if (!defined('PHP_FLOAT_MAX')) { - define('PHP_FLOAT_MAX', 1.7976931348623157E+308); -} -if (!defined('PHP_OS_FAMILY')) { - define('PHP_OS_FAMILY', p\Php72::php_os_family()); -} - -if ('\\' === \DIRECTORY_SEPARATOR && !function_exists('sapi_windows_vt100_support')) { - function sapi_windows_vt100_support($stream, $enable = null) { return p\Php72::sapi_windows_vt100_support($stream, $enable); } -} -if (!function_exists('stream_isatty')) { - function stream_isatty($stream) { return p\Php72::stream_isatty($stream); } -} -if (!function_exists('utf8_encode')) { - function utf8_encode($string) { return p\Php72::utf8_encode($string); } -} -if (!function_exists('utf8_decode')) { - function utf8_decode($string) { return p\Php72::utf8_decode($string); } -} -if (!function_exists('spl_object_id')) { - function spl_object_id($object) { return p\Php72::spl_object_id($object); } -} -if (!function_exists('mb_ord')) { - function mb_ord($string, $encoding = null) { return p\Php72::mb_ord($string, $encoding); } -} -if (!function_exists('mb_chr')) { - function mb_chr($codepoint, $encoding = null) { return p\Php72::mb_chr($codepoint, $encoding); } -} -if (!function_exists('mb_scrub')) { - function mb_scrub($string, $encoding = null) { $encoding = null === $encoding ? mb_internal_encoding() : $encoding; return mb_convert_encoding($string, $encoding, $encoding); } -} diff --git a/vendor/symfony/polyfill-php72/composer.json b/vendor/symfony/polyfill-php72/composer.json deleted file mode 100644 index 1882576d..00000000 --- a/vendor/symfony/polyfill-php72/composer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "symfony/polyfill-php72", - "type": "library", - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "keywords": ["polyfill", "shim", "compatibility", "portable"], - "homepage": "https://symfony.com", - "license": "MIT", - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "require": { - "php": ">=7.1" - }, - "autoload": { - "psr-4": { "Symfony\\Polyfill\\Php72\\": "" }, - "files": [ "bootstrap.php" ] - }, - "minimum-stability": "dev", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - } -} diff --git a/vendor/symfony/polyfill-php80/composer.json b/vendor/symfony/polyfill-php80/composer.json index 46ccde20..a503b039 100644 --- a/vendor/symfony/polyfill-php80/composer.json +++ b/vendor/symfony/polyfill-php80/composer.json @@ -20,7 +20,7 @@ } ], "require": { - "php": ">=7.1" + "php": ">=7.2" }, "autoload": { "psr-4": { "Symfony\\Polyfill\\Php80\\": "" }, diff --git a/vendor/symfony/polyfill-php83/bootstrap.php b/vendor/symfony/polyfill-php83/bootstrap.php index f43af17e..a92799cb 100644 --- a/vendor/symfony/polyfill-php83/bootstrap.php +++ b/vendor/symfony/polyfill-php83/bootstrap.php @@ -19,8 +19,10 @@ function json_validate(string $json, int $depth = 512, int $flags = 0): bool { return p\Php83::json_validate($json, $depth, $flags); } } -if (!function_exists('mb_str_pad') && function_exists('mb_substr')) { - function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = STR_PAD_RIGHT, ?string $encoding = null): string { return p\Php83::mb_str_pad($string, $length, $pad_string, $pad_type, $encoding); } +if (extension_loaded('mbstring')) { + if (!function_exists('mb_str_pad')) { + function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = STR_PAD_RIGHT, ?string $encoding = null): string { return p\Php83::mb_str_pad($string, $length, $pad_string, $pad_type, $encoding); } + } } if (!function_exists('stream_context_set_options')) { diff --git a/vendor/symfony/polyfill-php83/composer.json b/vendor/symfony/polyfill-php83/composer.json index 02a0bf83..a8b8ba70 100644 --- a/vendor/symfony/polyfill-php83/composer.json +++ b/vendor/symfony/polyfill-php83/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": ">=7.1" + "php": ">=7.2" }, "autoload": { "psr-4": { "Symfony\\Polyfill\\Php83\\": "" }, diff --git a/vendor/symfony/process/CHANGELOG.md b/vendor/symfony/process/CHANGELOG.md index e26819b5..dc0a0cc5 100644 --- a/vendor/symfony/process/CHANGELOG.md +++ b/vendor/symfony/process/CHANGELOG.md @@ -7,7 +7,6 @@ CHANGELOG * Add `PhpSubprocess` to handle PHP subprocesses that take over the configuration from their parent * Add `RunProcessMessage` and `RunProcessMessageHandler` - * Support using `Process::findExecutable()` independently of `open_basedir` 5.2.0 ----- diff --git a/vendor/symfony/process/ExecutableFinder.php b/vendor/symfony/process/ExecutableFinder.php index 8c7bf58d..1838d54b 100644 --- a/vendor/symfony/process/ExecutableFinder.php +++ b/vendor/symfony/process/ExecutableFinder.php @@ -19,7 +19,15 @@ */ class ExecutableFinder { - private array $suffixes = ['.exe', '.bat', '.cmd', '.com']; + private const CMD_BUILTINS = [ + 'assoc', 'break', 'call', 'cd', 'chdir', 'cls', 'color', 'copy', 'date', + 'del', 'dir', 'echo', 'endlocal', 'erase', 'exit', 'for', 'ftype', 'goto', + 'help', 'if', 'label', 'md', 'mkdir', 'mklink', 'move', 'path', 'pause', + 'popd', 'prompt', 'pushd', 'rd', 'rem', 'ren', 'rename', 'rmdir', 'set', + 'setlocal', 'shift', 'start', 'time', 'title', 'type', 'ver', 'vol', + ]; + + private array $suffixes = []; /** * Replaces default suffixes of executable. @@ -50,18 +58,28 @@ public function addSuffix(string $suffix) */ public function find(string $name, ?string $default = null, array $extraDirs = []): ?string { + // windows built-in commands that are present in cmd.exe should not be resolved using PATH as they do not exist as exes + if ('\\' === \DIRECTORY_SEPARATOR && \in_array(strtolower($name), self::CMD_BUILTINS, true)) { + return $name; + } + $dirs = array_merge( explode(\PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')), $extraDirs ); - $suffixes = ['']; + $suffixes = []; if ('\\' === \DIRECTORY_SEPARATOR) { $pathExt = getenv('PATHEXT'); - $suffixes = array_merge($pathExt ? explode(\PATH_SEPARATOR, $pathExt) : $this->suffixes, $suffixes); + $suffixes = $this->suffixes; + $suffixes = array_merge($suffixes, $pathExt ? explode(\PATH_SEPARATOR, $pathExt) : ['.exe', '.bat', '.cmd', '.com']); } + $suffixes = '' !== pathinfo($name, PATHINFO_EXTENSION) ? array_merge([''], $suffixes) : array_merge($suffixes, ['']); foreach ($suffixes as $suffix) { foreach ($dirs as $dir) { + if ('' === $dir) { + $dir = '.'; + } if (@is_file($file = $dir.\DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === \DIRECTORY_SEPARATOR || @is_executable($file))) { return $file; } @@ -72,8 +90,13 @@ public function find(string $name, ?string $default = null, array $extraDirs = [ } } - $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v --'; - if (\function_exists('exec') && ($executablePath = strtok(@exec($command.' '.escapeshellarg($name)), \PHP_EOL)) && @is_executable($executablePath)) { + if ('\\' === \DIRECTORY_SEPARATOR || !\function_exists('exec') || \strlen($name) !== strcspn($name, '/'.\DIRECTORY_SEPARATOR)) { + return $default; + } + + $execResult = exec('command -v -- '.escapeshellarg($name)); + + if (($executablePath = substr($execResult, 0, strpos($execResult, \PHP_EOL) ?: null)) && @is_executable($executablePath)) { return $executablePath; } diff --git a/vendor/symfony/process/PhpExecutableFinder.php b/vendor/symfony/process/PhpExecutableFinder.php index 4a882e0f..e24ca008 100644 --- a/vendor/symfony/process/PhpExecutableFinder.php +++ b/vendor/symfony/process/PhpExecutableFinder.php @@ -32,15 +32,8 @@ public function __construct() public function find(bool $includeArgs = true): string|false { if ($php = getenv('PHP_BINARY')) { - if (!is_executable($php)) { - $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v --'; - if (\function_exists('exec') && $php = strtok(exec($command.' '.escapeshellarg($php)), \PHP_EOL)) { - if (!is_executable($php)) { - return false; - } - } else { - return false; - } + if (!is_executable($php) && !$php = $this->executableFinder->find($php)) { + return false; } if (@is_dir($php)) { diff --git a/vendor/symfony/process/PhpSubprocess.php b/vendor/symfony/process/PhpSubprocess.php index a97f8b26..04fd8ea8 100644 --- a/vendor/symfony/process/PhpSubprocess.php +++ b/vendor/symfony/process/PhpSubprocess.php @@ -106,7 +106,7 @@ private function writeTmpIni(array $iniFiles, string $tmpDir): string throw new RuntimeException('Unable to read ini: '.$file); } // Check and remove directives after HOST and PATH sections - if (preg_match('/^\s*\[(?:PATH|HOST)\s*=/mi', $data, $matches)) { + if (preg_match('/^\s*\[(?:PATH|HOST)\s*=/mi', $data, $matches, \PREG_OFFSET_CAPTURE)) { $data = substr($data, 0, $matches[0][1]); } diff --git a/vendor/symfony/process/Process.php b/vendor/symfony/process/Process.php index bf2e8e85..280a732d 100644 --- a/vendor/symfony/process/Process.php +++ b/vendor/symfony/process/Process.php @@ -346,7 +346,7 @@ public function start(?callable $callback = null, array $env = []) $process = @proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $envPairs, $this->options); - if (!\is_resource($process)) { + if (!$process) { throw new RuntimeException('Unable to launch a new process.'); } $this->process = $process; @@ -1400,8 +1400,9 @@ private function readPipes(bool $blocking, bool $close): void private function close(): int { $this->processPipes->close(); - if (\is_resource($this->process)) { + if ($this->process) { proc_close($this->process); + $this->process = null; } $this->exitcode = $this->processInformation['exitcode']; $this->status = self::STATUS_TERMINATED; @@ -1535,7 +1536,14 @@ function ($m) use (&$env, $uid) { $cmd ); - $cmd = 'cmd /V:ON /E:ON /D /C ('.str_replace("\n", ' ', $cmd).')'; + static $comSpec; + + if (!$comSpec && $comSpec = (new ExecutableFinder())->find('cmd.exe')) { + // Escape according to CommandLineToArgvW rules + $comSpec = '"'.preg_replace('{(\\\\*+)"}', '$1$1\"', $comSpec) .'"'; + } + + $cmd = ($comSpec ?? 'cmd').' /V:ON /E:ON /D /C ('.str_replace("\n", ' ', $cmd).')'; foreach ($this->processPipes->getFiles() as $offset => $filename) { $cmd .= ' '.$offset.'>"'.$filename.'"'; } @@ -1581,7 +1589,7 @@ private function escapeArgument(?string $argument): string if (str_contains($argument, "\0")) { $argument = str_replace("\0", '?', $argument); } - if (!preg_match('/[\/()%!^"<>&|\s]/', $argument)) { + if (!preg_match('/[()%!^"<>&|\s]/', $argument)) { return $argument; } $argument = preg_replace('/(\\\\+)$/', '$1$1', $argument); diff --git a/vendor/symfony/string/Inflector/EnglishInflector.php b/vendor/symfony/string/Inflector/EnglishInflector.php index c41badea..a5be28d6 100644 --- a/vendor/symfony/string/Inflector/EnglishInflector.php +++ b/vendor/symfony/string/Inflector/EnglishInflector.php @@ -354,14 +354,14 @@ final class EnglishInflector implements InflectorInterface // indices (index) ['xedni', 5, false, true, ['indicies', 'indexes']], + // fax (faxes, faxxes) + ['xaf', 3, true, true, ['faxes', 'faxxes']], + // boxes (box) ['xo', 2, false, true, 'oxes'], - // indexes (index), matrixes (matrix) - ['x', 1, true, false, ['cies', 'xes']], - - // appendices (appendix) - ['xi', 2, false, true, 'ices'], + // indexes (index), matrixes (matrix), appendices (appendix) + ['x', 1, true, false, ['ces', 'xes']], // babies (baby) ['y', 1, false, true, 'ies'], diff --git a/vendor/symfony/string/Resources/data/wcswidth_table_wide.php b/vendor/symfony/string/Resources/data/wcswidth_table_wide.php index 8314c8fd..6a750942 100644 --- a/vendor/symfony/string/Resources/data/wcswidth_table_wide.php +++ b/vendor/symfony/string/Resources/data/wcswidth_table_wide.php @@ -3,8 +3,8 @@ /* * This file has been auto-generated by the Symfony String Component for internal use. * - * Unicode version: 15.1.0 - * Date: 2023-09-13T11:47:12+00:00 + * Unicode version: 16.0.0 + * Date: 2024-09-11T08:21:22+00:00 */ return [ @@ -44,6 +44,10 @@ 9748, 9749, ], + [ + 9776, + 9783, + ], [ 9800, 9811, @@ -52,6 +56,10 @@ 9855, 9855, ], + [ + 9866, + 9871, + ], [ 9875, 9875, @@ -394,7 +402,7 @@ ], [ 12736, - 12771, + 12773, ], [ 12783, @@ -452,6 +460,10 @@ 13312, 19903, ], + [ + 19904, + 19967, + ], [ 19968, 40959, @@ -836,6 +848,10 @@ 101120, 101589, ], + [ + 101631, + 101631, + ], [ 101632, 101640, @@ -880,6 +896,14 @@ 110960, 111355, ], + [ + 119552, + 119638, + ], + [ + 119648, + 119670, + ], [ 126980, 126980, @@ -1054,23 +1078,19 @@ ], [ 129664, - 129672, - ], - [ - 129680, - 129725, + 129673, ], [ - 129727, - 129733, + 129679, + 129734, ], [ 129742, - 129755, + 129756, ], [ - 129760, - 129768, + 129759, + 129769, ], [ 129776, diff --git a/vendor/symfony/string/Resources/data/wcswidth_table_zero.php b/vendor/symfony/string/Resources/data/wcswidth_table_zero.php index e5b26a21..fdd7f3c7 100644 --- a/vendor/symfony/string/Resources/data/wcswidth_table_zero.php +++ b/vendor/symfony/string/Resources/data/wcswidth_table_zero.php @@ -3,8 +3,8 @@ /* * This file has been auto-generated by the Symfony String Component for internal use. * - * Unicode version: 15.1.0 - * Date: 2023-09-13T11:47:13+00:00 + * Unicode version: 16.0.0 + * Date: 2024-09-11T08:21:22+00:00 */ return [ @@ -109,7 +109,7 @@ 2139, ], [ - 2200, + 2199, 2207, ], [ @@ -916,12 +916,16 @@ 68900, 68903, ], + [ + 68969, + 68973, + ], [ 69291, 69292, ], [ - 69373, + 69372, 69375, ], [ @@ -1044,6 +1048,26 @@ 70512, 70516, ], + [ + 70587, + 70592, + ], + [ + 70606, + 70606, + ], + [ + 70608, + 70608, + ], + [ + 70610, + 70610, + ], + [ + 70625, + 70626, + ], [ 70712, 70719, @@ -1122,6 +1146,10 @@ ], [ 71453, + 71453, + ], + [ + 71455, 71455, ], [ @@ -1276,6 +1304,10 @@ 73538, 73538, ], + [ + 73562, + 73562, + ], [ 78912, 78912, @@ -1284,6 +1316,14 @@ 78919, 78933, ], + [ + 90398, + 90409, + ], + [ + 90413, + 90415, + ], [ 92912, 92916, @@ -1400,6 +1440,10 @@ 124140, 124143, ], + [ + 124398, + 124399, + ], [ 125136, 125142, diff --git a/vendor/symfony/translation/Dumper/CsvFileDumper.php b/vendor/symfony/translation/Dumper/CsvFileDumper.php index 8f547525..a4ae476b 100644 --- a/vendor/symfony/translation/Dumper/CsvFileDumper.php +++ b/vendor/symfony/translation/Dumper/CsvFileDumper.php @@ -28,7 +28,7 @@ public function formatCatalogue(MessageCatalogue $messages, string $domain, arra $handle = fopen('php://memory', 'r+'); foreach ($messages->all($domain) as $source => $target) { - fputcsv($handle, [$source, $target], $this->delimiter, $this->enclosure); + fputcsv($handle, [$source, $target], $this->delimiter, $this->enclosure, '\\'); } rewind($handle); diff --git a/vendor/symfony/translation/Extractor/Visitor/TransMethodVisitor.php b/vendor/symfony/translation/Extractor/Visitor/TransMethodVisitor.php index 011bf3b1..a3dcd6d2 100644 --- a/vendor/symfony/translation/Extractor/Visitor/TransMethodVisitor.php +++ b/vendor/symfony/translation/Extractor/Visitor/TransMethodVisitor.php @@ -44,7 +44,7 @@ public function leaveNode(Node $node): ?Node if ('trans' === $name || 't' === $name) { $firstNamedArgumentIndex = $this->nodeFirstNamedArgumentIndex($node); - if (!$messages = $this->getStringArguments($node, 0 < $firstNamedArgumentIndex ? 0 : 'message')) { + if (!$messages = $this->getStringArguments($node, 0 < $firstNamedArgumentIndex ? 0 : 'id')) { return null; } diff --git a/vendor/symfony/translation/Loader/CsvFileLoader.php b/vendor/symfony/translation/Loader/CsvFileLoader.php index 7f2f96be..93bee730 100644 --- a/vendor/symfony/translation/Loader/CsvFileLoader.php +++ b/vendor/symfony/translation/Loader/CsvFileLoader.php @@ -22,7 +22,7 @@ class CsvFileLoader extends FileLoader { private string $delimiter = ';'; private string $enclosure = '"'; - private string $escape = '\\'; + private string $escape = ''; protected function loadResource(string $resource): array { @@ -55,7 +55,7 @@ protected function loadResource(string $resource): array * * @return void */ - public function setCsvControl(string $delimiter = ';', string $enclosure = '"', string $escape = '\\') + public function setCsvControl(string $delimiter = ';', string $enclosure = '"', string $escape = '') { $this->delimiter = $delimiter; $this->enclosure = $enclosure; diff --git a/vendor/symfony/var-dumper/Caster/ClassStub.php b/vendor/symfony/var-dumper/Caster/ClassStub.php index 91472866..bf0d056c 100644 --- a/vendor/symfony/var-dumper/Caster/ClassStub.php +++ b/vendor/symfony/var-dumper/Caster/ClassStub.php @@ -56,7 +56,7 @@ public function __construct(string $identifier, callable|array|string|null $call } if (str_contains($identifier, "@anonymous\0")) { - $this->value = $identifier = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $identifier); + $this->value = $identifier = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)?[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $identifier); } if (null !== $callable && $r instanceof \ReflectionFunctionAbstract) { diff --git a/vendor/symfony/var-dumper/Caster/DOMCaster.php b/vendor/symfony/var-dumper/Caster/DOMCaster.php index d2d3fc12..4135fbfe 100644 --- a/vendor/symfony/var-dumper/Caster/DOMCaster.php +++ b/vendor/symfony/var-dumper/Caster/DOMCaster.php @@ -23,7 +23,7 @@ class DOMCaster { private const ERROR_CODES = [ - \DOM_PHP_ERR => 'DOM_PHP_ERR', + 0 => 'DOM_PHP_ERR', \DOM_INDEX_SIZE_ERR => 'DOM_INDEX_SIZE_ERR', \DOMSTRING_SIZE_ERR => 'DOMSTRING_SIZE_ERR', \DOM_HIERARCHY_REQUEST_ERR => 'DOM_HIERARCHY_REQUEST_ERR', @@ -156,16 +156,12 @@ public static function castDocument(\DOMDocument $dom, array $a, Stub $stub, boo 'doctype' => $dom->doctype, 'implementation' => $dom->implementation, 'documentElement' => new CutStub($dom->documentElement), - 'actualEncoding' => $dom->actualEncoding, 'encoding' => $dom->encoding, 'xmlEncoding' => $dom->xmlEncoding, - 'standalone' => $dom->standalone, 'xmlStandalone' => $dom->xmlStandalone, - 'version' => $dom->version, 'xmlVersion' => $dom->xmlVersion, 'strictErrorChecking' => $dom->strictErrorChecking, 'documentURI' => $dom->documentURI ? new LinkStub($dom->documentURI) : $dom->documentURI, - 'config' => $dom->config, 'formatOutput' => $dom->formatOutput, 'validateOnParse' => $dom->validateOnParse, 'resolveExternals' => $dom->resolveExternals, @@ -277,9 +273,6 @@ public static function castEntity(\DOMEntity $dom, array $a, Stub $stub, bool $i 'publicId' => $dom->publicId, 'systemId' => $dom->systemId, 'notationName' => $dom->notationName, - 'actualEncoding' => $dom->actualEncoding, - 'encoding' => $dom->encoding, - 'version' => $dom->version, ]; return $a; diff --git a/vendor/symfony/var-dumper/Caster/ExceptionCaster.php b/vendor/symfony/var-dumper/Caster/ExceptionCaster.php index 02efb1b0..3dff5dca 100644 --- a/vendor/symfony/var-dumper/Caster/ExceptionCaster.php +++ b/vendor/symfony/var-dumper/Caster/ExceptionCaster.php @@ -42,7 +42,7 @@ class ExceptionCaster \E_USER_ERROR => 'E_USER_ERROR', \E_USER_WARNING => 'E_USER_WARNING', \E_USER_NOTICE => 'E_USER_NOTICE', - \E_STRICT => 'E_STRICT', + 2048 => 'E_STRICT', ]; private static array $framesCache = []; @@ -323,7 +323,7 @@ private static function filterExceptionArray(string $xClass, array $a, string $x unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message']); if (isset($a[Caster::PREFIX_PROTECTED.'message']) && str_contains($a[Caster::PREFIX_PROTECTED.'message'], "@anonymous\0")) { - $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $a[Caster::PREFIX_PROTECTED.'message']); + $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)?[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $a[Caster::PREFIX_PROTECTED.'message']); } if (isset($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line'])) { diff --git a/vendor/symfony/var-dumper/Caster/FFICaster.php b/vendor/symfony/var-dumper/Caster/FFICaster.php index f1984eef..ffed9f31 100644 --- a/vendor/symfony/var-dumper/Caster/FFICaster.php +++ b/vendor/symfony/var-dumper/Caster/FFICaster.php @@ -115,11 +115,21 @@ private static function castFFIPointer(Stub $stub, CType $type, ?CData $data = n private static function castFFIStringValue(CData $data): string|CutStub { $result = []; + $ffi = \FFI::cdef(<<zend_get_page_size(); + + // get cdata address + $start = $ffi->cast('uintptr_t', $ffi->cast('char*', $data))->cdata; + // accessing memory in the same page as $start is safe + $max = min(self::MAX_STRING_LENGTH, ($start | ($pageSize - 1)) - $start); + + for ($i = 0; $i < $max; ++$i) { $result[$i] = $data[$i]; - if ("\0" === $result[$i]) { + if ("\0" === $data[$i]) { return implode('', $result); } } diff --git a/vendor/symfony/var-dumper/Caster/ReflectionCaster.php b/vendor/symfony/var-dumper/Caster/ReflectionCaster.php index f3da9f92..1bd156c2 100644 --- a/vendor/symfony/var-dumper/Caster/ReflectionCaster.php +++ b/vendor/symfony/var-dumper/Caster/ReflectionCaster.php @@ -45,7 +45,7 @@ public static function castClosure(\Closure $c, array $a, Stub $stub, bool $isNe $a = static::castFunctionAbstract($c, $a, $stub, $isNested, $filter); - if (!str_contains($c->name, '{closure}')) { + if (!str_contains($c->name, '{closure')) { $stub->class = isset($a[$prefix.'class']) ? $a[$prefix.'class']->value.'::'.$c->name : $c->name; unset($a[$prefix.'class']); } @@ -89,13 +89,13 @@ public static function castGenerator(\Generator $c, array $a, Stub $stub, bool $ // Cannot create ReflectionGenerator based on a terminated Generator try { $reflectionGenerator = new \ReflectionGenerator($c); + + return self::castReflectionGenerator($reflectionGenerator, $a, $stub, $isNested); } catch (\Exception) { $a[Caster::PREFIX_VIRTUAL.'closed'] = true; return $a; } - - return self::castReflectionGenerator($reflectionGenerator, $a, $stub, $isNested); } /** @@ -231,7 +231,7 @@ public static function castFunctionAbstract(\ReflectionFunctionAbstract $c, arra if (isset($a[$prefix.'returnType'])) { $v = $a[$prefix.'returnType']; $v = $v instanceof \ReflectionNamedType ? $v->getName() : (string) $v; - $a[$prefix.'returnType'] = new ClassStub($a[$prefix.'returnType'] instanceof \ReflectionNamedType && $a[$prefix.'returnType']->allowsNull() && 'mixed' !== $v ? '?'.$v : $v, [class_exists($v, false) || interface_exists($v, false) || trait_exists($v, false) ? $v : '', '']); + $a[$prefix.'returnType'] = new ClassStub($a[$prefix.'returnType'] instanceof \ReflectionNamedType && $a[$prefix.'returnType']->allowsNull() && !\in_array($v, ['mixed', 'null'], true) ? '?'.$v : $v, [class_exists($v, false) || interface_exists($v, false) || trait_exists($v, false) ? $v : '', '']); } if (isset($a[$prefix.'class'])) { $a[$prefix.'class'] = new ClassStub($a[$prefix.'class']); @@ -413,7 +413,7 @@ public static function getSignature(array $a) if (!$type instanceof \ReflectionNamedType) { $signature .= $type.' '; } else { - if ($param->allowsNull() && 'mixed' !== $type->getName()) { + if ($param->allowsNull() && !\in_array($type->getName(), ['mixed', 'null'], true)) { $signature .= '?'; } $signature .= substr(strrchr('\\'.$type->getName(), '\\'), 1).' '; diff --git a/vendor/symfony/var-dumper/Dumper/CliDumper.php b/vendor/symfony/var-dumper/Dumper/CliDumper.php index 5bd42529..e36cee6a 100644 --- a/vendor/symfony/var-dumper/Dumper/CliDumper.php +++ b/vendor/symfony/var-dumper/Dumper/CliDumper.php @@ -621,7 +621,7 @@ private function hasColorSupport(mixed $stream): bool } // Follow https://no-color.org/ - if (isset($_SERVER['NO_COLOR']) || false !== getenv('NO_COLOR')) { + if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) { return false; } diff --git a/vendor/vlucas/phpdotenv/composer.json b/vendor/vlucas/phpdotenv/composer.json index fb972d75..3636317f 100644 --- a/vendor/vlucas/phpdotenv/composer.json +++ b/vendor/vlucas/phpdotenv/composer.json @@ -18,8 +18,8 @@ "require": { "php": "^7.2.5 || ^8.0", "ext-pcre": "*", - "graham-campbell/result-type": "^1.1.2", - "phpoption/phpoption": "^1.9.2", + "graham-campbell/result-type": "^1.1.3", + "phpoption/phpoption": "^1.9.3", "symfony/polyfill-ctype": "^1.24", "symfony/polyfill-mbstring": "^1.24", "symfony/polyfill-php80": "^1.24" @@ -51,7 +51,7 @@ "extra": { "bamarni-bin": { "bin-links": true, - "forward-command": true + "forward-command": false }, "branch-alias": { "dev-master": "5.6-dev" diff --git a/vendor/vlucas/phpdotenv/src/Dotenv.php b/vendor/vlucas/phpdotenv/src/Dotenv.php index 0460ced2..6821c7d9 100644 --- a/vendor/vlucas/phpdotenv/src/Dotenv.php +++ b/vendor/vlucas/phpdotenv/src/Dotenv.php @@ -80,7 +80,7 @@ public function __construct( * * @return \Dotenv\Dotenv */ - public static function create(RepositoryInterface $repository, $paths, $names = null, bool $shortCircuit = true, string $fileEncoding = null) + public static function create(RepositoryInterface $repository, $paths, $names = null, bool $shortCircuit = true, ?string $fileEncoding = null) { $builder = $names === null ? StoreBuilder::createWithDefaultName() : StoreBuilder::createWithNoNames(); @@ -109,7 +109,7 @@ public static function create(RepositoryInterface $repository, $paths, $names = * * @return \Dotenv\Dotenv */ - public static function createMutable($paths, $names = null, bool $shortCircuit = true, string $fileEncoding = null) + public static function createMutable($paths, $names = null, bool $shortCircuit = true, ?string $fileEncoding = null) { $repository = RepositoryBuilder::createWithDefaultAdapters()->make(); @@ -126,7 +126,7 @@ public static function createMutable($paths, $names = null, bool $shortCircuit = * * @return \Dotenv\Dotenv */ - public static function createUnsafeMutable($paths, $names = null, bool $shortCircuit = true, string $fileEncoding = null) + public static function createUnsafeMutable($paths, $names = null, bool $shortCircuit = true, ?string $fileEncoding = null) { $repository = RepositoryBuilder::createWithDefaultAdapters() ->addAdapter(PutenvAdapter::class) @@ -145,7 +145,7 @@ public static function createUnsafeMutable($paths, $names = null, bool $shortCir * * @return \Dotenv\Dotenv */ - public static function createImmutable($paths, $names = null, bool $shortCircuit = true, string $fileEncoding = null) + public static function createImmutable($paths, $names = null, bool $shortCircuit = true, ?string $fileEncoding = null) { $repository = RepositoryBuilder::createWithDefaultAdapters()->immutable()->make(); @@ -162,7 +162,7 @@ public static function createImmutable($paths, $names = null, bool $shortCircuit * * @return \Dotenv\Dotenv */ - public static function createUnsafeImmutable($paths, $names = null, bool $shortCircuit = true, string $fileEncoding = null) + public static function createUnsafeImmutable($paths, $names = null, bool $shortCircuit = true, ?string $fileEncoding = null) { $repository = RepositoryBuilder::createWithDefaultAdapters() ->addAdapter(PutenvAdapter::class) @@ -182,7 +182,7 @@ public static function createUnsafeImmutable($paths, $names = null, bool $shortC * * @return \Dotenv\Dotenv */ - public static function createArrayBacked($paths, $names = null, bool $shortCircuit = true, string $fileEncoding = null) + public static function createArrayBacked($paths, $names = null, bool $shortCircuit = true, ?string $fileEncoding = null) { $repository = RepositoryBuilder::createWithNoAdapters()->addAdapter(ArrayAdapter::class)->make(); diff --git a/vendor/vlucas/phpdotenv/src/Parser/Entry.php b/vendor/vlucas/phpdotenv/src/Parser/Entry.php index 7570f587..716f422e 100644 --- a/vendor/vlucas/phpdotenv/src/Parser/Entry.php +++ b/vendor/vlucas/phpdotenv/src/Parser/Entry.php @@ -30,7 +30,7 @@ final class Entry * * @return void */ - public function __construct(string $name, Value $value = null) + public function __construct(string $name, ?Value $value = null) { $this->name = $name; $this->value = $value; diff --git a/vendor/vlucas/phpdotenv/src/Repository/RepositoryBuilder.php b/vendor/vlucas/phpdotenv/src/Repository/RepositoryBuilder.php index a042f9a1..76079244 100644 --- a/vendor/vlucas/phpdotenv/src/Repository/RepositoryBuilder.php +++ b/vendor/vlucas/phpdotenv/src/Repository/RepositoryBuilder.php @@ -65,7 +65,7 @@ final class RepositoryBuilder * * @return void */ - private function __construct(array $readers = [], array $writers = [], bool $immutable = false, array $allowList = null) + private function __construct(array $readers = [], array $writers = [], bool $immutable = false, ?array $allowList = null) { $this->readers = $readers; $this->writers = $writers; @@ -244,7 +244,7 @@ public function immutable() * * @return \Dotenv\Repository\RepositoryBuilder */ - public function allowList(array $allowList = null) + public function allowList(?array $allowList = null) { return new self($this->readers, $this->writers, $this->immutable, $allowList); } diff --git a/vendor/vlucas/phpdotenv/src/Store/File/Reader.php b/vendor/vlucas/phpdotenv/src/Store/File/Reader.php index bcbbf7ad..b0b7c5b4 100644 --- a/vendor/vlucas/phpdotenv/src/Store/File/Reader.php +++ b/vendor/vlucas/phpdotenv/src/Store/File/Reader.php @@ -40,7 +40,7 @@ private function __construct() * * @return array */ - public static function read(array $filePaths, bool $shortCircuit = true, string $fileEncoding = null) + public static function read(array $filePaths, bool $shortCircuit = true, ?string $fileEncoding = null) { $output = []; @@ -67,7 +67,7 @@ public static function read(array $filePaths, bool $shortCircuit = true, string * * @return \PhpOption\Option */ - private static function readFromFile(string $path, string $encoding = null) + private static function readFromFile(string $path, ?string $encoding = null) { /** @var Option */ $content = Option::fromValue(@\file_get_contents($path), false); diff --git a/vendor/vlucas/phpdotenv/src/Store/FileStore.php b/vendor/vlucas/phpdotenv/src/Store/FileStore.php index 43f6135c..e7a4d3f1 100644 --- a/vendor/vlucas/phpdotenv/src/Store/FileStore.php +++ b/vendor/vlucas/phpdotenv/src/Store/FileStore.php @@ -39,7 +39,7 @@ final class FileStore implements StoreInterface * * @return void */ - public function __construct(array $filePaths, bool $shortCircuit, string $fileEncoding = null) + public function __construct(array $filePaths, bool $shortCircuit, ?string $fileEncoding = null) { $this->filePaths = $filePaths; $this->shortCircuit = $shortCircuit; diff --git a/vendor/vlucas/phpdotenv/src/Store/StoreBuilder.php b/vendor/vlucas/phpdotenv/src/Store/StoreBuilder.php index 304117fc..2ce08515 100644 --- a/vendor/vlucas/phpdotenv/src/Store/StoreBuilder.php +++ b/vendor/vlucas/phpdotenv/src/Store/StoreBuilder.php @@ -51,7 +51,7 @@ final class StoreBuilder * * @return void */ - private function __construct(array $paths = [], array $names = [], bool $shortCircuit = false, string $fileEncoding = null) + private function __construct(array $paths = [], array $names = [], bool $shortCircuit = false, ?string $fileEncoding = null) { $this->paths = $paths; $this->names = $names; @@ -120,7 +120,7 @@ public function shortCircuit() * * @return \Dotenv\Store\StoreBuilder */ - public function fileEncoding(string $fileEncoding = null) + public function fileEncoding(?string $fileEncoding = null) { return new self($this->paths, $this->names, $this->shortCircuit, $fileEncoding); } diff --git a/vendor/vlucas/phpdotenv/src/Util/Regex.php b/vendor/vlucas/phpdotenv/src/Util/Regex.php index 52c15780..b17355c6 100644 --- a/vendor/vlucas/phpdotenv/src/Util/Regex.php +++ b/vendor/vlucas/phpdotenv/src/Util/Regex.php @@ -64,7 +64,7 @@ public static function occurrences(string $pattern, string $subject) * * @return \GrahamCampbell\ResultType\Result */ - public static function replaceCallback(string $pattern, callable $callback, string $subject, int $limit = null) + public static function replaceCallback(string $pattern, callable $callback, string $subject, ?int $limit = null) { return self::pregAndWrap(static function (string $subject) use ($pattern, $callback, $limit) { return (string) @\preg_replace_callback($pattern, $callback, $subject, $limit ?? -1); diff --git a/vendor/vlucas/phpdotenv/src/Util/Str.php b/vendor/vlucas/phpdotenv/src/Util/Str.php index 087e236a..15257bdf 100644 --- a/vendor/vlucas/phpdotenv/src/Util/Str.php +++ b/vendor/vlucas/phpdotenv/src/Util/Str.php @@ -33,7 +33,7 @@ private function __construct() * * @return \GrahamCampbell\ResultType\Result */ - public static function utf8(string $input, string $encoding = null) + public static function utf8(string $input, ?string $encoding = null) { if ($encoding !== null && !\in_array($encoding, \mb_list_encodings(), true)) { /** @var \GrahamCampbell\ResultType\Result */ @@ -79,7 +79,7 @@ public static function pos(string $haystack, string $needle) * * @return string */ - public static function substr(string $input, int $start, int $length = null) + public static function substr(string $input, int $start, ?int $length = null) { return \mb_substr($input, $start, $length, 'UTF-8'); } diff --git a/vendor/voku/portable-ascii/CHANGELOG.md b/vendor/voku/portable-ascii/CHANGELOG.md index 12fc393a..52f4912e 100644 --- a/vendor/voku/portable-ascii/CHANGELOG.md +++ b/vendor/voku/portable-ascii/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### 2.0.3 (2024-11-21) + +- use modern phpdocs e.g. list or conditional-return annotations + +### 2.0.2 (2024-11-21) + +- small fix for PHP 8.4 (thanks to @gilbertoalbino) + ### 2.0.1 (2022-03-08) - "To people of Russia": There is a war in Ukraine right now. The forces of the Russian Federation are attacking civilians. diff --git a/vendor/voku/portable-ascii/composer.json b/vendor/voku/portable-ascii/composer.json index 99dee4f8..b3a22fa8 100644 --- a/vendor/voku/portable-ascii/composer.json +++ b/vendor/voku/portable-ascii/composer.json @@ -12,7 +12,7 @@ "authors": [ { "name": "Lars Moelleken", - "homepage": "http://www.moelleken.org/" + "homepage": "https://www.moelleken.org/" } ], "require": { diff --git a/vendor/voku/portable-ascii/src/voku/helper/ASCII.php b/vendor/voku/portable-ascii/src/voku/helper/ASCII.php index 7d8b66de..406407e1 100644 --- a/vendor/voku/portable-ascii/src/voku/helper/ASCII.php +++ b/vendor/voku/portable-ascii/src/voku/helper/ASCII.php @@ -214,9 +214,9 @@ final class ASCII /** * Get all languages from the constants "ASCII::.*LANGUAGE_CODE". * - * @return string[] - * - * @phpstan-return array + * @return array + *

An associative array where the key is the language code in lowercase + * and the value is the corresponding language string.

*/ public static function getAllLanguages(): array { @@ -246,15 +246,13 @@ public static function getAllLanguages(): array * var_dump($array['ru']['б']); // 'b' * * - * @psalm-suppress InvalidNullableReturnType - we use the prepare* methods here, so we don't get NULL here - * * @param bool $replace_extra_symbols [optional]

Add some more replacements e.g. "£" with " pound ".

* * @psalm-pure * - * @return array - * - * @phpstan-return array> + * @return array> + *

An array where the key is the language code, and the value is + * an associative array mapping original characters to their replacements.

*/ public static function charsArray(bool $replace_extra_symbols = false): array { @@ -281,14 +279,11 @@ public static function charsArray(bool $replace_extra_symbols = false): array * * @psalm-pure * - * @return array - *

An array of replacements.

- * - * @phpstan-return array> + * @return array> + *

An array of replacements.

*/ public static function charsArrayWithMultiLanguageValues(bool $replace_extra_symbols = false): array { - /** @var array>> */ static $CHARS_ARRAY = []; $cacheKey = '' . $replace_extra_symbols; @@ -303,18 +298,13 @@ public static function charsArrayWithMultiLanguageValues(bool $replace_extra_sym false ); - /** @noinspection PhpSillyAssignmentInspection - hack for phpstan */ - /** @var array $language_all_chars */ - $language_all_chars = $language_all_chars; - - /** @noinspection AlterInForeachInspection */ + /* @noinspection AlterInForeachInspection | ok here */ foreach ($language_all_chars as $key => &$value) { $return[$value][] = $key; } $CHARS_ARRAY[$cacheKey] = $return; - /** @var array> $return - hack for phpstan */ return $return; } @@ -330,21 +320,17 @@ public static function charsArrayWithMultiLanguageValues(bool $replace_extra_sym * echo $array['orig'][$tmpKey]; // 'ё' * * - * @psalm-suppress InvalidNullableReturnType - we use the prepare* methods here, so we don't get NULL here - * * @param string $language [optional]

Language of the source string e.g.: en, de_at, or de-ch. * (default is 'en') | ASCII::*_LANGUAGE_CODE

* @param bool $replace_extra_symbols [optional]

Add some more replacements e.g. "£" with " pound ".

- * @param bool $asOrigReplaceArray [optional]

TRUE === return {orig: string[], replace: string[]} + * @param bool $asOrigReplaceArray [optional]

TRUE === return {orig: list, replace: list} * array

* * @psalm-pure * - * @return array - *

An array of replacements.

+ * @return ($asOrigReplaceArray is true ? array{orig: list, replace: list} : array) * * @phpstan-param ASCII::*_LANGUAGE_CODE $language - * @phpstan-return array{orig: string[], replace: string[]}|array */ public static function charsArrayWithOneLanguage( string $language = self::ENGLISH_LANGUAGE_CODE, @@ -354,7 +340,6 @@ public static function charsArrayWithOneLanguage( $language = self::get_language($language); // init - /** @var array|array{orig: string[], replace: string[]}>> */ static $CHARS_ARRAY = []; $cacheKey = '' . $replace_extra_symbols . '-' . $asOrigReplaceArray; @@ -366,7 +351,6 @@ public static function charsArrayWithOneLanguage( if ($replace_extra_symbols) { self::prepareAsciiAndExtrasMaps(); - /** @noinspection DuplicatedCode */ if (isset(self::$ASCII_MAPS_AND_EXTRAS[$language])) { $tmpArray = self::$ASCII_MAPS_AND_EXTRAS[$language]; @@ -379,7 +363,6 @@ public static function charsArrayWithOneLanguage( $CHARS_ARRAY[$cacheKey][$language] = $tmpArray; } } else { - /** @noinspection NestedPositiveIfStatementsInspection */ if ($asOrigReplaceArray) { $CHARS_ARRAY[$cacheKey][$language] = [ 'orig' => [], @@ -392,7 +375,6 @@ public static function charsArrayWithOneLanguage( } else { self::prepareAsciiMaps(); - /** @noinspection DuplicatedCode */ if (isset(self::$ASCII_MAPS[$language])) { $tmpArray = self::$ASCII_MAPS[$language]; @@ -405,7 +387,6 @@ public static function charsArrayWithOneLanguage( $CHARS_ARRAY[$cacheKey][$language] = $tmpArray; } } else { - /** @noinspection NestedPositiveIfStatementsInspection */ if ($asOrigReplaceArray) { $CHARS_ARRAY[$cacheKey][$language] = [ 'orig' => [], @@ -430,22 +411,18 @@ public static function charsArrayWithOneLanguage( * * * @param bool $replace_extra_symbols [optional]

Add some more replacements e.g. "£" with " pound ".

- * @param bool $asOrigReplaceArray [optional]

TRUE === return {orig: string[], replace: string[]} + * @param bool $asOrigReplaceArray [optional]

TRUE === return {orig: list, replace: list} * array

* * @psalm-pure * - * @return array - *

An array of replacements.

- * - * @phpstan-return array{orig: string[], replace: string[]}|array + * @return ($asOrigReplaceArray is true ? array{orig: list, replace: list} : array) */ public static function charsArrayWithSingleLanguageValues( bool $replace_extra_symbols = false, bool $asOrigReplaceArray = true ): array { // init - /** @var array|array{orig: string[], replace: string[]}> */ static $CHARS_ARRAY = []; $cacheKey = '' . $replace_extra_symbols . '-' . $asOrigReplaceArray; @@ -456,22 +433,19 @@ public static function charsArrayWithSingleLanguageValues( if ($replace_extra_symbols) { self::prepareAsciiAndExtrasMaps(); - /** @noinspection AlterInForeachInspection */ - /** @psalm-suppress PossiblyNullIterator - we use the prepare* methods here, so we don't get NULL here */ + /* @noinspection AlterInForeachInspection | ok here */ foreach (self::$ASCII_MAPS_AND_EXTRAS ?? [] as &$map) { $CHARS_ARRAY[$cacheKey][] = $map; } } else { self::prepareAsciiMaps(); - /** @noinspection AlterInForeachInspection */ - /** @psalm-suppress PossiblyNullIterator - we use the prepare* methods here, so we don't get NULL here */ + /* @noinspection AlterInForeachInspection | ok here */ foreach (self::$ASCII_MAPS ?? [] as &$map) { $CHARS_ARRAY[$cacheKey][] = $map; } } - /** @phpstan-ignore-next-line - ... error? */ $CHARS_ARRAY[$cacheKey] = \array_merge([], ...$CHARS_ARRAY[$cacheKey]); if ($asOrigReplaceArray) { @@ -590,13 +564,11 @@ public static function normalize_msword(string $str): string return ''; } - /** @var array{orig: string[], replace: string[]} */ static $MSWORD_CACHE = ['orig' => [], 'replace' => []]; if (empty($MSWORD_CACHE['orig'])) { self::prepareAsciiMaps(); - /** @var array */ $map = self::$ASCII_MAPS[self::EXTRA_MSWORD_CHARS_LANGUAGE_CODE] ?? []; $MSWORD_CACHE = [ @@ -636,7 +608,6 @@ public static function normalize_whitespace( return ''; } - /** @var array> */ static $WHITESPACE_CACHE = []; $cacheKey = (int) $keepNonBreakingSpace; @@ -673,7 +644,6 @@ public static function normalize_whitespace( } if (!$keepBidiUnicodeControls) { - /** @var array|null */ static $BIDI_UNICODE_CONTROLS_CACHE = null; if ($BIDI_UNICODE_CONTROLS_CACHE === null) { @@ -689,7 +659,7 @@ public static function normalize_whitespace( /** * Remove invisible characters from a string. * - * e.g.: This prevents sandwiching null characters between ascii characters, like Java\0script. + * This prevents malicious code injection through null bytes or other control characters. * * copy&past from https://github.com/bcit-ci/CodeIgniter/blob/develop/system/core/Common.php * @@ -735,21 +705,16 @@ public static function remove_invisible_characters( } /** - * WARNING: This method will return broken characters and is only for special cases. + * WARNING: This method will return broken characters and is only for special cases. * - * Convert two UTF-8 encoded string to a single-byte strings suitable for + * Convert two UTF-8 encoded strings to a single-byte strings suitable for * functions that need the same string length after the conversion. * * The function simply uses (and updates) a tailored dynamic encoding * (in/out map parameter) where non-ascii characters are remapped to * the range [128-255] in order of appearance. * - * @param string $str1 - * @param string $str2 - * - * @return string[] - * - * @phpstan-return array{0: string, 1: string} + * @return array{0: string, 1: string} */ public static function to_ascii_remap(string $str1, string $str2): array { @@ -775,14 +740,14 @@ public static function to_ascii_remap(string $str1, string $str2): array * @param string $str

The input string.

* @param string $language [optional]

Language of the source string. * (default is 'en') | ASCII::*_LANGUAGE_CODE

- * @param bool $remove_unsupported_chars [optional]

Whether or not to remove the + * @param bool $remove_unsupported_chars [optional]

Whether to remove the * unsupported characters.

* @param bool $replace_extra_symbols [optional]

Add some more replacements e.g. "£" with " pound * ".

* @param bool $use_transliterate [optional]

Use ASCII::to_transliterate() for unknown chars.

- * @param bool|null $replace_single_chars_only [optional]

Single char replacement is better for the - * performance, but some languages need to replace more then one char - * at the same time. | NULL === auto-setting, depended on the + * @param bool $replace_single_chars_only [optional]

Single char replacement is better for the + * performance, but some languages need to replace more than one char + * at the same time. If FALSE === auto-setting, depended on the * language

* * @psalm-pure @@ -798,18 +763,17 @@ public static function to_ascii( bool $remove_unsupported_chars = true, bool $replace_extra_symbols = false, bool $use_transliterate = false, - bool $replace_single_chars_only = null + bool $replace_single_chars_only = false ): string { if ($str === '') { return ''; } - /** @phpstan-var ASCII::*_LANGUAGE_CODE - hack for phpstan */ + /** @phpstan-var ASCII::*_LANGUAGE_CODE $language - hack for phpstan */ $language = self::get_language($language); static $EXTRA_SYMBOLS_CACHE = null; - /** @var array> */ static $REPLACE_HELPER_CACHE = []; $cacheKey = $language . '-' . $replace_extra_symbols; @@ -977,7 +941,6 @@ public static function to_ascii( } } - /** @psalm-suppress PossiblyNullOperand - we use the prepare* methods here, so we don't get NULL here */ if (!isset(self::$ASCII_MAPS[$language])) { $use_transliterate = true; } @@ -1001,10 +964,10 @@ public static function to_ascii( * ASCII::to_filename('שדגשדג.png', true)); // 'shdgshdg.png' * * - * @param string $str + * @param string $str

The string input.

* @param bool $use_transliterate

ASCII::to_transliterate() is used by default - unsafe characters are * simply replaced with hyphen otherwise.

- * @param string $fallback_char + * @param string $fallback_char

The fallback character. - "-" is the default

* * @psalm-pure * @@ -1040,27 +1003,27 @@ public static function to_filename( } /** - * Converts the string into an URL slug. This includes replacing non-ASCII - * characters with their closest ASCII equivalents, removing remaining - * non-ASCII and non-alphanumeric characters, and replacing whitespace with - * $separator. The separator defaults to a single dash, and the string - * is also converted to lowercase. The language of the source string can - * also be supplied for language-specific transliteration. - * - * @param string $str + * Converts a string into a URL-friendly slug. + * + * - This includes replacing non-ASCII characters with their closest ASCII equivalents, removing remaining + * non-ASCII and non-alphanumeric characters, and replacing whitespace with $separator. + * - The separator defaults to a single dash, and the string is also converted to lowercase. + * - The language of the source string can also be supplied for language-specific transliteration. + * + * @param string $str

The string input.

* @param string $separator [optional]

The string used to replace whitespace.

* @param string $language [optional]

Language of the source string. * (default is 'en') | ASCII::*_LANGUAGE_CODE

* @param array $replacements [optional]

A map of replaceable strings.

- * @param bool $replace_extra_symbols [optional]

Add some more replacements e.g. "£" with " + * @param bool $replace_extra_symbols [optional]

Add some more replacements e.g. "£" with " * pound ".

* @param bool $use_str_to_lower [optional]

Use "string to lower" for the input.

- * @param bool $use_transliterate [optional]

Use ASCII::to_transliterate() for unknown + * @param bool $use_transliterate [optional]

Use ASCII::to_transliterate() for unknown * chars.

* @psalm-pure * * @return string - *

A string that has been converted to an URL slug.

+ *

The URL-friendly slug.

* * @phpstan-param ASCII::*_LANGUAGE_CODE $language */ @@ -1135,21 +1098,16 @@ public static function to_slugify( * * @return string *

A String that contains only ASCII characters.

- * - * @noinspection ParameterDefaultValueIsNotNullInspection */ public static function to_transliterate( string $str, $unknown = '?', bool $strict = false ): string { - /** @var array|null */ static $UTF8_TO_TRANSLIT = null; - /** null|\Transliterator */ static $TRANSLITERATOR = null; - /** @var bool|null */ static $SUPPORT_INTL = null; if ($str === '') { @@ -1168,7 +1126,7 @@ public static function to_transliterate( $str = self::clean($str); - // check again, if we only have ASCII, now ... + // check again if we only have ASCII, now ... if ( $str_tmp !== $str && @@ -1184,7 +1142,6 @@ public static function to_transliterate( ) { if (!isset($TRANSLITERATOR)) { // INFO: see "*-Latin" rules via "transliterator_list_ids()" - /** @var \Transliterator */ $TRANSLITERATOR = \transliterator_create('NFKC; [:Nonspacing Mark:] Remove; NFKC; Any-Latin; Latin-ASCII;'); } @@ -1192,8 +1149,7 @@ public static function to_transliterate( $str_tmp = \transliterator_transliterate($TRANSLITERATOR, $str); if ($str_tmp !== false) { - - // check again, if we only have ASCII, now ... + // check again if we only have ASCII, now ... if ( $str_tmp !== $str && @@ -1285,7 +1241,6 @@ public static function to_transliterate( $new_char = $ord & 255; if (isset($UTF8_TO_TRANSLIT[$bank][$new_char])) { - // keep for debugging /* echo "file: " . sprintf('x%02x', $bank) . "\n"; @@ -1299,8 +1254,7 @@ public static function to_transliterate( $new_char = $UTF8_TO_TRANSLIT[$bank][$new_char]; - /** @noinspection MissingOrEmptyGroupStatementInspection */ - /** @noinspection PhpStatementHasEmptyBodyInspection */ + /* @noinspection PhpStatementHasEmptyBodyInspection */ if ($unknown === null && $new_char === '') { // nothing } elseif ( @@ -1313,7 +1267,6 @@ public static function to_transliterate( $c = $new_char; } } else { - // keep for debugging missing chars /* echo "file: " . sprintf('x%02x', $bank) . "\n"; @@ -1352,7 +1305,7 @@ public static function to_transliterate( * @param array $map

Internal-Map of code points to ASCII characters.

* * @return string - *

Mapped borken string.

+ *

Mapped broken string.

* * @phpstan-param array $map */ @@ -1385,12 +1338,6 @@ private static function to_ascii_remap_intern(string $str, array &$map): string * DE_DE -> de * de-de -> de * - * @noinspection ReturnTypeCanBeDeclaredInspection - * - * @param string $language - * - * @psalm-pure - * * @return string */ private static function get_language(string $language) @@ -1417,39 +1364,22 @@ private static function get_language(string $language) /** * Get data from "/data/*.php". * - * @noinspection ReturnTypeCanBeDeclaredInspection - * - * @param string $file - * - * @psalm-pure - * - * @return array + * @return array */ private static function getData(string $file) { - /** @noinspection PhpIncludeInspection */ - /** @noinspection UsingInclusionReturnValueInspection */ - /** @psalm-suppress UnresolvableInclude */ return include __DIR__ . '/data/' . $file . '.php'; } /** * Get data from "/data/*.php". * - * @param string $file - * - * @psalm-pure - * - * @return array + * @return array */ private static function getDataIfExists(string $file): array { $file = __DIR__ . '/data/' . $file . '.php'; - /** @psalm-suppress ImpureFunctionCall */ if (\is_file($file)) { - /** @noinspection PhpIncludeInspection */ - /** @noinspection UsingInclusionReturnValueInspection */ - /** @psalm-suppress UnresolvableInclude */ return include $file; } @@ -1457,8 +1387,6 @@ private static function getDataIfExists(string $file): array } /** - * @psalm-pure - * * @return void */ private static function prepareAsciiAndExtrasMaps() @@ -1467,7 +1395,6 @@ private static function prepareAsciiAndExtrasMaps() self::prepareAsciiMaps(); self::prepareAsciiExtras(); - /** @psalm-suppress PossiblyNullArgument - we use the prepare* methods here, so we don't get NULL here */ self::$ASCII_MAPS_AND_EXTRAS = \array_merge_recursive( self::$ASCII_MAPS ?? [], self::$ASCII_EXTRAS ?? [] @@ -1476,8 +1403,6 @@ private static function prepareAsciiAndExtrasMaps() } /** - * @psalm-pure - * * @return void */ private static function prepareAsciiMaps() @@ -1488,8 +1413,6 @@ private static function prepareAsciiMaps() } /** - * @psalm-pure - * * @return void */ private static function prepareAsciiExtras()