From 2076277e7c72a69ee9f5105bae0f37b5f9fcd552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 9 Dec 2019 23:48:21 +0100 Subject: [PATCH] Enhancement: Use ergebnis/phpstan-rules instead of localheinz/phpstan-rules --- composer.json | 2 +- composer.lock | 131 ++++++++++++++++++++++++++------------------------ phpstan.neon | 11 +++-- 3 files changed, 75 insertions(+), 69 deletions(-) diff --git a/composer.json b/composer.json index c203bb47..5915f1f5 100644 --- a/composer.json +++ b/composer.json @@ -22,10 +22,10 @@ }, "require-dev": { "ergebnis/php-cs-fixer-config": "~1.1.0", + "ergebnis/phpstan-rules": "~0.14.0", "ergebnis/test-util": "~0.9.0", "infection/infection": "~0.13.6", "jangregor/phpstan-prophecy": "~0.4.2", - "localheinz/phpstan-rules": "~0.13.0", "phpbench/phpbench": "~0.16.10", "phpstan/extension-installer": "^1.0.3", "phpstan/phpstan": "~0.11.19", diff --git a/composer.lock b/composer.lock index 4b052387..6a2783bc 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": "16f5fbf33f546db6827daacd8c696a61", + "content-hash": "b55a3be58f5a77bc8a186fbab9ee372a", "packages": [ { "name": "justinrainbow/json-schema", @@ -637,6 +637,73 @@ "homepage": "https://github.com/ergebnis/php-cs-fixer-config", "time": "2019-11-26T13:06:06+00:00" }, + { + "name": "ergebnis/phpstan-rules", + "version": "0.14.0", + "source": { + "type": "git", + "url": "https://github.com/ergebnis/phpstan-rules.git", + "reference": "217772cd009ec8a10f44c827137c4c4c85126258" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/217772cd009ec8a10f44c827137c4c4c85126258", + "reference": "217772cd009ec8a10f44c827137c4c4c85126258", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "nikic/php-parser": "^4.2.3", + "php": "^7.2", + "phpstan/phpstan": "~0.11.15 || ~0.12.0" + }, + "replace": { + "localheinz/phpstan-rules": "*" + }, + "require-dev": { + "ergebnis/php-cs-fixer-config": "~1.1.0", + "ergebnis/test-util": "~0.9.0", + "infection/infection": "~0.13.6", + "localheinz/composer-normalize": "^1.3.1", + "nette/di": "^3.0.1", + "phpstan/phpstan-deprecation-rules": "~0.11.2", + "phpstan/phpstan-strict-rules": "~0.11.1", + "phpunit/phpunit": "^8.5.0", + "psr/container": "^1.0.0", + "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" + ], + "time": "2019-12-09T22:36:56+00:00" + }, { "name": "ergebnis/test-util", "version": "0.9.0", @@ -1024,68 +1091,6 @@ ], "time": "2018-06-13T13:22:40+00:00" }, - { - "name": "localheinz/phpstan-rules", - "version": "0.13.0", - "source": { - "type": "git", - "url": "https://github.com/localheinz/phpstan-rules.git", - "reference": "e05ea16b61e48436a9ebb98e432de56b2dcf2034" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/localheinz/phpstan-rules/zipball/e05ea16b61e48436a9ebb98e432de56b2dcf2034", - "reference": "e05ea16b61e48436a9ebb98e432de56b2dcf2034", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^4.2.3", - "php": "^7.1", - "phpstan/phpstan": "~0.11.15" - }, - "require-dev": { - "infection/infection": "~0.13.6", - "localheinz/composer-normalize": "^1.3.1", - "localheinz/php-cs-fixer-config": "~1.23.0", - "localheinz/test-util": "~0.7.0", - "phpstan/phpstan-deprecation-rules": "~0.11.2", - "phpstan/phpstan-strict-rules": "~0.11.1", - "phpunit/phpunit": "^7.5.16", - "psr/container": "^1.0.0", - "zendframework/zend-servicemanager": "^2.0.0" - }, - "type": "phpstan-extension", - "extra": { - "phpstan": { - "includes": [ - "rules.neon" - ] - } - }, - "autoload": { - "psr-4": { - "Localheinz\\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/localheinz/phpstan-rules", - "keywords": [ - "PHPStan", - "phpstan-extreme-rules", - "phpstan-rules" - ], - "time": "2019-10-15T09:23:25+00:00" - }, { "name": "lstrojny/functional-php", "version": "1.10.0", diff --git a/phpstan.neon b/phpstan.neon index e93cf9ce..eeffed8e 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -2,11 +2,12 @@ includes: - phpstan-baseline.neon parameters: - classesAllowedToBeExtended: - - InvalidArgumentException - - Localheinz\Json\Normalizer\Test\Unit\AbstractNormalizerTestCase - - Localheinz\Json\Normalizer\Test\Unit\Exception\AbstractExceptionTestCase - - RuntimeException + ergebnis: + classesAllowedToBeExtended: + - InvalidArgumentException + - Localheinz\Json\Normalizer\Test\Unit\AbstractNormalizerTestCase + - Localheinz\Json\Normalizer\Test\Unit\Exception\AbstractExceptionTestCase + - RuntimeException ignoreErrors: - '#Method Localheinz\\Json\\Normalizer\\Json::__construct\(\) has parameter \$decoded with no typehint specified.#' - '#Method Localheinz\\Json\\Normalizer\\SchemaNormalizer::resolveSchema\(\) has parameter \$data with no typehint specified.#'