diff --git a/.github/workflows/code_analysis.yaml b/.github/workflows/code_analysis.yaml index 98e6d145..e61e14dd 100644 --- a/.github/workflows/code_analysis.yaml +++ b/.github/workflows/code_analysis.yaml @@ -21,6 +21,14 @@ jobs: name: 'Composer Validate' run: composer validate + - + name: 'Duster Lint' + run: composer lint + + - + name: 'Rector Dry Run' + run: composer rector-dry-run + - name: 'PHPStan' run: composer phpstan @@ -32,7 +40,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.3 coverage: none - uses: ramsey/composer-install@v2 diff --git a/.github/workflows/rector.yaml b/.github/workflows/rector.yaml deleted file mode 100644 index e83f5f80..00000000 --- a/.github/workflows/rector.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: Rector - -on: - pull_request: null - push: - branches: - - main - -env: - # see https://github.com/composer/composer/issues/9368#issuecomment-718112361 - COMPOSER_ROOT_VERSION: "dev-main" - -jobs: - rector: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - with: - # Must be used to trigger workflow after push - token: ${{ secrets.GITHUB_TOKEN }} - - - - uses: shivammathur/setup-php@v2 - with: - php-version: 8.1 - coverage: none - - - uses: ramsey/composer-install@v2 - - - run: vendor/bin/rector process --ansi - - run: vendor/bin/duster fix - - # commit changes, see https://github.com/EndBug/add-and-commit - - - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: '[ci-review] Rector Rectify' - commit_author: 'GitHub Action ' - commit_user_email: 'action@github.com' diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 87f57695..7f4f9651 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -14,13 +14,13 @@ jobs: tests: runs-on: ubuntu-latest - name: PHP ${{ matrix.php }} tests + name: PHP 8.3 tests steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.3 coverage: none - uses: ramsey/composer-install@v2 diff --git a/composer.json b/composer.json index 8834d425..9b6c53f9 100644 --- a/composer.json +++ b/composer.json @@ -36,6 +36,8 @@ "fix-cs": "vendor/bin/duster fix", "lint": "vendor/bin/duster lint", "fix": "vendor/bin/duster fix", + "rector-dry-run": "vendor/bin/rector process --dry-run --ansi", + "rector": "vendor/bin/rector process --ansi", "docs": [ "vendor/bin/rule-doc-generator generate src --output-file docs/rector_rules_overview.md --ansi" ]