chore!: Bump PHP version to 8.1

- Update dependencies to PHP 8.1 - Increase phpstan level to 9 - Update infection configuration, upload HTML report to Stryker BREAKING CHANGE: Minimum required PHP version is 8.1
MontealegreLuis · Apr 26, 2022 · b654bd9 · b654bd9
1 parent 1416ae2
commit b654bd9
Show file tree

Hide file tree

Showing 234 changed files with 618 additions and 556 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,5 @@ box.phar
 phuml.phar
 phuml.phar.pubkey
 phuml.phar.version
+infection.html
 infection.log
diff --git a/.php-cs-fixer-tests.php b/.php-cs-fixer-tests.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */
@@ -38,7 +38,7 @@
         'blank_line_after_opening_tag' => false,
         'declare_strict_types' => true,
         'header_comment' => [
-            'header' => 'PHP version 8.0
+            'header' => 'PHP version 8.1
 
 This source file is subject to the license that is bundled with this package in the file LICENSE.',
             'comment_type' => 'PHPDoc',

diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */
@@ -36,7 +36,7 @@
         'blank_line_after_opening_tag' => false,
         'declare_strict_types' => true,
         'header_comment' => [
-            'header' => 'PHP version 8.0
+            'header' => 'PHP version 8.1
 
 This source file is subject to the license that is bundled with this package in the file LICENSE.',
             'comment_type' => 'PHPDoc',

diff --git a/composer.json b/composer.json
@@ -1,62 +1,55 @@
 {
     "name": "phuml/phuml",
-    "type": "library",
     "description": "phUML is a fully automatic UML class diagram generator for PHP code",
+    "license": "BSD-3-Clause",
+    "type": "library",
     "keywords": [
         "uml"
     ],
-    "homepage": "https://github.com/MontealegreLuis/phuml",
-    "license": "BSD-3-Clause",
     "authors": [
         {
             "name": "Luis Montealegre",
             "email": "[email protected]",
             "role": "Developer"
         }
     ],
+    "homepage": "https://github.com/MontealegreLuis/phuml",
+    "support": {
+        "issues": "https://github.com/MontealegreLuis/phuml/issues",
+        "docs": "https://montealegreluis.com/phuml/"
+    },
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-tokenizer": "*",
-        "league/pipeline": "^1.0.0",
-        "nikic/php-parser": "4.11.0",
-        "phpdocumentor/reflection-docblock": "^5.2",
-        "phpdocumentor/type-resolver": "^1.4",
-        "symfony/console": "^5.3.2",
-        "symfony/finder": "^5.3.0",
-        "symfony/process": "^5.3.2",
-        "symplify/smart-file-system": "^9.4.22",
-        "twig/twig": "^3.3.2",
-        "webmozart/assert": "^1.10.0"
+        "league/pipeline": "~1.0.0",
+        "nikic/php-parser": "~4.13.2",
+        "phpdocumentor/reflection-docblock": "~5.3.0",
+        "phpdocumentor/type-resolver": "~1.6.1",
+        "symfony/console": "~6.0.7",
+        "symfony/finder": "~6.0.3",
+        "symfony/process": "~6.0.7",
+        "symplify/smart-file-system": "~10.2.2",
+        "twig/twig": "~3.3.10",
+        "webmozart/assert": "~1.10.0"
     },
     "require-dev": {
         "ext-imagick": "*",
-        "ergebnis/composer-normalize": "^2.15.0",
-        "friendsofphp/php-cs-fixer": "3.0.2",
-        "infection/infection": "^0.23.0",
-        "lupka/phpunit-compare-images": "^1.0.0",
-        "maglnet/composer-require-checker": "^3.3.0",
-        "phpro/grumphp": "^1.4.0",
-        "phpspec/prophecy-phpunit": "^2.0.1",
-        "phpstan/extension-installer": "^1.1.0",
-        "phpstan/phpstan": "^0.12.94",
-        "phpstan/phpstan-strict-rules": "^0.12.10",
-        "phpstan/phpstan-webmozart-assert": "^0.12.15",
-        "phpunit/phpunit": "^9.5.6",
-        "pyrech/composer-changelogs": "^1.7.1",
-        "rector/rector": "0.11.47"
-    },
-    "config": {
-        "optimize-autoloader": true,
-        "platform": {
-            "php": "8.0.8"
-        },
-        "sort-packages": true
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "6.0-dev"
-        }
+        "ergebnis/composer-normalize": "~2.25.2",
+        "friendsofphp/php-cs-fixer": "~3.8.0",
+        "infection/infection": "~0.26.8",
+        "lupka/phpunit-compare-images": "~1.0.0",
+        "maglnet/composer-require-checker": "~4.0.0",
+        "phpro/grumphp": "~1.11.0",
+        "phpspec/prophecy-phpunit": "~2.0.1",
+        "phpstan/extension-installer": "~1.1.0",
+        "phpstan/phpstan": "~1.5.7",
+        "phpstan/phpstan-strict-rules": "~1.1.0",
+        "phpstan/phpstan-webmozart-assert": "~1.1.2",
+        "phpunit/phpunit": "~9.5.20",
+        "pyrech/composer-changelogs": "~1.8.1",
+        "rector/rector": "~0.12.21"
     },
+    "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "PhUml\\": "src"
@@ -71,12 +64,19 @@
             ]
         }
     },
-    "prefer-stable": true,
     "bin": [
         "bin/phuml"
     ],
-    "support": {
-        "issues": "https://github.com/MontealegreLuis/phuml/issues",
-        "docs": "https://montealegreluis.com/phuml/"
+    "config": {
+        "optimize-autoloader": true,
+        "platform": {
+            "php": "8.1.1"
+        },
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "6.0-dev"
+        }
     }
 }
