From c28df65f42b09ee6a05aafae9bedacb0587d6cd0 Mon Sep 17 00:00:00 2001
From: Danny van Kooten <hi@dvk.co>
Date: Sat, 11 Jan 2025 20:21:41 +0100
Subject: [PATCH] adhere to (mostly) PSR12, check codestyle in CI

---
 .github/workflows/php.yml | 5 ++++-
 AltoRouter.php            | 6 +++---
 composer.json             | 5 +++--
 phpcs.xml                 | 5 +++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index acd5e2f..87b97b4 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: [ '7.3', 'highest' ]
+        php-versions: [ '7.3',  'highest' ]
 
     steps:
       - uses: actions/checkout@v2
@@ -35,5 +35,8 @@ jobs:
         if: steps.composer-cache.outputs.cache-hit != 'true'
         run: composer install --no-progress
 
+      - name: Check codestyle
+        run: composer run-script check-codestyle
+
       - name: Run test suite
         run: composer run-script test
diff --git a/AltoRouter.php b/AltoRouter.php
index a0081b3..051ef7d 100644
--- a/AltoRouter.php
+++ b/AltoRouter.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 MIT License
 
@@ -13,7 +14,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 class AltoRouter
 {
-
     /**
      * @var array Array of all routes (incl. named routes).
      */
@@ -202,7 +202,7 @@ class AltoRouter
             $requestUrl = substr($requestUrl, 0, $strpos);
         }
 
-        $lastRequestUrlChar = $requestUrl ? $requestUrl[strlen($requestUrl)-1] : '';
+        $lastRequestUrlChar = $requestUrl ? $requestUrl[strlen($requestUrl) - 1] : '';
 
         // set Request Method if it isn't passed as a parameter
         if ($requestMethod === null) {
@@ -232,7 +232,7 @@ class AltoRouter
             } else {
                 // Compare longest non-param string with url before moving on to regex
                 // Check if last character before param is a slash, because it could be optional if param is optional too (see https://github.com/dannyvankooten/AltoRouter/issues/241)
-                if (strncmp($requestUrl, $route, $position) !== 0 && ($lastRequestUrlChar === '/' || $route[$position-1] !== '/')) {
+                if (strncmp($requestUrl, $route, $position) !== 0 && ($lastRequestUrlChar === '/' || $route[$position - 1] !== '/')) {
                     continue;
                 }
 
diff --git a/composer.json b/composer.json
index 49e9aaa..2b787d4 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,8 @@
       "classmap": ["AltoRouter.php"]
    },
    "scripts": {
-      "test": "vendor/bin/phpunit",
-      "check-syntax": "find . -name '*.php' -not -path './vendor/*' -print0 | xargs -0 -n1 php --define error_reporting=-1 -l"
+      "test": "phpunit",
+      "check-syntax": "find . -name '*.php' -not -path './vendor/*' -print0 | xargs -0 -n1 php --define error_reporting=-1 -l",
+      "check-codestyle": "phpcs -ns"
    }
 }
diff --git a/phpcs.xml b/phpcs.xml
index d59cccf..052d2b3 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
 <ruleset name="rules">
     <description>rules</description>
-    <rule ref="PSR2"/>
+    <rule ref="PSR12">
+        <exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace" />
+    </rule>
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
-    <file>tests</file>
     <file>AltoRouter.php</file>
     <file>examples/</file>
     <arg name="colors"/>