Skip to content

Commit

Permalink
Merge pull request #4 from innogames/php-8-upgrade
Browse files Browse the repository at this point in the history
PHP Upgrade
  • Loading branch information
adlenton authored Nov 3, 2020
2 parents d4a917d + 8d40c81 commit 8f0c63d
Show file tree
Hide file tree
Showing 47 changed files with 2,649 additions and 1,619 deletions.
19 changes: 0 additions & 19 deletions .scrutinizer.yml

This file was deleted.

27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
## Forked version to add namespacing

### 4.0.0 ##
* Introduced strict types where possible
* Added support for PHP 8
* Dropped support for PHP versions < 7.3

### 3.0.2 ##

* Remove upper bound on supported symfony/console version to support Symfony v3 and v4 based projects
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ decoupling. This makes it easier to use and extend.

## Getting Started

Add `grepolis/php-resque` to your application's composer.json.
Add `innogames/php-resque` to your application's composer.json.

```json
{
Expand All @@ -26,9 +26,9 @@ Add `grepolis/php-resque` to your application's composer.json.

## Requirements

* PHP 5.3+
* PHP 7.3+ (incl. PHP 8)
* A Redis client library (for instance, [Predis](https://github.com/nrk/predis) or [Credis](https://github.com/colinmollenhour/credis))
* The PHP pcntl library for proper forking is recommended (not available under Windows) but it still runs without it
* The PHP pcntl extension for proper forking is recommended (not available under Windows) but it still runs without it

## Jobs

Expand Down
21 changes: 14 additions & 7 deletions cli-config.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* CLI Config file
*
Expand All @@ -19,14 +21,19 @@
* Configure the client however you'd like, here. Or, you could
* grab it from your application's service/injection container.
*/

use Predis\Client;
use Resque\Client\ClientInterface;
use Resque\Console\ConsoleRunner;

/* @var \Resque\Client\ClientInterface $predis */
$predis = new Client(array(
'scheme' => 'tcp',
'host' => '127.0.0.1',
'port' => 6379
));
/* @var ClientInterface $predis */
$predis = new Client(
[
'scheme' => 'tcp',
'host' => '127.0.0.1',
'port' => 6379,
]
);

/*
* You can optionally customize the PSR3 logger used on the CLI. The
Expand All @@ -35,4 +42,4 @@
* $logger = new Monolog\Logger('resque');
*/

return \Resque\Console\ConsoleRunner::createHelperSet($predis/*, $logger*/);
return ConsoleRunner::createHelperSet($predis/*, $logger*/);
40 changes: 21 additions & 19 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"_-x-vim-formatting": " vim: set ft=javascript ts=4 sw=4 et : ",

"name": "innogames/php-resque",
"name": "innogames/php-resque",
"description": "Port of vend/resque which is the namespaced port of chrisbolton/php-resque, supports Predis, more DI",
"license": "MIT",
"license": "MIT",
"minimum-stability": "stable",
"authors": [
{
Expand All @@ -17,39 +15,43 @@
{
"name": "Grepolis Devs",
"email": "[email protected]"
},
{
"name": "Justus Graf",
"email": "[email protected]"
}
],

"autoload": {
"psr-4": {
"Resque\\": ["src/", "test/"]
"Resque\\": [
"src/",
"test/"
]
}
},

"bin": [
"resque"
],

"require": {
"php": ">=5.3.7",
"psr/log": "1.0.0",
"symfony/console": ">=2.7"
"php": "^7.3 || ^8.0",
"psr/log": "^1.1",
"symfony/console": "^5.0",
"ext-pcntl": "*",
"ext-posix": "*",
"ext-json": "*"
},

"require-dev": {
"colinmollenhour/credis": "1.3.*",
"predis/predis": ">=0.8.6",
"phpunit/phpunit": "^7.0",
"monolog/monolog": "1.7.*"
"colinmollenhour/credis": "^1.11",
"predis/predis": ">=1.1",
"phpunit/phpunit": "^9.4",
"monolog/monolog": "^2.0"
},

"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev",
"dev-2.0": "2.0.x-dev"
"dev-2.0": "2.0.x-dev"
}
},

"suggest": {
"ext-proctitle": "Allows php-resque to rename the title of UNIX processes to show the status of a worker.",
"predis/predis": "Suggested Redis client",
Expand Down
Loading

0 comments on commit 8f0c63d

Please sign in to comment.