From f75c75baf2db5907adcc4a2ab188e512088256e1 Mon Sep 17 00:00:00 2001 From: Charles Sprayberry Date: Wed, 11 Jun 2025 09:10:29 -0400 Subject: [PATCH] Fix psalm errors --- README.md | 9 ++++++++- psalm.xml.dist | 2 ++ src/Plugin.php | 5 +++-- tests/_support/AcceptanceTester.php | 2 +- tests/_support/Helper/Acceptance.php | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 71a7770..5bcbffb 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,20 @@ Do you like final? _Really_ like it? Then enforce it on all your classes! When y ## Installation -### Running Psalm 5 +### Running Psalm 6 ``` composer require --dev cspray/phinal vendor/bin/psalm-plugin enable cspray/phinal ``` +### Running Psalm 5 + +``` +composer require --dev cspray/phinal:2.1 +vendor/bin/psalm-plugin enable cspray/phinal +``` + ### Running Psalm 4 ``` diff --git a/psalm.xml.dist b/psalm.xml.dist index 8790264..6a6361c 100644 --- a/psalm.xml.dist +++ b/psalm.xml.dist @@ -4,6 +4,8 @@ xmlns="https://getpsalm.org/schema/config" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" errorLevel="1" + findUnusedBaselineEntry="true" + findUnusedCode="true" > diff --git a/src/Plugin.php b/src/Plugin.php index a533e61..10da2ef 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -12,9 +12,9 @@ use Psalm\Plugin\RegistrationInterface; /** @psalm-suppress UnusedClass */ -class Plugin implements PluginEntryPointInterface, AfterClassLikeAnalysisInterface +final class Plugin implements PluginEntryPointInterface, AfterClassLikeAnalysisInterface { - /** @return void */ + #[\Override] public function __invoke(RegistrationInterface $psalm, ?SimpleXMLElement $config = null): void { // Psalm allows arbitrary content to be stored under you plugin entry in @@ -25,6 +25,7 @@ public function __invoke(RegistrationInterface $psalm, ?SimpleXMLElement $config $psalm->registerHooksFromClass($this::class); } + #[\Override] public static function afterStatementAnalysis(AfterClassLikeAnalysisEvent $event) { $stmt = $event->getStmt(); diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php index 50369fc..f9ebb93 100644 --- a/tests/_support/AcceptanceTester.php +++ b/tests/_support/AcceptanceTester.php @@ -19,7 +19,7 @@ * @psalm-suppress UndefinedTrait * @psalm-suppress UnusedClass */ -class AcceptanceTester extends \Codeception\Actor +final class AcceptanceTester extends \Codeception\Actor { use _generated\AcceptanceTesterActions; diff --git a/tests/_support/Helper/Acceptance.php b/tests/_support/Helper/Acceptance.php index 9eb8b0e..d0d1749 100644 --- a/tests/_support/Helper/Acceptance.php +++ b/tests/_support/Helper/Acceptance.php @@ -6,6 +6,6 @@ // all public methods declared in helper class will be available in $I /** @psalm-suppress UnusedClass */ -class Acceptance extends \Codeception\Module +final class Acceptance extends \Codeception\Module { }