Skip to content

Commit 7a47571

Browse files
committed
Upgrade PHPUnit and attempt to clean up test output
1 parent 23fbc2e commit 7a47571

File tree

3 files changed

+20
-22
lines changed

3 files changed

+20
-22
lines changed

.travis.yml

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
language: php
2+
23
php:
34
- '7.4'
45
- '7.3'
56
- '7.2'
67
- '7.1'
78
- '7.0'
89
- '5.6'
9-
- hhvm
10-
matrix:
11-
exclude:
12-
- php: hhvm
13-
env: ENABLE_REDIS_EXT=1
14-
allow_failures:
15-
- php: '7.4'
16-
- php: '7.3'
17-
- php: '7.2'
18-
- php: hhvm
10+
1911
env:
2012
- ENABLE_REDIS_EXT=0
2113
- ENABLE_REDIS_EXT=1
22-
before_script:
14+
15+
matrix:
16+
allow_failures:
17+
- php: '7.4'
18+
- php: '5.6'
19+
20+
install:
21+
- echo 'error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
2322
- sh -c "if [ $ENABLE_REDIS_EXT -eq 1 ]; then echo \"extension=redis.so\" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
2423
- composer install

README.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ jobs on one or more queues, and processing them later.
1212
[![Downloads](https://img.shields.io/packagist/dt/resque/php-resque.svg?style=flat-square)](https://packagist.org/packages/resque/php-resque)
1313

1414
[![Build Status](https://img.shields.io/travis/resque/php-resque.svg?style=flat-square&logo=travis)](http://travis-ci.org/resque/php-resque)
15-
[![Tested With HHVM](https://img.shields.io/hhvm/resque/php-resque.svg?style=flat-square)](http://travis-ci.org/resque/php-resque)
1615
[![Code Quality](https://img.shields.io/scrutinizer/g/resque/php-resque.svg?style=flat-square&logo=scrutinizer)](https://scrutinizer-ci.com/g/resque/php-resque/)
1716
[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/resque/php-resque.svg?style=flat-square&logo=scrutinizer)](https://scrutinizer-ci.com/g/resque/php-resque/)
1817
[![Dependency Status](https://img.shields.io/librariesio/github/resque/php-resque.svg?style=flat-square)](https://libraries.io/github/resque/php-resque)
1918

2019
[![Latest Release](https://img.shields.io/github/release/resque/php-resque.svg?style=flat-square&logo=github&logoColor=white)](https://github.com/resque/php-resque)
2120
[![Latest Release Date](https://img.shields.io/github/release-date/resque/php-resque.svg?style=flat-square&logo=github&logoColor=white)](https://github.com/resque/php-resque)
2221
[![Commits Since Latest Release](https://img.shields.io/github/commits-since/resque/php-resque/latest.svg?style=flat-square&logo=github&logoColor=white)](https://github.com/resque/php-resque)
23-
[![Maintenance Status](https://img.shields.io/maintenance/yes/2019.svg?style=flat-square&logo=github&logoColor=white)](https://github.com/resque/php-resque)
22+
[![Maintenance Status](https://img.shields.io/maintenance/yes/2020.svg?style=flat-square&logo=github&logoColor=white)](https://github.com/resque/php-resque)
2423

2524
[![Contributors](https://img.shields.io/github/contributors/resque/php-resque.svg?style=flat-square&logo=github&logoColor=white)](https://github.com/resque/php-resque)
2625
[![Chat on Slack](https://img.shields.io/badge/chat-Slack-blue.svg?style=flat-square&logo=slack&logoColor=white)](https://join.slack.com/t/php-resque/shared_invite/enQtNTIwODk0OTc1Njg3LWYyODczMTZjMzI2N2JkYWUzM2FlNDk5ZjY2ZGM4Njc4YjFiMzU2ZWFjOGQxMDIyNmE5MTBlNWEzODBiMmVmOTI)
@@ -361,7 +360,7 @@ $ PREFIX=my-app-name bin/resque
361360

362361
### Setting Redis backend ###
363362

364-
When you have the Redis database on a different host than the one the workers
363+
When you have the Redis database on a different host than the one the workers
365364
are running, you must set the `REDIS_BACKEND` environment variable:
366365

367366
```sh

composer.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828
}
2929
],
3030
"require": {
31-
"php": ">=5.3.0",
32-
"ext-pcntl": "*",
31+
"php": ">=5.6.0",
3332
"colinmollenhour/credis": "~1.7",
3433
"psr/log": "~1.0"
3534
},
3635
"suggest": {
36+
"ext-pcntl": "REQUIRED for forking processes on platforms that support it (so anything but Windows).",
3737
"ext-proctitle": "Allows php-resque to rename the title of UNIX processes to show the status of a worker.",
3838
"ext-redis": "Native PHP extension for Redis connectivity. Credis will automatically utilize when available."
3939
},
4040
"require-dev": {
41-
"phpunit/phpunit": "3.7.*"
41+
"phpunit/phpunit": "^5.7"
4242
},
4343
"bin": [
4444
"bin/resque",
@@ -49,10 +49,10 @@
4949
"Resque": "lib",
5050
"ResqueScheduler": "lib"
5151
}
52-
},
53-
"extra": {
54-
"branch-alias": {
55-
"dev-master": "1.0-dev"
56-
}
52+
},
53+
"extra": {
54+
"branch-alias": {
55+
"dev-master": "1.0-dev"
5756
}
57+
}
5858
}

0 commit comments

Comments
 (0)