Code quality

.gitattributes

@@ -2,10 +2,13 @@
 
 /bin export-ignore
 /tests export-ignore
+/.github export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.travis.yml export-ignore
 /.coveralls.yml export-ignore
 /phpunit.xml export-ignore
 /README.md export-ignore
 /readme.txt export-ignore
+/ecs.php export-ignore
+/rector.php export-ignore

.github/actions/setup/action.yml

@@ -0,0 +1,40 @@
+name: "Setup PHP & Composer"
+description: "Setup PHP & installs composer dependencies"
+inputs:
+  PHP_VERSION:
+    description: PHP version
+    default: "8.2"
+    required: false
+    type: string
+  PHP_TOOLS:
+    description: PHP version
+    default: ""
+    required: false
+    type: string
+  COMPOSER_ARGS:
+    description: Set of arguments passed to Composer.
+    default: "--prefer-dist --no-scripts"
+    required: false
+    type: string
+  INSTALL_DEPS:
+    description: Whether to install dependencies or not.
+    default: true
+    required: false
+    type: boolean
+
+runs:
+  using: composite
+  steps:
+    - name: Set up PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ inputs.PHP_VERSION }}
+        tools: ${{ format('composer,{0}', inputs.PHP_TOOLS) }}
+    - name: Remove lock file
+      shell: bash
+      run: rm -f composer.lock
+    - name: Install Composer dependencies
+      if: ${{ inputs.INSTALL_DEPS == 'true' }}
+      uses: ramsey/composer-install@v3
+      with:
+        composer-options: ${{ inputs.COMPOSER_ARGS }}

.github/workflows/php-lint.yml

@@ -0,0 +1,46 @@
+name: PHP lint
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - "**.php"
+      - "**composer.json"
+  pull_request:
+    branches:
+      - master
+    paths:
+      - "**.php"
+      - "**composer.json"
+    types:
+      - opened
+      - synchronize
+      - ready_for_review
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  php-lint:
+    name: PHP lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Install dependencies
+        uses: ./.github/actions/setup
+        with:
+          PHP_TOOLS: "parallel-lint,cs2pr"
+          INSTALL_DEPS: false
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v47
+        with:
+          files: "**.php"
+
+      - name: Run PHP lint
+        if: steps.changed-files.outputs.all_changed_files != ''
+        run: parallel-lint --exclude .git --exclude vendor --checkstyle ${{ join(steps.changed-files.outputs.all_changed_files, ' ') }} | cs2pr

.github/workflows/php-rector.yml

@@ -0,0 +1,41 @@
+name: PHP Rector
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - "**.php"
+      - "**composer.json"
+  pull_request:
+    branches:
+      - master
+    paths:
+      - "**.php"
+      - "**composer.json"
+    types:
+      - opened
+      - synchronize
+      - ready_for_review
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  php-cs:
+    name: PHP Rector
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Install dependencies
+        uses: ./.github/actions/setup
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v47
+
+      - name: Run Rector checks
+        if: steps.changed-files.outputs.all_changed_files != ''
+        run: ./vendor/bin/rector process --dry-run ${{ steps.changed-files.outputs.files }}

.github/workflows/php-unit-tests.yml

