From fbd46c683eb553420e771bdbc521e225dd84e6bd Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 31 Jul 2020 17:41:21 +0200 Subject: [PATCH] Try again with local packages. --- .ci/phpstan.neon | 8 +- .ci/phpstan.sh | 8 +- composer.json | 5 + composer.lock | 338 ++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 347 insertions(+), 12 deletions(-) diff --git a/.ci/phpstan.neon b/.ci/phpstan.neon index 7652485198..2aeb078212 100644 --- a/.ci/phpstan.neon +++ b/.ci/phpstan.neon @@ -1,8 +1,8 @@ includes: - - /home/travis/.config/composer/vendor/nunomaduro/larastan/extension.neon - - /home/travis/.config/composer/vendor/ergebnis/phpstan-rules/rules.neon - - /home/travis/.config/composer/vendor/phpstan/phpstan-deprecation-rules/rules.neon - - /home/travis/.config/composer/vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon + - ../vendor/nunomaduro/larastan/extension.neon + - ../vendor/ergebnis/phpstan-rules/rules.neon + - ../vendor/phpstan/phpstan-deprecation-rules/rules.neon + - ../vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon parameters: ignoreErrors: diff --git a/.ci/phpstan.sh b/.ci/phpstan.sh index c12d8ecab9..a01b1978c4 100755 --- a/.ci/phpstan.sh +++ b/.ci/phpstan.sh @@ -4,12 +4,6 @@ echo $PWD # single line install command composer global require hirak/prestissimo \ - phpstan/phpstan \ - ergebnis/phpstan-rules \ - nunomaduro/larastan \ - phpstan/phpstan-deprecation-rules \ - thecodingmachine/phpstan-strict-rules \ - nette/coding-standard \ --no-plugins --no-scripts -~/.config/composer/vendor/bin/phpstan analyse -c .ci/phpstan.neon +./vendor/bin/phpstan analyse -c .ci/phpstan.neon diff --git a/composer.json b/composer.json index 9f9236fabc..76d02250ce 100644 --- a/composer.json +++ b/composer.json @@ -103,13 +103,18 @@ }, "require-dev": { "barryvdh/laravel-ide-helper": "2.*", + "ergebnis/phpstan-rules": "^0.15.0", "filp/whoops": "2.*", "fzaninotto/faker": "1.*", "johnkary/phpunit-speedtrap": "^3.1", "mockery/mockery": "1.*", + "nunomaduro/larastan": "^0.6.2", + "phpstan/phpstan": "^0.12.34", + "phpstan/phpstan-deprecation-rules": "^0.12.5", "phpunit/phpunit": "^8.5", "psalm/plugin-laravel": "^1.1", "roave/security-advisories": "dev-master", + "thecodingmachine/phpstan-strict-rules": "^0.12.0", "vimeo/psalm": "^3.10" }, "suggest": { diff --git a/composer.lock b/composer.lock index 9f7f1510a7..0e0ef7de30 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "efa2c983fdf8fde2ba80b213b9e1bcce", + "content-hash": "375a0c6e94e6d11975b5129e8a6b0ab2", "packages": [ { "name": "adldap2/adldap2", @@ -7312,6 +7312,91 @@ ], "time": "2020-05-29T17:27:14+00:00" }, + { + "name": "ergebnis/phpstan-rules", + "version": "0.15.0", + "source": { + "type": "git", + "url": "https://github.com/ergebnis/phpstan-rules.git", + "reference": "f0c49d0efdaebd9e663e9e5637253ebcc41048d7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/f0c49d0efdaebd9e663e9e5637253ebcc41048d7", + "reference": "f0c49d0efdaebd9e663e9e5637253ebcc41048d7", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "nikic/php-parser": "^4.2.3", + "php": "^7.1", + "phpstan/phpstan": "~0.11.15 || ~0.12.0" + }, + "require-dev": { + "ergebnis/composer-normalize": "^2.5.1", + "ergebnis/license": "~1.0.0", + "ergebnis/php-cs-fixer-config": "^2.1.2", + "ergebnis/test-util": "~1.0.0", + "infection/infection": "~0.13.6", + "nette/di": "^3.0.1", + "phpstan/phpstan-deprecation-rules": "~0.11.2", + "phpstan/phpstan-strict-rules": "~0.11.1", + "phpunit/phpunit": "^7.5.20", + "psalm/plugin-phpunit": "~0.10.0", + "psr/container": "^1.0.0", + "vimeo/psalm": "^3.11.2", + "zendframework/zend-servicemanager": "^2.0.0" + }, + "type": "phpstan-extension", + "extra": { + "phpstan": { + "includes": [ + "rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "Ergebnis\\PHPStan\\Rules\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Andreas Möller", + "email": "am@localheinz.com" + } + ], + "description": "Provides additional rules for phpstan/phpstan.", + "homepage": "https://github.com/ergebnis/phpstan-rules", + "keywords": [ + "PHPStan", + "phpstan-extreme-rules", + "phpstan-rules" + ], + "funding": [ + { + "url": "https://paypal.me/localheinz", + "type": "custom" + }, + { + "url": "https://www.amazon.de/hz/wishlist/ls/2NCHMSJ4BC1OW", + "type": "custom" + }, + { + "url": "https://www.buymeacoffee.com/localheinz", + "type": "custom" + }, + { + "url": "https://github.com/localheinz", + "type": "github" + } + ], + "time": "2020-05-10T18:39:28+00:00" + }, { "name": "felixfbecker/advanced-json-rpc", "version": "v3.1.1", @@ -7892,6 +7977,99 @@ ], "time": "2020-07-02T17:12:47+00:00" }, + { + "name": "nunomaduro/larastan", + "version": "v0.6.2", + "source": { + "type": "git", + "url": "https://github.com/nunomaduro/larastan.git", + "reference": "fd0ab4e585db15618ab6e78b368be456aa8c86ad" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nunomaduro/larastan/zipball/fd0ab4e585db15618ab6e78b368be456aa8c86ad", + "reference": "fd0ab4e585db15618ab6e78b368be456aa8c86ad", + "shasum": "" + }, + "require": { + "composer/composer": "^1.0 || ^2.0", + "ext-json": "*", + "illuminate/console": "^6.0 || ^7.0 || ^8.0", + "illuminate/container": "^6.0 || ^7.0 || ^8.0", + "illuminate/contracts": "^6.0 || ^7.0 || ^8.0", + "illuminate/database": "^6.0 || ^7.0 || ^8.0", + "illuminate/http": "^6.0 || ^7.0 || ^8.0", + "illuminate/pipeline": "^6.0 || ^7.0 || ^8.0", + "illuminate/support": "^6.0 || ^7.0 || ^8.0", + "mockery/mockery": "^0.9 || ^1.0", + "php": "^7.2", + "phpstan/phpstan": "^0.12.34", + "symfony/process": "^4.3 || ^5.0" + }, + "require-dev": { + "orchestra/testbench": "^4.0 || ^5.0", + "phpunit/phpunit": "^7.3 || ^8.2" + }, + "suggest": { + "orchestra/testbench": "^4.0 || ^5.0" + }, + "type": "phpstan-extension", + "extra": { + "branch-alias": { + "dev-master": "0.6-dev" + }, + "phpstan": { + "includes": [ + "extension.neon" + ] + } + }, + "autoload": { + "psr-4": { + "NunoMaduro\\Larastan\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nuno Maduro", + "email": "enunomaduro@gmail.com" + } + ], + "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan wrapper for Laravel", + "keywords": [ + "PHPStan", + "code analyse", + "code analysis", + "larastan", + "laravel", + "package", + "php", + "static analysis" + ], + "funding": [ + { + "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L", + "type": "custom" + }, + { + "url": "https://github.com/canvural", + "type": "github" + }, + { + "url": "https://github.com/nunomaduro", + "type": "github" + }, + { + "url": "https://www.patreon.com/nunomaduro", + "type": "patreon" + } + ], + "time": "2020-07-30T19:33:12+00:00" + }, { "name": "openlss/lib-array2xml", "version": "1.0.0", @@ -8388,6 +8566,113 @@ ], "time": "2020-07-08T12:44:21+00:00" }, + { + "name": "phpstan/phpstan", + "version": "0.12.34", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "ad75388d71fb0b4a954f71a852fd989915a51cb7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ad75388d71fb0b4a954f71a852fd989915a51cb7", + "reference": "ad75388d71fb0b4a954f71a852fd989915a51cb7", + "shasum": "" + }, + "require": { + "php": "^7.1|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.12-dev" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://www.patreon.com/phpstan", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], + "time": "2020-07-30T15:31:10+00:00" + }, + { + "name": "phpstan/phpstan-deprecation-rules", + "version": "0.12.5", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan-deprecation-rules.git", + "reference": "bfabc6a1b4617fbcbff43f03a4c04eae9bafae21" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/bfabc6a1b4617fbcbff43f03a4c04eae9bafae21", + "reference": "bfabc6a1b4617fbcbff43f03a4c04eae9bafae21", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "phpstan/phpstan": "^0.12.26" + }, + "require-dev": { + "consistence/coding-standard": "^3.0.1", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", + "ergebnis/composer-normalize": "^2.0.2", + "jakub-onderka/php-parallel-lint": "^1.0", + "phing/phing": "^2.16.0", + "phpstan/phpstan-phpunit": "^0.12", + "phpunit/phpunit": "^7.0", + "slevomat/coding-standard": "^4.5.2" + }, + "type": "phpstan-extension", + "extra": { + "branch-alias": { + "dev-master": "0.12-dev" + }, + "phpstan": { + "includes": [ + "rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "PHPStan\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan rules for detecting usage of deprecated classes, methods, properties, constants and traits.", + "time": "2020-07-21T14:52:30+00:00" + }, { "name": "phpunit/php-code-coverage", "version": "7.0.10", @@ -9868,6 +10153,57 @@ ], "time": "2020-05-30T20:35:19+00:00" }, + { + "name": "thecodingmachine/phpstan-strict-rules", + "version": "v0.12.0", + "source": { + "type": "git", + "url": "https://github.com/thecodingmachine/phpstan-strict-rules.git", + "reference": "8c58cc87dc870382b228c95c4f1cc9fc871aaf28" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thecodingmachine/phpstan-strict-rules/zipball/8c58cc87dc870382b228c95c4f1cc9fc871aaf28", + "reference": "8c58cc87dc870382b228c95c4f1cc9fc871aaf28", + "shasum": "" + }, + "require": { + "php": "^7.1", + "phpstan/phpstan": "^0.12" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^7.1" + }, + "type": "phpstan-extension", + "extra": { + "branch-alias": { + "dev-master": "0.12-dev" + }, + "phpstan": { + "includes": [ + "phpstan-strict-rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "TheCodingMachine\\PHPStan\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "David Négrier", + "email": "d.negrier@thecodingmachine.com" + } + ], + "description": "A set of additional rules for PHPStan based on best practices followed at TheCodingMachine", + "time": "2019-12-04T11:25:22+00:00" + }, { "name": "theseer/tokenizer", "version": "1.2.0",