remove deprecated rectors

bump-dependencies
Merge pull request 'add_ClassAttributeSeparationFixer' (#3 ) from add_ClassAttributeSeparationFixer into main
2024-08-18 09:17:23 +02:00 · 2024-08-18 09:09:16 +02:00 · 2024-05-04 18:26:43 +00:00 · 2024-05-04 20:24:57 +02:00 · 2024-05-04 17:42:09 +00:00 · 2024-05-04 19:41:48 +02:00
6 changed files with 106 additions and 62 deletions
--- a/.forgejo/workflows/push.yml
+++ b/.forgejo/workflows/push.yml
@ -0,0 +1,34 @@
+on: [push]
+jobs:
+  ls:
+    runs-on: docker
+    container:
+      image: git.php.fail/lubiana/container/php:ci
+    steps:
+      - name: Manually checkout
+        env:
+          REPO: '${{ github.repository }}'
+          TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+          GIT_SERVER: 'git.php.fail'
+        run: |
+          git clone --branch $GITHUB_REF_NAME https://${TOKEN}@${GIT_SERVER}/${REPO}.git .
+          git fetch
+          git checkout ${{ github.head_ref }}
+      - name: composer install
+        env:
+          COMPOSER_CACHE_DIR: /opt/hostedtoolcache/.composer/cache/files
+        run: |
+          mkdir -p ${{ env.COMPOSER_CACHE_DIR }}
+          composer install
+      - run: composer lint
+      - name: GIT commit and push all changed files
+        env:
+          CI_COMMIT_MESSAGE: Continuous Integration Fixes
+          CI_COMMIT_AUTHOR: Continuous Integration
+        run: |
+          if [[ -n "$(git status -s)" ]]; then
+            git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
+            git config --global user.email "gitbot@users.noreply.php.fail"
+            git commit -am "${{ env.CI_COMMIT_MESSAGE }}"
+            git push
+          fi
--- a/composer.json
+++ b/composer.json
@ -9,9 +9,9 @@
  },
  "require": {
    "php": "^8.3",
-    "slevomat/coding-standard": "^8.14.1",
-    "symplify/easy-coding-standard": "^12.1.8",
-    "rector/rector": "^0.19.5"
+    "slevomat/coding-standard": "^8.15",
+    "symplify/easy-coding-standard": "^12.3.5",
+    "rector/rector": "^1.0.5"
  },
  "config": {
    "allow-plugins": {
@ -19,7 +19,7 @@
    }
  },
  "scripts": {
-    "fix": [
+    "lint": [
      "rector",
      "ecs --fix",
      "ecs --fix"
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "da852e748b3a7adc9b558b097386ff95",
+    "content-hash": "6eb7806e6594ecc073d158d2f9b483f0",
    "packages": [
        {
            "name": "dealerdirect/phpcodesniffer-composer-installer",
@ -86,16 +86,16 @@
        },
        {
            "name": "phpstan/phpdoc-parser",
-            "version": "1.25.0",
+            "version": "1.28.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240"
+                "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bd84b629c8de41aa2ae82c067c955e06f1b00240",
-                "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
+                "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
                "shasum": ""
            },
            "require": {
@ -127,22 +127,22 @@
            "description": "PHPDoc parser with support for nullable, intersection and generic types",
            "support": {
                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.25.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0"
            },
-            "time": "2024-01-04T17:06:16+00:00"
+            "time": "2024-04-03T18:51:33+00:00"
        },
        {
            "name": "phpstan/phpstan",
-            "version": "1.10.57",
+            "version": "1.10.67",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e"
+                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e",
-                "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/16ddbe776f10da6a95ebd25de7c1dbed397dc493",
+                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493",
                "shasum": ""
            },
            "require": {
@ -185,31 +185,27 @@
                {
                    "url": "https://github.com/phpstan",
                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-24T11:51:34+00:00"
+            "time": "2024-04-16T07:22:02+00:00"
        },
        {
            "name": "rector/rector",
-            "version": "0.19.5",
+            "version": "1.0.5",
            "source": {
                "type": "git",
                "url": "https://github.com/rectorphp/rector.git",
-                "reference": "89c895d127b9d248d2af007068a824b5348ef81f"
+                "reference": "73eb63e4f9011dba6b7c66c3262543014e352f34"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/89c895d127b9d248d2af007068a824b5348ef81f",
-                "reference": "89c895d127b9d248d2af007068a824b5348ef81f",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/73eb63e4f9011dba6b7c66c3262543014e352f34",
+                "reference": "73eb63e4f9011dba6b7c66c3262543014e352f34",
                "shasum": ""
            },
            "require": {
                "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.10.56"
+                "phpstan/phpstan": "^1.10.57"
            },
            "conflict": {
                "rector/rector-doctrine": "*",
@ -217,6 +213,9 @@
                "rector/rector-phpunit": "*",
                "rector/rector-symfony": "*"
            },
+            "suggest": {
+                "ext-dom": "To manipulate phpunit.xml via the custom-rule command"
+            },
            "bin": [
                "bin/rector"
            ],
@ -239,7 +238,7 @@
            ],
            "support": {
                "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.19.5"
+                "source": "https://github.com/rectorphp/rector/tree/1.0.5"
            },
            "funding": [
                {
@ -247,36 +246,36 @@
                    "type": "github"
                }
            ],
-            "time": "2024-01-29T23:53:47+00:00"
+            "time": "2024-05-10T05:31:15+00:00"
        },
        {
            "name": "slevomat/coding-standard",
-            "version": "8.14.1",
+            "version": "8.15.0",
            "source": {
                "type": "git",
                "url": "https://github.com/slevomat/coding-standard.git",
-                "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926"
+                "reference": "7d1d957421618a3803b593ec31ace470177d7817"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/fea1fd6f137cc84f9cba0ae30d549615dbc6a926",
-                "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/7d1d957421618a3803b593ec31ace470177d7817",
+                "reference": "7d1d957421618a3803b593ec31ace470177d7817",
                "shasum": ""
            },
            "require": {
                "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0",
                "php": "^7.2 || ^8.0",
                "phpstan/phpdoc-parser": "^1.23.1",
-                "squizlabs/php_codesniffer": "^3.7.1"
+                "squizlabs/php_codesniffer": "^3.9.0"
            },
            "require-dev": {
                "phing/phing": "2.17.4",
                "php-parallel-lint/php-parallel-lint": "1.3.2",
-                "phpstan/phpstan": "1.10.37",
+                "phpstan/phpstan": "1.10.60",
                "phpstan/phpstan-deprecation-rules": "1.1.4",
-                "phpstan/phpstan-phpunit": "1.3.14",
-                "phpstan/phpstan-strict-rules": "1.5.1",
-                "phpunit/phpunit": "8.5.21|9.6.8|10.3.5"
+                "phpstan/phpstan-phpunit": "1.3.16",
+                "phpstan/phpstan-strict-rules": "1.5.2",
+                "phpunit/phpunit": "8.5.21|9.6.8|10.5.11"
            },
            "type": "phpcodesniffer-standard",
            "extra": {
@ -300,7 +299,7 @@
            ],
            "support": {
                "issues": "https://github.com/slevomat/coding-standard/issues",
-                "source": "https://github.com/slevomat/coding-standard/tree/8.14.1"
+                "source": "https://github.com/slevomat/coding-standard/tree/8.15.0"
            },
            "funding": [
                {
@ -312,20 +311,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-10-08T07:28:08+00:00"
+            "time": "2024-03-09T15:20:58+00:00"
        },
        {
            "name": "squizlabs/php_codesniffer",
-            "version": "3.8.1",
+            "version": "3.9.2",
            "source": {
                "type": "git",
                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7"
+                "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7",
-                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480",
+                "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480",
                "shasum": ""
            },
            "require": {
@ -392,20 +391,20 @@
                    "type": "open_collective"
                }
            ],
-            "time": "2024-01-11T20:47:48+00:00"
+            "time": "2024-04-23T20:25:34+00:00"
        },
        {
            "name": "symplify/easy-coding-standard",
-            "version": "12.1.8",
+            "version": "12.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/easy-coding-standard/easy-coding-standard.git",
-                "reference": "7962c810a8eebc4174a38d7dff673f1999e61595"
+                "reference": "0d7c2cfee3debdf11c12135e90d69d1d9f4eef03"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/easy-coding-standard/easy-coding-standard/zipball/7962c810a8eebc4174a38d7dff673f1999e61595",
-                "reference": "7962c810a8eebc4174a38d7dff673f1999e61595",
+                "url": "https://api.github.com/repos/easy-coding-standard/easy-coding-standard/zipball/0d7c2cfee3debdf11c12135e90d69d1d9f4eef03",
+                "reference": "0d7c2cfee3debdf11c12135e90d69d1d9f4eef03",
                "shasum": ""
            },
            "require": {
@ -416,6 +415,9 @@
                "phpcsstandards/php_codesniffer": "<3.8",
                "symplify/coding-standard": "<12.1"
            },
+            "suggest": {
+                "ext-dom": "Needed to support checkstyle output format in class CheckstyleOutputFormatter"
+            },
            "bin": [
                "bin/ecs"
            ],
@ -438,7 +440,7 @@
            ],
            "support": {
                "issues": "https://github.com/easy-coding-standard/easy-coding-standard/issues",
-                "source": "https://github.com/easy-coding-standard/easy-coding-standard/tree/12.1.8"
+                "source": "https://github.com/easy-coding-standard/easy-coding-standard/tree/12.3.5"
            },
            "funding": [
                {
@ -450,7 +452,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-01-16T22:56:06+00:00"
+            "time": "2024-08-08T08:43:50+00:00"
        }
    ],
    "packages-dev": [],
--- a/config/ecs.php
+++ b/config/ecs.php
@ -1,5 +1,6 @@
 <?php declare(strict_types=1);

+use PhpCsFixer\Fixer\ClassNotation\ClassAttributesSeparationFixer;
 use PhpCsFixer\Fixer\Import\OrderedImportsFixer;
 use PhpCsFixer\Fixer\LanguageConstruct\FunctionToConstantFixer;
 use PhpCsFixer\Fixer\Operator\NewWithBracesFixer;
@ -77,6 +78,17 @@ return ECSConfig::configure()
        ]
    )
    ->withConfiguredRule(
+        ClassAttributesSeparationFixer::class,
+        [
+            'elements' => [
+                'const' => 'none',
+                'method' => 'one',
+                'property' => 'none',
+                'trait_import' => 'none',
+                'case' => 'none',
+            ],
+        ],
+    )->withConfiguredRule(
        DeclareStrictTypesSniff::class,
        [
            'declareOnFirstLine' => true,
@ -91,12 +103,6 @@ return ECSConfig::configure()
            'withSpaces' => 'no',
        ]
    )
-    ->withConfiguredRule(
-        LineLengthFixer::class,
-        [
-            LineLengthFixer::INLINE_SHORT_LINES => false,
-        ]
-    )
    ->withConfiguredRule(
        NoExtraBlankLinesFixer::class,
        [
@ -112,4 +118,5 @@ return ECSConfig::configure()
        FunctionToConstantFixer::class,
        NewWithParenthesesFixer::class,
        NewWithBracesFixer::class,
+        LineLengthFixer::class,
    ]);
--- a/config/rector.php
+++ b/config/rector.php
@ -16,7 +16,6 @@ use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\CodingStyle\Rector\If_\NullableCompareToNullRector;
 use Rector\Config\RectorConfig;
 use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
-use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\If_\ChangeNestedIfsToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\If_\ChangeOrIfContinueToMultiContinueRector;
 use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
@ -24,7 +23,6 @@ use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\Return_\ReturnBinaryOrToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\StmtsAwareInterface\ReturnEarlyIfVariableRector;
 use Rector\Php80\Rector\ClassConstFetch\ClassOnThisVariableObjectRector;
-use Rector\Set\ValueObject\LevelSetList;
 use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeFromPropertyTypeRector;
@ -33,7 +31,6 @@ use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByMethodCallTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByParentCallTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnDirectArrayRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector;
-use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictBoolReturnExprRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictConstantReturnRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictNativeCallRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictNewArrayRector;
@ -44,7 +41,14 @@ use Rector\TypeDeclaration\Rector\FunctionLike\AddReturnTypeDeclarationFromYield
 use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector;

 return RectorConfig::configure()
-    ->withSets([LevelSetList::UP_TO_PHP_83])
+    ->withPhpSets(php83: true)
+    ->withPreparedSets(
+        deadCode: true,
+        codeQuality: true,
+        typeDeclarations: true,
+        earlyReturn: true,
+        strictBooleans: true,
+    )
    ->withRules([
        AddArrowFunctionReturnTypeRector::class,
        AddMethodCallBasedStrictParamTypeRector::class,
@ -53,7 +57,6 @@ return RectorConfig::configure()
        AddReturnTypeDeclarationBasedOnParentClassMethodRector::class,
        AddReturnTypeDeclarationFromYieldsRector::class,
        BooleanNotIdenticalToNotIdenticalRector::class,
-        ChangeAndIfToEarlyReturnRector::class,
        ChangeNestedForeachIfsToEarlyContinueRector::class,
        ChangeNestedIfsToEarlyReturnRector::class,
        ChangeOrIfContinueToMultiContinueRector::class,
@ -72,7 +75,6 @@ return RectorConfig::configure()
        ReturnEarlyIfVariableRector::class,
        ReturnTypeFromReturnDirectArrayRector::class,
        ReturnTypeFromReturnNewRector::class,
-        ReturnTypeFromStrictBoolReturnExprRector::class,
        ReturnTypeFromStrictConstantReturnRector::class,
        ReturnTypeFromStrictNativeCallRector::class,
        ReturnTypeFromStrictNewArrayRector::class,
--- a/src/LubiSetList.php
+++ b/src/LubiSetList.php
@ -5,6 +5,5 @@ namespace Lubiana\CodeQuality;
 final class LubiSetList
 {
    public const string RECTOR = __DIR__ . '/../config/rector.php';
-
    public const string ECS = __DIR__ . '/../config/ecs.php';
 }
Author	SHA1	Message	Date
lubiana	b7e3418f0f	remove deprecated rectors All checks were successful / ls (push) Successful in 28s Details	2024-08-18 09:17:23 +02:00
lubiana	e40beaa2d1	bump-dependencies All checks were successful / ls (push) Successful in 29s Details	2024-08-18 09:09:16 +02:00
lubiana	2793c36fa9	Merge pull request 'add_ClassAttributeSeparationFixer' (#3 ) from add_ClassAttributeSeparationFixer into main All checks were successful / ls (push) Successful in 13s Details Reviewed-on: #3	2024-05-04 18:26:43 +00:00
lubiana	e7ecf55e04	ci-fix All checks were successful / ls (push) Successful in 12s Details	2024-05-04 20:24:57 +02:00
Continuous Integration	00f72e3be9	Continuous Integration Fixes	2024-05-04 17:42:09 +00:00
lubiana	9993d760d6	add ClassAttributeSeparationFixer All checks were successful / ls (push) Successful in 17s Details	2024-05-04 19:41:48 +02:00
lubiana	b1792809e1	Merge pull request 'add workflow' (#2 ) from add_actions into main All checks were successful / ls (push) Successful in 16s Details Reviewed-on: #2	2024-05-04 17:34:39 +00:00
lubiana	713b047068	add workflow All checks were successful / ls (push) Successful in 16s Details	2024-05-04 19:33:42 +02:00
lubiana	d668217619	temporary skip linelengthfixer	2024-04-25 21:01:06 +02:00
lubiana	cfd59433a4	bump dependencies	2024-04-25 18:07:52 +02:00
lubiana	894d6ec850	clean up rector config	2024-02-03 10:58:53 +01:00