Modernise for PHP 8.2+ and replace dead CI

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: composer
+    directory: /
+    schedule:
+      interval: weekly
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly

.github/workflows/ci.yml

@@ -0,0 +1,44 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  checks:
+    name: Checks
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      # Run on the minimum supported PHP so php-cs-fixer doesn't suggest newer functions
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+          extensions: pcntl, posix
+      - run: composer update --no-interaction --no-progress
+      - run: composer check
+      - run: composer audit --no-dev
+
+  analyse:
+    name: PHPStan (PHP ${{ matrix.php }}${{ matrix.dependencies == 'lowest' && ', lowest deps' || '' }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['8.2', '8.3', '8.4', '8.5']
+        dependencies: [highest]
+        include:
+          - php: '8.2'
+            dependencies: lowest
+    steps:
+      - uses: actions/checkout@v7
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: pcntl, posix
+      - run: composer update --no-interaction --no-progress ${{ matrix.dependencies == 'lowest' && '--prefer-lowest' || '' }}
+      - run: composer phpstan

.gitignore

@@ -1,4 +1,4 @@
 /vendor/
 /composer.lock
 /sonar-project.properties
-.php_cs.cache
+.php-cs-fixer.cache

.php_cs → .php-cs-fixer.dist.php

@@ -32,7 +32,7 @@
 $finder->exclude('data');
 $finder->in(__DIR__);
 
-$config = Config::create();
+$config = new Config();
 
 $config->setRiskyAllowed(true);
 
@@ -43,14 +43,13 @@
         'array_indentation' => true,
         'array_syntax' => ['syntax' => 'short'],
         'binary_operator_spaces' => true,
-        'blank_line_after_opening_tag' => true,
+        'blank_line_after_opening_tag' => false,
         'blank_line_before_statement' => [
             'statements' => [
                 'case',
                 'continue',
                 'declare',
                 'default',
-                'die',
                 'do',
                 'exit',
                 'for',
@@ -66,10 +65,10 @@
             ],
         ],
         'cast_spaces' => ['space' => 'none'],
-        'class_attributes_separation' => ['elements' => ['method', 'property']],
+        'class_attributes_separation' => ['elements' => ['method' => 'one', 'property' => 'one']],
         'combine_consecutive_issets' => true,
         'combine_consecutive_unsets' => true,
-        'compact_nullable_typehint' => true,
+        'compact_nullable_type_declaration' => true,
         'concat_space' => ['spacing' => 'one'],
         'date_time_immutable' => true,
         'declare_equal_normalize' => true,
@@ -80,9 +79,9 @@
         'final_internal_class' => true,
         'fopen_flag_order' => true,
         'fopen_flags' => true,
-        'fully_qualified_strict_types' => true,
+        'fully_qualified_strict_types' => ['phpdoc_tags' => []],
         'function_to_constant' => true,
-        'function_typehint_space' => true,
+        'type_declaration_spaces' => true,
         'heredoc_indentation' => true,
         'heredoc_to_nowdoc' => true,
         'implode_call' => true,
@@ -102,7 +101,7 @@
         'native_constant_invocation' => false,
         'native_function_casing' => true,
         'native_function_invocation' => false,
-        'new_with_braces' => true,
+        'new_with_parentheses' => true,
         'no_alternative_syntax' => true,
         'no_binary_string' => true,
         'no_blank_lines_after_class_opening' => true,
@@ -119,14 +118,13 @@
         'no_null_property_initialization' => true,
         'no_php4_constructor' => true,
         'no_short_bool_cast' => true,
-        'no_short_echo_tag' => true,
+        'echo_tag_syntax' => ['format' => 'long'],
         'no_singleline_whitespace_before_semicolons' => true,
         'no_spaces_around_offset' => true,
         'no_superfluous_elseif' => true,
-        'no_trailing_comma_in_list_call' => true,
-        'no_trailing_comma_in_singleline_array' => true,
+        'no_trailing_comma_in_singleline' => true,
         'no_unneeded_control_parentheses' => true,
-        'no_unneeded_curly_braces' => true,
+        'no_unneeded_braces' => true,
         'no_unneeded_final_method' => true,
         'no_unreachable_default_argument_value' => true,
         'no_unset_cast' => true,
@@ -155,15 +153,15 @@
         'phpdoc_types' => true,
         'pow_to_exponentiation' => true,
         'protected_to_private' => true,
-        'psr4' => true,
+        'psr_autoloading' => true,
         'random_api_migration' => true,
         'return_assignment' => true,
         'return_type_declaration' => true,
         'self_accessor' => true,
         'semicolon_after_instruction' => true,
         'short_scalar_cast' => true,
         'simplified_null_return' => true,
-        'single_blank_line_before_namespace' => true,
+        'blank_lines_before_namespace' => true,
         'single_class_element_per_statement' => true,
         'single_import_per_statement' => true,
         'single_line_after_imports' => true,
@@ -177,7 +175,7 @@
         'string_line_ending' => true,
         'ternary_operator_spaces' => true,
         'ternary_to_null_coalescing' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         'unary_operator_spaces' => true,
         'whitespace_after_comma_in_array' => true,
     ]

README.md

@@ -1,11 +1,9 @@
 # QueueJitsu
 [![All Contributors](https://img.shields.io/badge/all_contributors-7-orange.svg?style=flat-square)](#contributors)
 
-[![Build Status](https://travis-ci.org/Mezzle/queuejitsu.svg?branch=master)](https://travis-ci.org/Mezzle/queuejitsu)
-[![Code Climate](https://codeclimate.com/github/Mezzle/queuejitsu/badges/gpa.svg)](https://codeclimate.com/github/Mezzle/queuejitsu)
-[![Test Coverage](https://codeclimate.com/github/Mezzle/queuejitsu/badges/coverage.svg)](https://codeclimate.com/github/Mezzle/queuejitsu/coverage)
+[![CI](https://github.com/Mezzle/queuejitsu/actions/workflows/ci.yml/badge.svg)](https://github.com/Mezzle/queuejitsu/actions/workflows/ci.yml)
 
-QueueJitsu is a queueing system built on the concepts of php-resque-ex, but made to work in a modern environment
+QueueJitsu is a queueing system built on the concepts of php-resque-ex, but made to work in a modern environment. It requires PHP 8.2 or later.
 
 Console integration is provided by [QueueJitsu CLI](https://packagist.org/packages/mez/queuejitsu-cli)
 

composer.json

@@ -1,61 +1,68 @@
 {
   "name": "mez/queuejitsu",
-  "type": "library",
   "description": "A Modern Queueing System",
   "license": "MIT",
+  "type": "library",
   "authors": [
     {
       "name": "Martin Meredith",
       "email": "martin@sourceguru.net"
     }
   ],
   "require": {
-    "php": "^7.2 || ^8.0",
+    "php": "^8.2",
     "ext-json": "*",
-    "ext-pcntl": "^7.2",
-    "ext-posix": "^7.2",
-    "laminas/laminas-eventmanager": "^3.2",
-    "predis/predis": "^1.1",
-    "psr/container": "^1.0",
-    "psr/log": "^1.0",
-    "ramsey/uuid": "^3.7 || ^4.0"
+    "ext-pcntl": "*",
+    "ext-posix": "*",
+    "laminas/laminas-eventmanager": "^3.13",
+    "predis/predis": "^3.3",
+    "psr/container": "^1.1 || ^2.0",
+    "psr/log": "^1.1 || ^2.0 || ^3.0",
+    "ramsey/uuid": "^4.7"
   },
   "require-dev": {
-    "ergebnis/composer-normalize": "^2.6",
-    "friendsofphp/php-cs-fixer": "~2",
-    "maglnet/composer-require-checker": "^2.1",
-    "nikic/php-parser": "^4.6",
-    "php-parallel-lint/php-parallel-lint": "^1.2",
-    "phpro/grumphp-shim": "^0.19.0",
-    "phpstan/phpstan": "^0.12.32",
-    "roave/security-advisories": "dev-master",
-    "sensiolabs/security-checker": "^6.0"
+    "ergebnis/composer-normalize": "^2.45",
+    "friendsofphp/php-cs-fixer": "^3.64",
+    "maglnet/composer-require-checker": "^4.7",
+    "phpstan/phpstan": "^2.1"
+  },
+  "conflict": {
+    "psr/http-message": "<1.1"
   },
   "suggest": {
     "ext-pcntl": "Allows Workers to be ran in forked processes",
     "mez/queuejitsu-cli": "Command Line integration",
     "predis/predis": "Connect up to Redis"
   },
+  "autoload": {
+    "psr-4": {
+      "QueueJitsu\\": "src"
+    }
+  },
   "config": {
-    "optimize-autoloader": true,
-    "preferred-install": {
-      "stickee/*": "source",
-      "*": "dist"
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
     },
+    "optimize-autoloader": true,
     "sort-packages": true
   },
   "extra": {
-    "zf": {
+    "laminas": {
       "config-provider": "QueueJitsu\\ConfigProvider"
     }
   },
-  "autoload": {
-    "psr-4": {
-      "QueueJitsu\\": "src"
-    }
-  },
   "scripts": {
-    "cs-check": "php-cs-fixer --allow-risky=yes --config=.php_cs --dry-run --verbose fix",
-    "cs-fix": "php-cs-fixer --allow-risky=yes --config=.php_cs --verbose fix"
+    "check": [
+      "@composer validate --strict",
+      "@normalize-check",
+      "@cs-check",
+      "@phpstan",
+      "@require-check"
+    ],
+    "cs-check": "php-cs-fixer check --diff --verbose",
+    "cs-fix": "php-cs-fixer fix --verbose",
+    "normalize-check": "@composer normalize --dry-run --indent-size=2 --indent-style=space",
+    "phpstan": "phpstan analyse",
+    "require-check": "composer-require-checker check composer.json"
   }
 }