@@ -0,0 +1,114 @@
+name: PHP unit tests
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - "**workflows/php-unit-tests.yml"
+      - "**.php"
+      - "**composer.*"
+      - "**phpunit.xml"
+  pull_request:
+    branches:
+      - master
+    paths:
+      - "**workflows/php-unit-tests.yml"
+      - "**.php"
+      - "**composer.*"
+      - "**phpunit.xml"
+    types:
+      - opened
+      - synchronize
+      - ready_for_review
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  # =============================================================================
+  # Detect PHP versions from composer.json
+  # =============================================================================
+  php-versions:
+    runs-on: ubuntu-latest
+    outputs:
+      versions: ${{ steps.versions.outputs.version }}
+    steps:
+      - uses: actions/checkout@v6
+      - id: versions
+        uses: WyriHaximus/github-action-composer-php-versions-in-range@v1
+        with:
+          upcomingReleases: true
+
+  # =============================================================================
+  # Compatibility tests: PHP versions x WP versions
+  # =============================================================================
+  php-unit-tests:
+    needs: php-versions
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ${{ fromJson(needs.php-versions.outputs.versions) }}
+        wp: ["latest"]
+        dependency-version: ["highest", "lowest"]
+        experimental: [false]
+        coverage: [false]
+        include:
+          # Oldest supported WP with lowest deps
+          - php: "8.2"
+            wp: "6.3"
+            dependency-version: "lowest"
+            experimental: false
+            coverage: false
+          # Coverage: PHP 8.2, WP latest, highest deps
+          - php: "8.2"
+            wp: "latest"
+            dependency-version: "highest"
+            experimental: false
+            coverage: true
+          # Trunk (experimental)
+          - php: "8.5"
+            wp: "trunk"
+            dependency-version: "highest"
+            experimental: true
+            coverage: false
+
+    name: PHP ${{ matrix.php }} | WP ${{ matrix.wp }} | ${{ matrix.dependency-version }}${{ matrix.coverage && ' | coverage' || '' }}
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: ${{ matrix.coverage && 'pcov' || 'none' }}
+          tools: composer:v2
+          extensions: curl, date, dom, iconv, json, libxml, gd, sqlite3
+          ini-values: ${{ matrix.coverage && 'pcov.directory=src' || '' }}
+
+      - name: Setup problem matchers
+        run: |
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - uses: ramsey/composer-install@v4
+        with:
+          dependency-versions: ${{ matrix.dependency-version }}
+
+      # PHP 8.5: Collision and curl have deprecations we can't fix
+      - name: Disable failOnDeprecation for PHP 8.5
+        if: matrix.experimental
+        run: sed -i 's/failOnDeprecation="true"/failOnDeprecation="false"/' phpunit.xml
+
+      - name: Create coverage directory
+        if: matrix.coverage
+        run: mkdir -p build/logs
+
+      - name: Run default testsuite
+        run: composer test ${{ matrix.coverage && '-- --coverage-php build/coverage-default.cov' || '' }}
+        env:
+          WP_VERSION: ${{ matrix.wp }}

.gitignore

@@ -1,19 +1,25 @@
-# osx noise
+!/src/Cache
+.tmp
+*~
+
+# OS
 .DS_Store
-profile
 
-# xcode noise
-build/*
-*.mode1
-*.mode1v3
-*.mode2v3
-*.perspective
-*.perspectivev3
-*.pbxuser
-*.xcworkspace
-xcuserdata
+# IDE and local environment
+.idea
+.vscode
+*.swp
 
-# svn & cvs
-.svn
-CVS
+# Packages
 vendor
+composer.lock
+# Application
+build
+/cache
+twig-cache/*
+
+# Tests
+.phpunit.result.cache
+/wp-content
+/tmp
+/.phpunit.cache

README.md

@@ -1,12 +1,12 @@
 # Routes
-Simple routing for WordPress. Designed for usage with [Timber](https://github.com/timber/timber)
 
-[![Build Status](https://img.shields.io/travis/Upstatement/routes/master.svg?style=flat-square)](https://travis-ci.org/Upstatement/routes)
-[![Coverage Status](https://img.shields.io/coveralls/Upstatement/routes.svg?style=flat-square)](https://coveralls.io/r/Upstatement/routes?branch=master)
-[![Packagist Downloads](https://img.shields.io/packagist/dt/Upstatement/routes.svg?style=flat-square)]()
+Simple routing for WordPress. Designed for usage with [Timber](https://github.com/timber/timber)
 
+[![PHP unit tests](https://github.com/Upstatement/routes/actions/workflows/php-unit-tests.yml/badge.svg?branch=2.x)](https://github.com/Upstatement/routes/actions/workflows/php-unit-tests.yml?query=branch:2.x)
+[![Latest Stable Version](https://img.shields.io/packagist/v/Upstatement/routes.svg?style=flat-square)](https://packagist.org/packages/Upstatement/routes)
 
 ### Basic Usage
+
 ```php
 /* functions.php */
 Routes::map('myfoo/bar', 'my_callback_function');
@@ -21,6 +21,7 @@ Routes::map('my-events/:event', function($params) {
 Using routes makes it easy for you to implement custom pagination — and anything else you might imagine in your wildest dreams of URLs and parameters. OMG so easy!
 
 ## Some examples
+
 In your functions.php file, this can be called anywhere (don't hook it to init or another action or it might be called too late)
 
 ```php
@@ -77,12 +78,13 @@ my-users/:userid/edit
 A function that should fire when the pattern matches the request. Callback takes one argument which is an array of the parameters passed in the URL.
 
 So in this example: `'info/:name/page/:pg'`, $params would have data for:
-* `$data['name']`
-* `$data['pg']`
+
+- `$data['name']`
+- `$data['pg']`
 
 ... which you can use in the callback function as a part of your query
 
-* * *
+---
 
 ## load