Updated coding standard and updated PHPStan (#452)

efabrica-team · Dec 17, 2023 · 7ef44a6 · 7ef44a6
1 parent e4945f1
commit 7ef44a6
Show file tree

Hide file tree

Showing 26 changed files with 59 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,14 @@
 
 ## [Unreleased][unreleased]
 
+### Fixed
+- Updated coding standard (Possible **BC break** - added `final` or `abstract` to (almost) all classes)
+- Bleeding edge changes - updated typehints
+
 ## [0.16.3] - 2023-11-26
 ### Added
 - Support for PHP 8.3
-- 
+
 ## [0.16.2] - 2023-11-22
 ### Fixed
 - Fixed first class callable filters

diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
     "require": {
         "php": ">=7.4 <8.4",
         "ext-json": "*",
-        "phpstan/phpstan": "^1.10.21",
+        "phpstan/phpstan": "^1.10.50",
         "phpstan/phpstan-nette": "^1.2.6",
         "latte/latte": "^2.11.6 | ^3.0.4",
         "nette/utils": "^3.2|^4.0",
@@ -18,7 +18,7 @@
         "nette/application": "^3.1.6",
         "nette/forms": "^3.1.12",
         "nikic/php-parser": "^4.15",
-        "efabrica/coding-standard": "^0.5",
+        "efabrica/coding-standard": "^0.6",
         "phpstan/phpstan-strict-rules": "^1.4",
         "spaze/phpstan-disallowed-calls": "^2.11"
     },

diff --git a/src/Analyser/LatteContextAnalyser.php b/src/Analyser/LatteContextAnalyser.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\Analyser;
 
 use Efabrica\PHPStanLatte\LatteContext\CollectedData\CollectedRelatedFiles;
@@ -16,7 +18,7 @@
 use PHPStan\Rules\RuleErrorBuilder;
 use Throwable;
 
-class LatteContextAnalyser
+final class LatteContextAnalyser
 {
     private ScopeFactory $scopeFactory;
 

diff --git a/src/Analyser/LatteContextCollectorRegistry.php b/src/Analyser/LatteContextCollectorRegistry.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\Analyser;
 
 use Efabrica\PHPStanLatte\LatteContext\Collector\AbstractLatteContextCollector;

diff --git a/src/Analyser/LatteContextData.php b/src/Analyser/LatteContextData.php
@@ -9,7 +9,7 @@
 use PHPStan\Rules\RuleError;
 use PHPStan\Rules\RuleErrorBuilder;
 
-class LatteContextData
+final class LatteContextData
 {
     /** @var array<RuleError> */
     private array $errors;

diff --git a/src/Collector/CollectedData/CollectedValueObject.php b/src/Collector/CollectedData/CollectedValueObject.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\Collector\CollectedData;
 
 abstract class CollectedValueObject

diff --git a/src/Collector/Collector/AbstractCollector.php b/src/Collector/Collector/AbstractCollector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\Collector\Collector;
 
 use Efabrica\PHPStanLatte\Collector\CollectedData\CollectedValueObject;

diff --git a/src/Compiler/NodeVisitor/AddFormClassesNodeVisitor.php b/src/Compiler/NodeVisitor/AddFormClassesNodeVisitor.php
@@ -235,6 +235,9 @@ public function enterNode(Node $node): ?Node
         return null;
     }
 
+    /**
+     * @return Node|Node[]|null
+     */
     public function leaveNode(Node $node)
     {
         foreach ($this->errorControlNodes as $errorControlNode) {

diff --git a/src/LatteContext/CollectedData/CollectedLatteContextObject.php b/src/LatteContext/CollectedData/CollectedLatteContextObject.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\LatteContext\CollectedData;
 
 abstract class CollectedLatteContextObject

diff --git a/src/LatteContext/Collector/AbstractLatteContextCollector.php b/src/LatteContext/Collector/AbstractLatteContextCollector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\LatteContext\Collector;
 
 use Efabrica\PHPStanLatte\LatteContext\CollectedData\CollectedError;

diff --git a/src/LatteContext/Collector/AbstractLatteContextSubCollector.php b/src/LatteContext/Collector/AbstractLatteContextSubCollector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\LatteContext\Collector;
 
 use PhpParser\Node;

diff --git a/src/LatteContext/Collector/LatteContextSubCollectorInterface.php b/src/LatteContext/Collector/LatteContextSubCollectorInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\LatteContext\Collector;
 
 use Efabrica\PHPStanLatte\LatteContext\CollectedData\CollectedError;

diff --git a/src/LatteContext/Collector/RelatedFilesCollector.php b/src/LatteContext/Collector/RelatedFilesCollector.php
@@ -66,7 +66,10 @@ public function getNodeTypes(): array
         ];
     }
 
-    public function collectData(Node $node, Scope $scope): ?array
+    /**
+     * @return CollectedRelatedFiles[]
+     */
+    public function collectData(Node $node, Scope $scope): array
     {
         $relatedFiles = [];
         if ($node instanceof InClassNode) {

diff --git a/src/LatteContext/Resolver/ClassLatteContextResolver.php b/src/LatteContext/Resolver/ClassLatteContextResolver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\LatteContext\Resolver;
 
 use Efabrica\PHPStanLatte\LatteContext\LatteContext;

diff --git a/src/LatteContext/Resolver/LatteContextResolverInterface.php b/src/LatteContext/Resolver/LatteContextResolverInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\LatteContext\Resolver;
 
 use Efabrica\PHPStanLatte\Template\Component;

diff --git a/src/LatteContext/Resolver/Nette/NetteApplicationUIControlLatteContextResolver.php b/src/LatteContext/Resolver/Nette/NetteApplicationUIControlLatteContextResolver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\LatteContext\Resolver\Nette;
 
 use Efabrica\PHPStanLatte\LatteContext\Resolver\ClassLatteContextResolver;
@@ -8,7 +10,7 @@
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 
-class NetteApplicationUIControlLatteContextResolver extends ClassLatteContextResolver
+final class NetteApplicationUIControlLatteContextResolver extends ClassLatteContextResolver
 {
     public function getVariables(): array
     {

diff --git a/src/LatteContext/Resolver/Nette/NetteApplicationUIPresenterLatteContextResolver.php b/src/LatteContext/Resolver/Nette/NetteApplicationUIPresenterLatteContextResolver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\LatteContext\Resolver\Nette;
 
 use Efabrica\PHPStanLatte\LatteContext\Resolver\ClassLatteContextResolver;
@@ -9,7 +11,7 @@
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 
-class NetteApplicationUIPresenterLatteContextResolver extends ClassLatteContextResolver
+final class NetteApplicationUIPresenterLatteContextResolver extends ClassLatteContextResolver
 {
     public function getVariables(): array
     {

diff --git a/src/LinkProcessor/LinkProcessorException.php b/src/LinkProcessor/LinkProcessorException.php
@@ -6,7 +6,7 @@
 
 use RuntimeException;
 
-class LinkProcessorException extends RuntimeException
+final class LinkProcessorException extends RuntimeException
 {
 
 }
diff --git a/src/Rule/LatteCompileErrorsRule.php b/src/Rule/LatteCompileErrorsRule.php
@@ -17,7 +17,7 @@
 /**
  * @implements Rule<FuncCall>
  */
-class LatteCompileErrorsRule implements Rule
+final class LatteCompileErrorsRule implements Rule
 {
     public function getNodeType(): string
     {

diff --git a/src/Template/ItemCombinator.php b/src/Template/ItemCombinator.php
@@ -1,11 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\Template;
 
 use Efabrica\PHPStanLatte\Type\TemplateTypeHelper;
 use PHPStan\Type\TypeCombinator;
 
-class ItemCombinator
+final class ItemCombinator
 {
     /**
      * @template T of NameItem

diff --git a/src/Type/TemplateTypeHelper.php b/src/Type/TemplateTypeHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\Type;
 
 use PHPStan\Type\ErrorType;
@@ -8,7 +10,7 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeTraverser;
 
-class TemplateTypeHelper
+final class TemplateTypeHelper
 {
     public static function resolveTemplateType(Type $type, string $declaringClass, ?string $currentClass): Type
     {

diff --git a/tests/Rule/LatteTemplatesRule/Annotations/ExpectedErrorsScanner.php b/tests/Rule/LatteTemplatesRule/Annotations/ExpectedErrorsScanner.php
@@ -6,7 +6,7 @@
 
 use RuntimeException;
 
-class ExpectedErrorsScanner
+final class ExpectedErrorsScanner
 {
     /**
      * @return list<array{error: string, line: int, tip: ?string}>

diff --git a/tests/Rule/LatteTemplatesRule/EngineBootstrap/engine.bootstrap-firstClassCallableFilter.php b/tests/Rule/LatteTemplatesRule/EngineBootstrap/engine.bootstrap-firstClassCallableFilter.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\Tests\Rule\LatteTemplatesRule\EngineBootstrap;
 
 use Latte\Engine;
 
-class FirstClassCallableFilters
+final class FirstClassCallableFilters
 {
     public function objectFilter(string $input): string
     {

diff --git a/tests/Rule/LatteTemplatesRule/EngineBootstrap/engine.bootstrap.php b/tests/Rule/LatteTemplatesRule/EngineBootstrap/engine.bootstrap.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Efabrica\PHPStanLatte\Tests\Rule\LatteTemplatesRule\EngineBootstrap;
 
 use Latte\Engine;
 
-class Filters
+final class Filters
 {
     public function objectFilter(string $input): string
     {

diff --git a/tests/Rule/LatteTemplatesRule/PresenterWithoutModule/LatteTemplatesRuleForPresenterTest.php b/tests/Rule/LatteTemplatesRule/PresenterWithoutModule/LatteTemplatesRuleForPresenterTest.php
@@ -162,7 +162,7 @@ public function testVariables(): void
                 'default.latte',
             ],
             [
-                'Dumped type: array<string>',
+                "Dumped type: array<'bar'|'baz'|'foo'>", // False positive - TODO create DynamicMethodReturnTypeExtension for Latte\Runtime\Filters::slice - inspire in ArraySliceFunctionReturnTypeExtension and SubstrDynamicReturnTypeExtension
                 92,
                 'default.latte',
             ],

diff --git a/tests/Rule/LatteTemplatesRule/SimpleControl/Fixtures/TraitVariables/MiddleControl.php b/tests/Rule/LatteTemplatesRule/SimpleControl/Fixtures/TraitVariables/MiddleControl.php
@@ -4,7 +4,7 @@
 
 namespace Efabrica\PHPStanLatte\Tests\Rule\LatteTemplatesRule\SimpleControl\Fixtures\TraitVariables;
 
-class MiddleControl extends BaseControl
+final class MiddleControl extends BaseControl
 {
     use MiddleControlBehavior;
 }