🎨 PER-CS coding standards, switch from PHPCS to Pint (#749)

roots · Dec 14, 2024 · c92549f · c92549f
1 parent 04957c6
commit c92549f
Show file tree

Hide file tree

Showing 11 changed files with 91 additions and 113 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,5 +33,5 @@ jobs:
     - name: Install Composer dependencies
       run: composer install --no-progress --prefer-dist --optimize-autoloader
 
-    - name: Run tests
-      run: composer test
+    - name: Run Pint
+      run: composer lint
diff --git a/composer.json b/composer.json
@@ -43,8 +43,8 @@
     "wpackagist-theme/twentytwentyfive": "^1.0"
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "^3.7.1",
-    "roave/security-advisories": "dev-latest"
+    "roave/security-advisories": "dev-latest",
+    "laravel/pint": "^1.18"
   },
   "config": {
     "optimize-autoloader": true,
@@ -65,8 +65,7 @@
     "wordpress-install-dir": "web/wp"
   },
   "scripts": {
-    "test": [
-      "phpcs"
-    ]
+    "lint": "pint --test",
+    "lint:fix": "pint"
   }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/config/application.php b/config/application.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Your base production configuration goes in this file. Environment-specific
  * overrides go in their respective config/environments/{{WP_ENV}}.php file.
@@ -9,6 +10,7 @@
  */
 
 use Roots\WPConfig\Config;
+
 use function Env\env;
 
 // USE_ENV_ARRAY + CONVERT_* + STRIP_QUOTES

diff --git a/config/environments/development.php b/config/environments/development.php
@@ -1,9 +1,11 @@
 <?php
+
 /**
  * Configuration overrides for WP_ENV === 'development'
  */
 
 use Roots\WPConfig\Config;
+
 use function Env\env;
 
 Config::define('SAVEQUERIES', true);

diff --git a/config/environments/staging.php b/config/environments/staging.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Configuration overrides for WP_ENV === 'staging'
  */

diff --git a/phpcs.xml b/phpcs.xml
diff --git a/pint.json b/pint.json
@@ -0,0 +1,9 @@
+{
+  "preset": "per",
+  "exclude": [
+    "web/wp",
+    "web/app/mu-plugins/bedrock-disallow-indexing",
+    "web/app/plugins",
+    "web/app/themes/twentytwentyfive"
+  ]
+}
diff --git a/web/app/mu-plugins/bedrock-autoloader.php b/web/app/mu-plugins/bedrock-autoloader.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Plugin Name:  Bedrock Autoloader
  * Plugin URI:   https://github.com/roots/bedrock-autoloader

diff --git a/web/index.php b/web/index.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * WordPress View Bootstrapper
  */

diff --git a/web/wp-config.php b/web/wp-config.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Do not edit this file. Edit the config files found in the config/ dir instead.
  * This file is required in the root directory so WordPress can find it.
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     <?php
     /**
      * Configuration overrides for WP_ENV === 'staging'
      */
@@ Expand Down @@