From f350d5f1413b02fe6289489fe9ccd8a08fdde583 Mon Sep 17 00:00:00 2001 From: Hannes Kirsman Date: Tue, 15 Oct 2024 14:24:42 +0300 Subject: [PATCH 1/6] #89 Add Psalm 6. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f086412..7900cf2 100755 --- a/composer.json +++ b/composer.json @@ -47,6 +47,7 @@ "phpstan/phpstan-deprecation-rules": "^1.0", "nette/finder": "^2.5", "tomasvotruba/cognitive-complexity": "^0.1.1", + "vimeo/psalm": "6.x-dev", "webflo/drupal-finder": "^1.3" }, "autoload": { @@ -55,7 +56,7 @@ } }, "require-dev": { - "phpunit/phpunit": "^8.3" + "phpunit/phpunit": "9.6" }, "config": { "allow-plugins": { From 16f762ebd29636d642ce2bd36789ff6b78c90b8b Mon Sep 17 00:00:00 2001 From: Hannes Kirsman Date: Wed, 16 Oct 2024 13:38:46 +0300 Subject: [PATCH 2/6] #89 Fix use order in different files. --- src/Drupal/DrupalAutoloader.php | 4 ++-- src/Drupal/DrupalAutoloaderBase.php | 2 +- tests/AbstractLintTaskTest.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Drupal/DrupalAutoloader.php b/src/Drupal/DrupalAutoloader.php index 9906f6f..9647df3 100644 --- a/src/Drupal/DrupalAutoloader.php +++ b/src/Drupal/DrupalAutoloader.php @@ -6,11 +6,11 @@ use DrupalFinder\DrupalFinderComposerRuntime; use Drush\Drush; -use mglaman\PHPStanDrupal\Drupal\Extension; -use mglaman\PHPStanDrupal\Drupal\ExtensionDiscovery; use Nette\Utils\Finder; use PHPUnit\Framework\Test; use Symfony\Component\Yaml\Yaml; +use mglaman\PHPStanDrupal\Drupal\Extension; +use mglaman\PHPStanDrupal\Drupal\ExtensionDiscovery; /** * Drupal autoloader for allowing Psalm to scan code. diff --git a/src/Drupal/DrupalAutoloaderBase.php b/src/Drupal/DrupalAutoloaderBase.php index d218700..4e9554d 100644 --- a/src/Drupal/DrupalAutoloaderBase.php +++ b/src/Drupal/DrupalAutoloaderBase.php @@ -5,8 +5,8 @@ namespace Wunderio\GrumPHP\Drupal; use Drupal\Core\DependencyInjection\ContainerNotInitializedException; -use mglaman\PHPStanDrupal\Drupal\Extension; use Nette\Utils\Finder; +use mglaman\PHPStanDrupal\Drupal\Extension; /** * Drupal autoloader base class for allowing Psalm to scan code. diff --git a/tests/AbstractLintTaskTest.php b/tests/AbstractLintTaskTest.php index ddc325b..ba4196e 100644 --- a/tests/AbstractLintTaskTest.php +++ b/tests/AbstractLintTaskTest.php @@ -9,8 +9,8 @@ use GrumPHP\Collection\FilesCollection; use GrumPHP\Collection\LintErrorsCollection; -use GrumPHP\Linter\LinterInterface; use GrumPHP\Linter\LintError; +use GrumPHP\Linter\LinterInterface; use GrumPHP\Runner\TaskResult; use GrumPHP\Task\Config\TaskConfigInterface; use GrumPHP\Task\Context\ContextInterface; From ee67164b07444cb9f40c189143fc90ee79532d28 Mon Sep 17 00:00:00 2001 From: Hannes Kirsman Date: Mon, 20 Jan 2025 12:16:21 +0200 Subject: [PATCH 3/6] #89 Lock Psalm 6 dev version Some Drupal sites seem not be able to update. Let's try and lock dev version which is good idea anyway. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7900cf2..a3eb9d5 100755 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "phpstan/phpstan-deprecation-rules": "^1.0", "nette/finder": "^2.5", "tomasvotruba/cognitive-complexity": "^0.1.1", - "vimeo/psalm": "6.x-dev", + "vimeo/psalm": "6.x-dev#765dc", "webflo/drupal-finder": "^1.3" }, "autoload": { From 491d28df0807b07934e274756f3757928eb17b62 Mon Sep 17 00:00:00 2001 From: Hannes Kirsman Date: Mon, 20 Jan 2025 12:20:54 +0200 Subject: [PATCH 4/6] #89 Add more specific hash to Psalm dev version. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a3eb9d5..aa9b302 100755 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "phpstan/phpstan-deprecation-rules": "^1.0", "nette/finder": "^2.5", "tomasvotruba/cognitive-complexity": "^0.1.1", - "vimeo/psalm": "6.x-dev#765dc", + "vimeo/psalm": "6.x-dev#765dcbfe43", "webflo/drupal-finder": "^1.3" }, "autoload": { From 08849fd978d422044460adadb70eefbc0335d89f Mon Sep 17 00:00:00 2001 From: Hannes Kirsman Date: Mon, 20 Jan 2025 12:52:37 +0200 Subject: [PATCH 5/6] #89 Switch Psalm to dev-master to be compatible with phpro/grumphp and support amphp/amp: ^3.0. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index aa9b302..be41003 100755 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "phpstan/phpstan-deprecation-rules": "^1.0", "nette/finder": "^2.5", "tomasvotruba/cognitive-complexity": "^0.1.1", - "vimeo/psalm": "6.x-dev#765dcbfe43", + "vimeo/psalm": "dev-master", "webflo/drupal-finder": "^1.3" }, "autoload": { From 35b28c28eaf95dc487622974193dbf1459509b6d Mon Sep 17 00:00:00 2001 From: Hannes Kirsman Date: Mon, 20 Jan 2025 13:36:08 +0200 Subject: [PATCH 6/6] #89 Switch Psalm to 5. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index be41003..356bb67 100755 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "phpstan/phpstan-deprecation-rules": "^1.0", "nette/finder": "^2.5", "tomasvotruba/cognitive-complexity": "^0.1.1", - "vimeo/psalm": "dev-master", + "vimeo/psalm": "^5", "webflo/drupal-finder": "^1.3" }, "autoload": {