upgrade to php 8.1 and fix dry run

Author: MathiasReker

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
-        php-versions: [ '7.4', '8.0', '8.1', '8.2', '8.3' ]
+        php-versions: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
     name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
     steps:
       - name: Checkout

.php-cs-fixer.dist.php

@@ -21,37 +21,54 @@
             'header' => $header,
             'comment_type' => 'PHPDoc',
             'location' => 'after_open',
-            'separate' => 'bottom'
+            'separate' => 'bottom',
         ],
-        '@PHP74Migration' => true,
-        '@PHP74Migration:risky' => true,
-        '@Symfony' => true,
-        '@Symfony:risky' => true,
-        'concat_space' => [
-            'spacing' => 'one',
-        ],
-        'array_indentation' => true,
+
+        // Migration Rules
+        '@PHP8x1Migration' => true,
+        '@PHP8x1Migration:risky' => true,
+        '@PHPUnit10x0Migration:risky' => true,
+
+        // Doctrine Rules
+        '@DoctrineAnnotation' => true,
+
+        // In no presets
+        'attribute_empty_parentheses' => true,
+        'heredoc_closing_marker' => true,
+        'multiline_string_to_heredoc' => true,
+        'numeric_literal_separator' => true,
+        'ordered_attributes' => true,
+        'php_unit_attributes' => true,
+        'return_to_yield_from' => true,
+        'phpdoc_tag_casing' => true,
+        'phpdoc_param_order' => true,
+        'mb_str_functions' => true,
+        'date_time_immutable' => true,
+        'ordered_interfaces' => true,
         'general_phpdoc_annotation_remove' => [
-            'annotations' => [
-                'expectedDeprecation'
-            ]
+            'annotations' => ['expectedDeprecation'],
         ],
-        'use_arrow_functions' => true,
-        'control_structure_braces' => true,
-        'control_structure_continuation_position' => true,
-        'self_static_accessor' => true,
-        'ordered_interfaces' => true,
-        'phpdoc_var_annotation_correct_order' => true,
-        'return_assignment' => true,
-        'no_useless_else' => true,
-        'no_superfluous_elseif' => true,
-        'no_useless_return' => true,
-        'multiline_comment_opening_closing' => true,
-        'no_null_property_initialization' => true,
-        'operator_linebreak' => true,
-        'method_chaining_indentation' => true,
-        'strict_param' => true,
-        'strict_comparison' => true,
+        'phpdoc_array_type' => true,
+        'phpdoc_list_type' => true,
+        'general_attribute_remove' => true,
+        'multiline_promoted_properties' => true,
+        'new_expression_parentheses' => true,
+        'no_useless_printf' => true,
+
+        // PER-CS3.0 Rules
+        '@PER-CS3x0:risky' => true,
+
+        // PHP-CS-Fixer Rules
+        '@PhpCsFixer' => true,
+        '@PhpCsFixer:risky' => true,
+
+        // Symfony Rules
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'concat_space' => ['spacing' => 'one'],
+
+        // Disable rule causing issues
+        'multiline_whitespace_before_semicolons' => true,
     ])
     ->setFinder($finder)
     ->setLineEnding(PHP_EOL);

README.md

@@ -17,11 +17,10 @@
 
 | Version | PHP  | Documentation |
 |---------|------|---------------|
-| ^2.1    | ^7.4 | current       |
+| ^3.0    | ^8.1 | current       |
 
 ### Requirements
 
-- `PHP` >= 7.4
 - php-extension `ext-mbstring`
 
 ### Installation

composer.json

@@ -17,15 +17,16 @@
   ],
   "homepage": "https://github.com/mathiasreker/php-chmod",
   "require": {
-    "php": ">=7.4",
+    "php": "^8.1",
     "ext-mbstring": "*",
-    "symfony/finder": "^4.4 || ^5.4 || ^6.4 || ^7.0"
+    "symfony/finder": "^6.4 || ^7.1 || ^8.0"
   },
   "require-dev": {
-    "ergebnis/composer-normalize": "^2.28",
-    "friendsofphp/php-cs-fixer": "^3.45",
-    "phpstan/phpstan": "^1.10 || ^2.0",
-    "phpunit/phpunit": "^9.6"
+    "ergebnis/composer-normalize": "^2.48",
+    "friendsofphp/php-cs-fixer": "^3.91",
+    "phpstan/phpstan": "^2.1",
+    "phpunit/phpunit": "^10.5",
+    "rector/rector": "^2.2"
   },
   "autoload": {
     "psr-4": {
@@ -48,6 +49,7 @@
     "cs-check": "./vendor/bin/php-cs-fixer fix . --dry-run --diff",
     "cs-fix": "./vendor/bin/php-cs-fixer fix .",
     "phpstan": "./vendor/bin/phpstan analyse src/ --level=9",
+    "rector": "./vendor/bin/rector process",
     "test": "./vendor/bin/phpunit --bootstrap vendor/autoload.php --colors=always tests/"
   }
 }

rector.php

