Upgrade phpstan and infection #15

Makefile

@@ -1,10 +1,10 @@
-.PHONY: clean code-style coverage help static-analysis update-dependencies install-dependencies infection-testing
+.PHONY: clean code-style coverage fix-code-style help static-analysis update-dependencies install-dependencies infection-testing
 .DEFAULT_GOAL := coverage
 
 PHPUNIT =  ./vendor/bin/phpunit -c ./phpunit.xml
 PHPSTAN  = ./vendor/bin/phpstan
 PHPCS = ./vendor/bin/phpcs --extensions=php
-PHPCBF = ./vendor/bin/
+PHPCBF = ./vendor/bin/phpcbf
 INFECTION = ./vendor/bin/infection
 CONSOLE = ./bin/console
 COVCHECK = ./vendor/bin/coverage-check

composer.json

@@ -9,16 +9,16 @@
   "license": "MIT",
   "require": {
     "ext-json": "*",
-    "symfony/console": "^4.3|^5.1",
-    "flix-tech/avro-php": "^3.0|^4.0"
+    "flix-tech/avro-php": "^3.0|^4.0",
+    "symfony/console": "^4.3|^5.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.3",
-    "phpstan/phpstan": "^0.12",
-    "squizlabs/php_codesniffer": "^3.4.2",
     "friendsofphp/php-cs-fixer": "^2.15",
-    "infection/infection": "^0.20.2",
-    "rregeer/phpunit-coverage-check": "^0.3"
+    "infection/infection": "^0.25",
+    "phpstan/phpstan": "^1.2",
+    "phpunit/phpunit": "^9.3",
+    "rregeer/phpunit-coverage-check": "^0.3",
+    "squizlabs/php_codesniffer": "^3.4.2"
   },
   "bin": [
     "bin/avro-cli"

phpstan.neon

@@ -4,6 +4,6 @@ parameters:
     checkGenericClassInNonGenericObjectType: false
     ignoreErrors:
         - "#Call to function token_get_all\\(\\) on a separate line has no effect.#"
-        - "#Strict comparison using === between array<int, mixed>&nonEmpty and ',' will always evaluate to false.#"
-        - "#Strict comparison using === between array<int, mixed>&nonEmpty and ';' will always evaluate to false.#"
+        - "#Strict comparison using === between non-empty-array<int, mixed> and ',' will always evaluate to false.#"
+        - "#Strict comparison using === between non-empty-array<int, mixed> and ';' will always evaluate to false.#"
         - "#Method PhpKafka\\\\\\PhpAvroSchemaGenerator\\\\\\Optimizer\\\\\\OptimizerInterface::optimize\\(\\) invoked with 2 parameters, 1 required.#"

src/Command/SubSchemaMergeCommand.php

@@ -6,6 +6,7 @@
 
 use PhpKafka\PhpAvroSchemaGenerator\Optimizer\FieldOrderOptimizer;
 use PhpKafka\PhpAvroSchemaGenerator\Optimizer\FullNameOptimizer;
+use PhpKafka\PhpAvroSchemaGenerator\Optimizer\OptimizerInterface;
 use PhpKafka\PhpAvroSchemaGenerator\Optimizer\PrimitiveSchemaOptimizer;
 use PhpKafka\PhpAvroSchemaGenerator\Registry\SchemaRegistry;
 use PhpKafka\PhpAvroSchemaGenerator\Merger\SchemaMerger;
@@ -76,6 +77,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
 
         $merger = new SchemaMerger($registry, $outputDirectory);
 
+        /** @var OptimizerInterface $optimizerClass */
         foreach ($this->optimizerOptionMapping as $optionName => $optimizerClass) {
             if (true === (bool) $input->getOption($optionName)) {
                 $merger->addOptimizer(new $optimizerClass());

src/Generator/SchemaGenerator.php

@@ -11,7 +11,6 @@
 
 final class SchemaGenerator implements SchemaGeneratorInterface
 {
-
     /**
      * @var int[]
      */

src/Merger/SchemaMergerInterface.php

@@ -10,7 +10,6 @@
 
 interface SchemaMergerInterface
 {
-
     /**
      * @return SchemaRegistryInterface
      */

src/Parser/TokenParser.php

@@ -39,7 +39,7 @@ class TokenParser
     /**
      * @var string
      */
-    private $className;
+    private string $className;
 
     /**
      * @var string
@@ -143,6 +143,7 @@ public function getNamespace(): string
      *
      * @return array<string|int,mixed> A list with all found use statements.
      * @codeCoverageIgnore
+     * @infection-ignore-all
      */
     public function parseUseStatements($namespaceName)
     {
@@ -196,12 +197,15 @@ public function getProperties(string $classPath): array
      * @throws \RuntimeException
      * @return string|null Type of the property (content of var annotation)
      * @codeCoverageIgnore
+     * @infection-ignore-all
      */
     public function getPropertyClass(ReflectionProperty $property, bool $ignorePrimitive = true)
     {
         $type = null;
-        $phpVersion = false === phpversion() ? '7.0.0' : phpversion();
-        // Get is explicit type decralation if possible
+        /** @var false|string $phpVersionResult */
+        $phpVersionResult = phpversion();
+        $phpVersion = false === $phpVersionResult ? '7.0.0' : $phpVersionResult;
+        // Get is explicit type declaration if possible
         if (version_compare($phpVersion, '7.4.0', '>=') && null !== $property->getType()) {
             $reflectionType = $property->getType();
 
@@ -281,6 +285,7 @@ public function getPropertyClass(ReflectionProperty $property, bool $ignorePrimi
      *
      * @return string|null Fully qualified name of the type, or null if it could not be resolved
      * @codeCoverageIgnore
+     * @infection-ignore-all
      */
     private function tryResolveFqn($type, ReflectionClass $class, Reflector $member)
     {
@@ -324,6 +329,7 @@ private function tryResolveFqn($type, ReflectionClass $class, Reflector $member)
      *
      * @return string|null Fully qualified name of the type, or null if it could not be resolved
      * @codeCoverageIgnore
+     * @infection-ignore-all
      */
     private function tryResolveFqnInTraits($type, ReflectionClass $class, Reflector $member)
     {
@@ -389,6 +395,7 @@ private function next($docCommentIsComment = true)
      *
      * @return array<string,class-string> A list with all found class names for a use statement.
      * @codeCoverageIgnore
+     * @infection-ignore-all
      */
     private function parseUseStatement()
     {

src/PhpClass/PhpClassProperty.php

@@ -6,7 +6,6 @@
 
 class PhpClassProperty implements PhpClassPropertyInterface
 {
-
     /**
      * @var string
      */

src/Registry/ClassRegistry.php

@@ -14,7 +14,6 @@
 
 final class ClassRegistry implements ClassRegistryInterface
 {
-
     /**
      * @var array<string,int>
      */

src/Registry/ClassRegistryInterface.php

@@ -8,7 +8,6 @@
 
 interface ClassRegistryInterface
 {
-
     /**
      * @param  string $classDirectory
      * @return ClassRegistryInterface

src/Registry/SchemaRegistryInterface.php

@@ -8,7 +8,6 @@
 
 interface SchemaRegistryInterface
 {
-
     /**
      * @param  string $schemaTemplateDirectory
      * @return SchemaRegistryInterface

tests/Unit/Merger/SchemaMergerTest.php

@@ -403,8 +403,9 @@ public function testMerge()
         $optimizer->expects(self::once())->method('optimize')->with($definition)->willReturn($definition);
         $merger = new SchemaMerger($schemaRegistry, '/tmp/foobar');
         $merger->addOptimizer($optimizer);
-        $merger->merge(true);
+        $mergedFiles = $merger->merge(true);
 
+        self::assertEquals(1, $mergedFiles);
         self::assertFileExists('/tmp/foobar/com.example.Book.avsc');
         unlink('/tmp/foobar/com.example.Book.avsc');
         rmdir('/tmp/foobar');