php-cs-fixer (#18)

jack-worman · Jan 16, 2024 · 6e50ffd · 6e50ffd
1 parent 2a3e529
commit 6e50ffd
Show file tree

Hide file tree

Showing 2,231 changed files with 112,394 additions and 105,191 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -88,6 +88,9 @@ jobs:
         run: |
           composer lint.checkstyle | cs2pr
 
+      - name: php-cs-fixer
+        run: vendor/bin/php-cs-fixer fix --dry-run
+
       - name: Setup environment for PHPUnit
         run: |
           cp tests/TestConfiguration.ci.php tests/TestConfiguration.php

diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,4 @@
-.buildpath
-.DS_Store
-.idea
-.project
-composer.lock
-vendor
-phpunit.xml
-tests/TestConfiguration.php
+/vendor/
+/.php-cs-fixer.cache
+/composer.lock
+/tests/TestConfiguration.php
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+$finder = (new PhpCsFixer\Finder())
+    ->in(__DIR__.'/packages');
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@Symfony' => true,
+    ])
+    ->setFinder($finder);
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Monorepo for zf1s (Zend Framework 1) packages",
     "license": "BSD-3-Clause",
     "require": {
-        "php": "^8.1 || ^8.2 || ^8.3",
+        "php": "~8.2 || ~8.3",
         "ext-ctype": "*",
         "ext-dom": "*",
         "ext-gd": "*",
@@ -20,9 +20,10 @@
         "symfony/polyfill-php70": "^1.19"
     },
     "require-dev": {
-        "php-parallel-lint/php-parallel-lint": "1.3.0",
+        "friendsofphp/php-cs-fixer": "^3.47",
         "jworman/dbunit": "5.0.0",
         "jworman/phpunit": "1.0.0",
+        "php-parallel-lint/php-parallel-lint": "1.3.0",
         "staabm/annotate-pull-request-from-checkstyle": "1.5.0"
     },
     "autoload": {