Minor adjustments

magicsunday · Aug 2, 2024 · 5a544b9 · 5a544b9
1 parent 1ab319b
commit 5a544b9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [ '8.1', '8.2', '8.3' ]
+                php: [ '7.3', '7.4.', '8.0' ]
 
         steps:
             -   id: checkout

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -40,7 +40,6 @@
     ->setRiskyAllowed(true)
     ->setRules([
         '@PSR12'                          => true,
-        '@PER-CS2.0'                      => true,
         '@Symfony'                        => true,
 
         // Additional custom rules
@@ -57,19 +56,9 @@
         'phpdoc_to_comment'               => false,
         'phpdoc_no_alias_tag'             => false,
         'no_superfluous_phpdoc_tags'      => false,
-        'phpdoc_separation'               => [
-            'groups' => [
-                [
-                    'author',
-                    'license',
-                    'link',
-                ],
-            ],
-        ],
+        'phpdoc_separation'               => true,
         'no_alias_functions'              => true,
-        'whitespace_after_comma_in_array' => [
-            'ensure_single_space' => true,
-        ],
+        'whitespace_after_comma_in_array' => true,
         'single_line_throw'               => false,
         'self_accessor'                   => false,
         'global_namespace_import'         => [
@@ -79,7 +68,6 @@
         ],
         'function_declaration'            => [
             'closure_function_spacing' => 'one',
-            'closure_fn_spacing'       => 'one',
         ],
         'binary_operator_spaces'          => [
             'operators' => [

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     },
     "require-dev": {
         "phpdocumentor/reflection-docblock": "^4.0 || ^5.0",
-        "friendsofphp/php-cs-fixer": "^3.1",
+        "friendsofphp/php-cs-fixer": "^2.0 || ^3.0",
         "overtrue/phplint": "^2.0 || ^3.0 || ^9.0",
         "phpunit/phpunit": "^9.0 || ^10.0 || ^11.0",
         "phpstan/phpstan": "^1.10",

diff --git a/rector.php b/rector.php
@@ -44,7 +44,8 @@
         SetList::CODING_STYLE,
         SetList::CODE_QUALITY,
         SetList::DEAD_CODE,
-        LevelSetList::UP_TO_PHP_81,
+        SetLIst::PHP_73,
+        LevelSetList::UP_TO_PHP_73,
     ]);
 
     // Skip some rules

diff --git a/test/Classes/Initialized.php b/test/Classes/Initialized.php
@@ -11,6 +11,7 @@
 
 namespace MagicSunday\Test\Classes;
 
+use MagicSunday\JsonMapper\Annotation\ReplaceNullWithDefaultValue;
 /**
  * Class Initialized.
  *
@@ -23,21 +24,21 @@ class Initialized
     /**
      * @var int
      *
-     * @MagicSunday\JsonMapper\Annotation\ReplaceNullWithDefaultValue
+     * @ReplaceNullWithDefaultValue
      */
     public $integer = 10;
 
     /**
      * @var bool
      *
-     * @MagicSunday\JsonMapper\Annotation\ReplaceNullWithDefaultValue
+     * @ReplaceNullWithDefaultValue
      */
     public $bool = false;
 
     /**
      * @var array<string>
      *
-     * @MagicSunday\JsonMapper\Annotation\ReplaceNullWithDefaultValue
+     * @ReplaceNullWithDefaultValue
      */
     public $array = [];
 }