diff --git a/containers/tests/Dockerfile b/containers/tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0.8-cli-alpine3.13
+FROM php:8.1.1-cli-alpine3.15
 
 RUN apk add --update --no-cache autoconf g++ pkgconfig imagemagick imagemagick-dev make ttf-freefont graphviz \
     && printf "\n" | pecl install imagick \

diff --git a/infection.json.dist b/infection.json.dist
@@ -10,8 +10,9 @@
     },
     "logs": {
         "text": "infection.log",
-        "badge": {
-            "branch": "master"
+        "html": "infection.html",
+        "stryker": {
+            "report": "master"
         }
     },
     "mutators": {

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,5 +1,5 @@
 parameters:
-	level: 8
+	level: 9
 	paths:
 		- src
 	inferPrivatePropertyTypeFromConstructor: true

diff --git a/rector.php b/rector.php
@@ -23,13 +23,13 @@
     $containerConfigurator->import(SetList::CODE_QUALITY);
     $containerConfigurator->import(SetList::PRIVATIZATION);
     $containerConfigurator->import(SetList::EARLY_RETURN);
-    $containerConfigurator->import(SetList::PHP_80);
+    $containerConfigurator->import(SetList::PHP_81);
     $containerConfigurator->import(PHPUnitSetList::PHPUNIT_91);
     $containerConfigurator->import(PHPUnitSetList::PHPUNIT_CODE_QUALITY);
     $containerConfigurator->import(PHPUnitSetList::PHPUNIT_EXCEPTION);
     $containerConfigurator->import(PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD);
 
-    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80);
+    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_81);
 
     // Path to PHPStan with extensions, that PHPStan in Rector uses to determine types
     $parameters->set(Option::PHPSTAN_FOR_RECTOR_PATH, getcwd() . '/phpstan.neon');

diff --git a/src/Code/Attributes/Attribute.php b/src/Code/Attributes/Attribute.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */

diff --git a/src/Code/Attributes/Constant.php b/src/Code/Attributes/Constant.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */
@@ -21,7 +21,7 @@ final class Constant implements HasType, HasVisibility, Stringable
     use WithTypeDeclaration;
     use WithVisibility;
 
-    public function __construct(private string $name, TypeDeclaration $type, Visibility $visibility)
+    public function __construct(private readonly string $name, TypeDeclaration $type, Visibility $visibility)
     {
         $this->type = $type;
         $this->modifier = $visibility;

diff --git a/src/Code/Attributes/HasAttributes.php b/src/Code/Attributes/HasAttributes.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */

diff --git a/src/Code/Attributes/HasConstants.php b/src/Code/Attributes/HasConstants.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */

diff --git a/src/Code/Attributes/WithAttributes.php b/src/Code/Attributes/WithAttributes.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */

diff --git a/src/Code/Attributes/WithConstants.php b/src/Code/Attributes/WithConstants.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */

diff --git a/src/Code/ClassDefinition.php b/src/Code/ClassDefinition.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */
@@ -29,7 +29,7 @@ final class ClassDefinition extends Definition implements HasAttributes, HasCons
     use WithTraits;
 
     /** @var Name[] */
-    private array $interfaces;
+    private readonly array $interfaces;
 
     /**
      * @param Method[] $methods

diff --git a/src/Code/Codebase.php b/src/Code/Codebase.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */

diff --git a/src/Code/Definition.php b/src/Code/Definition.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */

diff --git a/src/Code/InterfaceDefinition.php b/src/Code/InterfaceDefinition.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */
@@ -20,7 +20,7 @@ final class InterfaceDefinition extends Definition implements HasConstants
     use WithConstants;
 
     /** @var Name[] */
-    private array $parents;
+    private readonly array $parents;
 
     /**
      * @param Method[] $methods

diff --git a/src/Code/Methods/Method.php b/src/Code/Methods/Method.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */
@@ -27,20 +27,16 @@ final class Method implements HasVisibility, CanBeAbstract, CanBeStatic, Stringa
     use WithAbstractModifier;
     use WithStaticModifier;
 
-    /** @var Parameter[] */
-    private array $parameters;
-
     /** @param Parameter[] $parameters */
     public function __construct(
-        private string $name,
+        private readonly string $name,
         Visibility $modifier,
-        private TypeDeclaration $returnType,
-        array $parameters = [],
+        private readonly TypeDeclaration $returnType,
+        private readonly array $parameters = [],
         bool $isAbstract = false,
         bool $isStatic = false
     ) {
         $this->modifier = $modifier;
-        $this->parameters = $parameters;
         $this->isAbstract = $isAbstract;
         $this->isStatic = $isStatic;
     }

diff --git a/src/Code/Modifiers/CanBeAbstract.php b/src/Code/Modifiers/CanBeAbstract.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */

diff --git a/src/Code/Modifiers/CanBeStatic.php b/src/Code/Modifiers/CanBeStatic.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */

diff --git a/src/Code/Modifiers/HasVisibility.php b/src/Code/Modifiers/HasVisibility.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */

diff --git a/src/Code/Modifiers/Visibility.php b/src/Code/Modifiers/Visibility.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */
@@ -22,7 +22,7 @@ final class Visibility implements Stringable
         'protected' => '#',
     ];
 
-    private string $modifier;
+    private readonly string $modifier;
 
     public function __construct(string $modifier)
     {

diff --git a/src/Code/Modifiers/WithAbstractModifier.php b/src/Code/Modifiers/WithAbstractModifier.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */

diff --git a/src/Code/Modifiers/WithStaticModifier.php b/src/Code/Modifiers/WithStaticModifier.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 /**
- * PHP version 8.0
+ * PHP version 8.1
  *
  * This source file is subject to the license that is bundled with this package in the file LICENSE.
  */