diff --git a/.github/workflows/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from .github/workflows/PULL_REQUEST_TEMPLATE.md rename to .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 6f9b5a8c..d90105b8 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -28,29 +28,6 @@ jobs: - name: PHPStan run: tools/phpstan/vendor/bin/phpstan analyze --no-progress --error-format=checkstyle | cs2pr - php-cs-fixer: - name: PHP-CS-Fixer - runs-on: ubuntu-22.04 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.1 - coverage: none - tools: cs2pr - - - name: Install php-cs-fixer - uses: ramsey/composer-install@v1 - with: - composer-options: "--working-dir=tools/php-cs-fixer" - - - name: PHP-CS-Fixer - run: tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff - psalm: name: Psalm runs-on: ubuntu-22.04 diff --git a/.gitignore b/.gitignore index ad34bdcc..2eafb4d3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,4 @@ phpunit.xml tools/*/composer.lock tools/*/vendor vendor/ -.php-cs-fixer.cache .phpunit.result.cache diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 699ec4fe..a4cc5bc2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,17 +15,6 @@ tools/phpstan/vendor/bin/phpstan analyze tools/phpstan/vendor/bin/phpstan analyze --generate-baseline ``` -PHP CS Fixer ------------- - -```bash -composer install --working-dir=tools/php-cs-fixer -# Check what can be fixed -tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff -# Fix them -tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --diff -``` - Psalm ----- diff --git a/tools/php-cs-fixer/composer.json b/tools/php-cs-fixer/composer.json deleted file mode 100644 index 80440044..00000000 --- a/tools/php-cs-fixer/composer.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "require": { - "friendsofphp/php-cs-fixer": "^3.8" - } -}