-
Notifications
You must be signed in to change notification settings - Fork 672
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '5.x' into upstream-master
- Loading branch information
Showing
104 changed files
with
3,780 additions
and
812 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,150 +1,150 @@ | ||
| { | ||
| "name": "vimeo/psalm", | ||
| "type": "project", | ||
| "description": "A static analysis tool for finding errors in PHP applications", | ||
| "keywords": [ | ||
| "php", | ||
| "code", | ||
| "inspection", | ||
| "static analysis" | ||
| ], | ||
| "license": "MIT", | ||
| "authors": [ | ||
| { | ||
| "name": "Matthew Brown" | ||
| } | ||
| ], | ||
| "require": { | ||
| "php": "~8.1.17 || ~8.2.4 || ~8.3.0", | ||
| "ext-SimpleXML": "*", | ||
| "ext-ctype": "*", | ||
| "ext-dom": "*", | ||
| "ext-json": "*", | ||
| "ext-libxml": "*", | ||
| "ext-mbstring": "*", | ||
| "ext-tokenizer": "*", | ||
| "composer-runtime-api": "^2", | ||
| "amphp/amp": "^3", | ||
| "amphp/byte-stream": "^2", | ||
| "composer/semver": "^1.4 || ^2.0 || ^3.0", | ||
| "composer/xdebug-handler": "^2.0 || ^3.0", | ||
| "dnoegel/php-xdg-base-dir": "^0.1.1", | ||
| "felixfbecker/advanced-json-rpc": "^3.1", | ||
| "felixfbecker/language-server-protocol": "^1.5.2", | ||
| "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1", | ||
| "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", | ||
| "nikic/php-parser": "^4.16", | ||
| "sebastian/diff": "^4.0 || ^5.0", | ||
| "spatie/array-to-xml": "^2.17.0 || ^3.0", | ||
| "symfony/console": "^4.1.6 || ^5.0 || ^6.0 || ^7.0", | ||
| "symfony/filesystem": "^5.4 || ^6.0 || ^7.0" | ||
| }, | ||
| "conflict": { | ||
| "nikic/php-parser": "4.17.0" | ||
| }, | ||
| "provide": { | ||
| "psalm/psalm": "self.version" | ||
| }, | ||
| "require-dev": { | ||
| "ext-curl": "*", | ||
| "amphp/phpunit-util": "^3", | ||
| "bamarni/composer-bin-plugin": "^1.4", | ||
| "brianium/paratest": "^6.9", | ||
| "dg/bypass-finals": "^1.5", | ||
| "mockery/mockery": "^1.5", | ||
| "nunomaduro/mock-final-classes": "^1.1", | ||
| "php-parallel-lint/php-parallel-lint": "^1.2", | ||
| "phpstan/phpdoc-parser": "^1.6", | ||
| "phpunit/phpunit": "^9.6", | ||
| "psalm/plugin-mockery": "^1.1", | ||
| "psalm/plugin-phpunit": "^0.18", | ||
| "slevomat/coding-standard": "^8.4", | ||
| "squizlabs/php_codesniffer": "^3.6", | ||
| "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0" | ||
| }, | ||
| "suggest": { | ||
| "ext-igbinary": "^2.0.5 is required, used to serialize caching data", | ||
| "ext-curl": "In order to send data to shepherd" | ||
| }, | ||
| "config": { | ||
| "allow-plugins": { | ||
| "bamarni/composer-bin-plugin": true, | ||
| "composer/package-versions-deprecated": true, | ||
| "dealerdirect/phpcodesniffer-composer-installer": true | ||
| }, | ||
| "optimize-autoloader": true, | ||
| "sort-packages": true, | ||
| "platform-check": true | ||
| }, | ||
| "extra": { | ||
| "branch-alias": { | ||
| "dev-master": "6.x-dev", | ||
| "dev-5.x": "5.x-dev", | ||
| "dev-4.x": "4.x-dev", | ||
| "dev-3.x": "3.x-dev", | ||
| "dev-2.x": "2.x-dev", | ||
| "dev-1.x": "1.x-dev" | ||
| } | ||
| }, | ||
| "autoload": { | ||
| "psr-4": { | ||
| "Psalm\\": "src/Psalm/" | ||
| } | ||
| }, | ||
| "autoload-dev": { | ||
| "psr-4": { | ||
| "Psalm\\Tests\\": "tests/" | ||
| } | ||
| "name": "vimeo/psalm", | ||
| "type": "project", | ||
| "description": "A static analysis tool for finding errors in PHP applications", | ||
| "keywords": [ | ||
| "php", | ||
| "code", | ||
| "inspection", | ||
| "static analysis" | ||
| ], | ||
| "license": "MIT", | ||
| "authors": [ | ||
| { | ||
| "name": "Matthew Brown" | ||
| } | ||
| ], | ||
| "require": { | ||
| "php": "~8.1.17 || ~8.2.4 || ~8.3.0", | ||
| "ext-SimpleXML": "*", | ||
| "ext-ctype": "*", | ||
| "ext-dom": "*", | ||
| "ext-json": "*", | ||
| "ext-libxml": "*", | ||
| "ext-mbstring": "*", | ||
| "ext-tokenizer": "*", | ||
| "composer-runtime-api": "^2", | ||
| "amphp/amp": "^3", | ||
| "amphp/byte-stream": "^2", | ||
| "composer/semver": "^1.4 || ^2.0 || ^3.0", | ||
| "composer/xdebug-handler": "^2.0 || ^3.0", | ||
| "dnoegel/php-xdg-base-dir": "^0.1.1", | ||
| "felixfbecker/advanced-json-rpc": "^3.1", | ||
| "felixfbecker/language-server-protocol": "^1.5.2", | ||
| "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0", | ||
| "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", | ||
| "nikic/php-parser": "^4.16", | ||
| "sebastian/diff": "^4.0 || ^5.0", | ||
| "spatie/array-to-xml": "^2.17.0 || ^3.0", | ||
| "symfony/console": "^4.1.6 || ^5.0 || ^6.0 || ^7.0", | ||
| "symfony/filesystem": "^5.4 || ^6.0 || ^7.0" | ||
| }, | ||
| "conflict": { | ||
| "nikic/php-parser": "4.17.0" | ||
| }, | ||
| "provide": { | ||
| "psalm/psalm": "self.version" | ||
| }, | ||
| "require-dev": { | ||
| "ext-curl": "*", | ||
| "amphp/phpunit-util": "^3", | ||
| "bamarni/composer-bin-plugin": "^1.4", | ||
| "brianium/paratest": "^6.9", | ||
| "dg/bypass-finals": "^1.5", | ||
| "mockery/mockery": "^1.5", | ||
| "nunomaduro/mock-final-classes": "^1.1", | ||
| "php-parallel-lint/php-parallel-lint": "^1.2", | ||
| "phpstan/phpdoc-parser": "^1.6", | ||
| "phpunit/phpunit": "^9.6", | ||
| "psalm/plugin-mockery": "^1.1", | ||
| "psalm/plugin-phpunit": "^0.18", | ||
| "slevomat/coding-standard": "^8.4", | ||
| "squizlabs/php_codesniffer": "^3.6", | ||
| "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0" | ||
| }, | ||
| "suggest": { | ||
| "ext-igbinary": "^2.0.5 is required, used to serialize caching data", | ||
| "ext-curl": "In order to send data to shepherd" | ||
| }, | ||
| "config": { | ||
| "allow-plugins": { | ||
| "bamarni/composer-bin-plugin": true, | ||
| "composer/package-versions-deprecated": true, | ||
| "dealerdirect/phpcodesniffer-composer-installer": true | ||
| }, | ||
| "repositories": [ | ||
| { | ||
| "type": "path", | ||
| "url": "examples/plugins/composer-based/echo-checker" | ||
| } | ||
| "optimize-autoloader": true, | ||
| "sort-packages": true, | ||
| "platform-check": true | ||
| }, | ||
| "extra": { | ||
| "branch-alias": { | ||
| "dev-master": "6.x-dev", | ||
| "dev-5.x": "5.x-dev", | ||
| "dev-4.x": "4.x-dev", | ||
| "dev-3.x": "3.x-dev", | ||
| "dev-2.x": "2.x-dev", | ||
| "dev-1.x": "1.x-dev" | ||
| } | ||
| }, | ||
| "autoload": { | ||
| "psr-4": { | ||
| "Psalm\\": "src/Psalm/" | ||
| } | ||
| }, | ||
| "autoload-dev": { | ||
| "psr-4": { | ||
| "Psalm\\Tests\\": "tests/" | ||
| } | ||
| }, | ||
| "repositories": [ | ||
| { | ||
| "type": "path", | ||
| "url": "examples/plugins/composer-based/echo-checker" | ||
| } | ||
| ], | ||
| "minimum-stability": "dev", | ||
| "prefer-stable": true, | ||
| "bin": [ | ||
| "psalm", | ||
| "psalm-language-server", | ||
| "psalm-plugin", | ||
| "psalm-refactor", | ||
| "psalter" | ||
| ], | ||
| "scripts": { | ||
| "cs": "@php phpcs -ps", | ||
| "cs-fix": "@php phpcbf -ps", | ||
| "lint": "@php parallel-lint ./src ./tests", | ||
| "phpunit": [ | ||
| "Composer\\Config::disableProcessTimeout", | ||
| "@php paratest -f --runner=WrapperRunner" | ||
| ], | ||
| "minimum-stability": "dev", | ||
| "prefer-stable": true, | ||
| "bin": [ | ||
| "psalm", | ||
| "psalm-language-server", | ||
| "psalm-plugin", | ||
| "psalm-refactor", | ||
| "psalter" | ||
| "phpunit-std": [ | ||
| "Composer\\Config::disableProcessTimeout", | ||
| "@php phpunit" | ||
| ], | ||
| "scripts": { | ||
| "cs": "phpcs -ps", | ||
| "cs-fix": "phpcbf -ps", | ||
| "lint": "parallel-lint ./src ./tests", | ||
| "phpunit": [ | ||
| "Composer\\Config::disableProcessTimeout", | ||
| "paratest -f --runner=WrapperRunner" | ||
| ], | ||
| "phpunit-std": [ | ||
| "Composer\\Config::disableProcessTimeout", | ||
| "phpunit" | ||
| ], | ||
| "verify-callmap": "@php phpunit tests/Internal/Codebase/InternalCallMapHandlerTest.php", | ||
| "psalm": "@php ./psalm", | ||
| "psalm-set-baseline": "@php ./psalm --set-baseline=psalm-baseline.xml", | ||
| "tests": [ | ||
| "@lint", | ||
| "@cs", | ||
| "@psalm", | ||
| "@phpunit" | ||
| ] | ||
| }, | ||
| "scripts-descriptions": { | ||
| "cs": "Checks that the code conforms to the coding standard.", | ||
| "cs-fix": "Automatically correct coding standard violations.", | ||
| "lint": "Lint php files.", | ||
| "phpunit": "Runs unit tests in parallel.", | ||
| "phpunit-std": "Runs unit tests.", | ||
| "psalm": "Runs static analysis.", | ||
| "tests": "Runs all available tests." | ||
| }, | ||
| "support": { | ||
| "docs": "https://psalm.dev/docs", | ||
| "issues": "https://github.com/vimeo/psalm/issues", | ||
| "source": "https://github.com/vimeo/psalm" | ||
| } | ||
| "verify-callmap": "@php phpunit tests/Internal/Codebase/InternalCallMapHandlerTest.php", | ||
| "psalm": "@php ./psalm", | ||
| "psalm-set-baseline": "@php ./psalm --set-baseline=psalm-baseline.xml", | ||
| "tests": [ | ||
| "@lint", | ||
| "@cs", | ||
| "@psalm", | ||
| "@phpunit" | ||
| ] | ||
| }, | ||
| "scripts-descriptions": { | ||
| "cs": "Checks that the code conforms to the coding standard.", | ||
| "cs-fix": "Automatically correct coding standard violations.", | ||
| "lint": "Lint php files.", | ||
| "phpunit": "Runs unit tests in parallel.", | ||
| "phpunit-std": "Runs unit tests.", | ||
| "psalm": "Runs static analysis.", | ||
| "tests": "Runs all available tests." | ||
| }, | ||
| "support": { | ||
| "docs": "https://psalm.dev/docs", | ||
| "issues": "https://github.com/vimeo/psalm/issues", | ||
| "source": "https://github.com/vimeo/psalm" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.