@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * This file is part of the php-chmod package.
+ * (c) Mathias Reker <github@reker.dk>
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\Php84\Rector\Param\ExplicitNullableParamTypeRector;
+use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
+
+return RectorConfig::configure()
+    ->withPhpSets(php81: true)
+    ->withIndent()
+    ->withPreparedSets(
+        deadCode: true,
+        codeQuality: true,
+        codingStyle: true,
+        typeDeclarations: true,
+        privatization: true,
+        naming: true,
+        instanceOf: true,
+        earlyReturn: true,
+        rectorPreset: true,
+        phpunitCodeQuality: true,
+        symfonyCodeQuality: true,
+    )
+    ->withAttributesSets()
+    ->withSkipPath(__DIR__ . '/vendor')
+    ->withPaths([__DIR__])
+    ->withoutParallel()
+    ->withSkip(
+        [
+            PreferPHPUnitThisCallRector::class,
+        ]
+    )
+    ->withRules(
+        [
+            ExplicitNullableParamTypeRector::class,
+        ]
+    );

src/Exception/InvalidArgumentException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the php-chmod package.
  * (c) Mathias Reker <github@reker.dk>

src/Model/Scanner.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the php-chmod package.
  * (c) Mathias Reker <github@reker.dk>
@@ -19,48 +20,48 @@ final class Scanner
      */
     private const INVALID_PERMISSION = 'Invalid permission.';
 
-    private int $defaultFileMode = 0644;
+    private int $defaultFileMode = 0o644;
 
-    private int $defaultDirectoryMode = 0755;
+    private int $defaultDirectoryMode = 0o755;
 
     private bool $isExcludedFiles = false;
 
     private bool $isExcludedDirectories = false;
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     private array $excludedPaths = [];
 
     /**
-     * @var int[]
+     * @var list<int>
      */
     private array $excludedFileModes = [];
 
     /**
-     * @var int[]
+     * @var list<int>
      */
     private array $excludedDirectoryModes = [];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     private array $paths = [];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     private array $excludedNames = [];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     private array $names = [];
 
     /**
      * Get excluded permissions for files.
      *
-     * @return int[]
+     * @return list<int>
      */
     public function getExcludedFileModes(): array
     {
@@ -70,7 +71,7 @@ public function getExcludedFileModes(): array
     /**
      * Set excluded permissions for files.
      *
-     * @param int[] $excludedFileModes
+     * @param list<int> $excludedFileModes
      */
     public function setExcludedFileModes(array $excludedFileModes): self
     {
@@ -96,7 +97,7 @@ private function isValidMode(int $mode): bool
     /**
      * Get excluded permissions for directories.
      *
-     * @return int[]
+     * @return list<int>
      */
     public function getExcludedDirectoryModes(): array
     {
@@ -106,7 +107,7 @@ public function getExcludedDirectoryModes(): array
     /**
      * Set excluded permissions for directories.
      *
-     * @param int[] $excludedDirectoryModes
+     * @param list<int> $excludedDirectoryModes
      */
     public function setExcludedDirectoryModes(array $excludedDirectoryModes): self
     {
@@ -124,7 +125,7 @@ public function setExcludedDirectoryModes(array $excludedDirectoryModes): self
     /**
      * Get paths matching the search pattern.
      *
-     * @return string[]
+     * @return list<string>
      */
     public function getPaths(): array
     {
@@ -134,7 +135,7 @@ public function getPaths(): array
     /**
      * Set paths.
      *
-     * @param string[] $paths
+     * @param list<string> $paths
      */
     public function setPaths(array $paths): self
     {
@@ -146,7 +147,7 @@ public function setPaths(array $paths): self
     /**
      * Get names that directories/files must not match.
      *
-     * @return string[]
+     * @return list<string>
      */
     public function getExcludedNames(): array
     {
@@ -156,7 +157,7 @@ public function getExcludedNames(): array
     /**
      * Get names that directories/files must match.
      *
-     * @return string[]
+     * @return list<string>
      */
     public function getNames(): array
     {
@@ -166,7 +167,7 @@ public function getNames(): array
     /**
      * Set names the directories/files must match.
      *
-     * @param string[] $names
+     * @param list<string> $names
      */
     public function setNames(array $names): self
     {
@@ -178,7 +179,7 @@ public function setNames(array $names): self
     /**
      * Get paths that directories/files must not match.
      *
-     * @return string[]
+     * @return list<string>
      */
     public function getExcludedPaths(): array
     {
@@ -188,7 +189,7 @@ public function getExcludedPaths(): array
     /**
      * Set excluded paths.
      *
-     * @param string[] $excludedPaths
+     * @param list<string> $excludedPaths
      */
     public function setExcludedPaths(array $excludedPaths): self
     {
@@ -200,7 +201,7 @@ public function setExcludedPaths(array $excludedPaths): self
     /**
      * Set names that directories/files must match.
      *
-     * @param string[] $excludedNames
+     * @param list<string> $excludedNames
      */
     public function setExcludeNames(array $excludedNames): self
     {

src/Scanner.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the php-chmod package.
  * (c) Mathias Reker <github@reker.dk>