Apply php-cs-fixer rules

magicsunday · Mar 2, 2024 · 68effe6 · 68effe6
1 parent e2badbd
commit 68effe6
Show file tree

Hide file tree

Showing 16 changed files with 88 additions and 143 deletions.
diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -93,6 +93,13 @@
             'less_and_greater'     => false,
             'always_move_variable' => false,
         ],
+        'blank_line_before_statement'     => [
+            'statements' => [
+                'return',
+                'if',
+                'throw',
+            ],
+        ],
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()

diff --git a/composer.json b/composer.json
@@ -14,16 +14,16 @@
         "issues": "https://github.com/magicsunday/jsonmapper/issues"
     },
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": ">=7.4.0 <8.1.0",
         "ext-json": "*",
-        "symfony/property-info": "^5.2",
-        "symfony/property-access": "^5.2",
-        "doctrine/inflector": "^2.0",
-        "doctrine/annotations": "^1.13"
+        "symfony/property-info": "^5.0 || ^6.0 || ^7.0",
+        "symfony/property-access": "^5.0 || ^6.0 || ^7.0",
+        "doctrine/inflector": "^1.0 || ^2.0",
+        "doctrine/annotations": "^1.0"
     },
     "require-dev": {
-        "phpdocumentor/reflection-docblock": "^5.3",
-        "friendsofphp/php-cs-fixer": "^3.1",
+        "phpdocumentor/reflection-docblock": "^4.0 || ^5.0",
+        "friendsofphp/php-cs-fixer": "^3.50",
         "overtrue/phplint": "^3.4 || ^9.0",
         "phpunit/phpunit": "^9.0 || ^10.0 || ^11.0",
         "phpstan/phpstan": "^1.10",

diff --git a/rector.php b/rector.php
@@ -25,11 +25,11 @@
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([
         __DIR__ . '/src',
-        __DIR__ . '/test',
     ]);
 
     $rectorConfig->skip([
-        __DIR__ . '/vendor',
+        __DIR__ . '/.build',
+        __DIR__ . '/test',
     ]);
 
     $rectorConfig->phpstanConfig('phpstan.neon');
@@ -44,7 +44,7 @@
         SetList::CODING_STYLE,
         SetList::CODE_QUALITY,
         SetList::DEAD_CODE,
-        LevelSetList::UP_TO_PHP_81,
+        LevelSetList::UP_TO_PHP_74,
     ]);
 
     // Skip some rules