update ci

Author: Stevie-Ray

.github/workflows/ci.yml

@@ -1,20 +1,22 @@
-name: CI
+name: CI/CD Pipeline
 
 on:
   push:
-    branches: [ main, master ]
+    branches: [ master ]
   pull_request:
-    branches: [ main, master ]
+    branches: [ master ]
 
 jobs:
   test:
+    name: Run Tests
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [8.1, 8.2, 8.3]
+        php: [8.3, 8.4]
 
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout code
+      uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -26,66 +28,88 @@ jobs:
     - name: Validate composer.json and composer.lock
       run: composer validate --strict
 
-    - name: Cache Composer packages
+    - name: Get composer cache directory
       id: composer-cache
-      uses: actions/cache@v3
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+    - name: Cache dependencies
+      uses: actions/cache@v4
       with:
-        path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-php-
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
+        restore-keys: ${{ runner.os }}-php-${{ matrix.php }}-composer-
 
     - name: Install dependencies
       run: composer install --prefer-dist --no-progress
 
-    - name: Run PHPStan
-      run: composer run phpstan
-
-    - name: Run PHP CodeSniffer
-      run: composer run phpcs
-
-    - name: Run tests
-      run: composer run test
+    - name: Run quality checks
+      run: composer run quality
 
     - name: Run tests with coverage
       run: composer run test-coverage
 
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v3
+      if: matrix.php == '8.4'
+      uses: codecov/codecov-action@v4
       with:
         file: ./coverage.xml
         flags: unittests
         name: codecov-umbrella
         fail_ci_if_error: true
 
   security:
+    name: Security Audit
     runs-on: ubuntu-latest
+    needs: test
+    
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout code
+      uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 8.3
+        php-version: '8.3'
 
     - name: Install dependencies
       run: composer install --prefer-dist --no-progress
 
     - name: Run security audit
       run: composer audit
 
-  outdated:
+  release:
+    name: Create Release
     runs-on: ubuntu-latest
+    needs: [test, security]
+    if: github.ref == 'refs/heads/master' && github.event_name == 'push'
+    
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout code
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 8.3
+        php-version: '8.3'
+        extensions: mbstring, iconv
 
     - name: Install dependencies
       run: composer install --prefer-dist --no-progress
 
-    - name: Check for outdated dependencies
-      run: composer outdated --direct
+    - name: Generate configuration files
+      run: composer generate
+
+    - name: Create Release
+      uses: softprops/action-gh-release@v2
+      with:
+        generate_release_notes: true
+        files: |
+          *.conf
+          *.vcl
+          *.caddy*
+          *.res
+          web.config
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/main.yml

@@ -22,7 +22,7 @@
     }
   ],
   "require": {
-    "php": ">=8.1",
+    "php": ">=8.3",
     "algo26-matthias/idna-convert": "^4.2.1"
   },
   "require-dev": {

composer.json

@@ -9,8 +9,7 @@
 
 class CommandLineInterface
 {
-    private const VERSION = '2.0.0';
-    private const SUPPORTED_TYPES = ['apache', 'nginx', 'varnish', 'iis', 'uwsgi', 'caddy', 'caddy2', 'google'];
+    private const array SUPPORTED_TYPES = ['apache', 'nginx', 'varnish', 'iis', 'uwsgi', 'caddy', 'caddy2', 'google'];
 
     /**
      * @param array<int, string> $argv
@@ -147,7 +146,7 @@ private function parseOptions(array $argv): array
      */
     private function showHelp(): void
     {
-        echo 'Referrer Spam Blocker Generator v' . self::VERSION . "\n\n";
+        echo "Referrer Spam Blocker Generator\n\n";
         echo "Usage: php run.php [options]\n\n";
         echo "Options:\n";
         echo "  -h, --help              Show this help message\n";
@@ -168,7 +167,7 @@ private function showHelp(): void
      */
     private function showVersion(): void
     {
-        echo 'Referrer Spam Blocker Generator v' . self::VERSION . "\n";
+        echo "Referrer Spam Blocker Generator\n";
     }
 
     /**

composer.lock

@@ -6,7 +6,7 @@
 
 abstract class AbstractConfigGenerator implements ConfigGeneratorInterface
 {
-    protected const PROJECT_URL = 'https://github.com/Stevie-Ray/referrer-spam-blocker';
+    protected const string PROJECT_URL = 'https://github.com/Stevie-Ray/referrer-spam-blocker';
 
     /**
      * Escape a domain for use in configuration files

src/CLI/CommandLineInterface.php

@@ -6,7 +6,7 @@
 
 class GoogleAnalyticsConfigGenerator extends AbstractConfigGenerator implements MultiFileConfigGeneratorInterface
 {
-    private const GOOGLE_ANALYTICS_LIMIT = 30000;
+    private const int GOOGLE_ANALYTICS_LIMIT = 30000;
 
     #[\Override]
     public function getFilename(): string

src/Config/AbstractConfigGenerator.php

@@ -12,8 +12,8 @@
 
 class DomainProcessor
 {
-    private const DEFAULT_DOMAINS_FILE = __DIR__ . '/../domains.txt';
-    private const IDN_PATTERN = '/[А-Яа-яЁёöɢ]/u';
+    private const string DEFAULT_DOMAINS_FILE = __DIR__ . '/../domains.txt';
+    private const string IDN_PATTERN = '/[А-Яа-яЁёöɢ]/u';
 
     private string $domainsFile;