Skip to content

Commit

Permalink
Upgrade PHPUnit and attempt to clean up test output
Browse files Browse the repository at this point in the history
  • Loading branch information
danhunsaker committed Dec 20, 2019
1 parent 23fbc2e commit 7a47571
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 22 deletions.
21 changes: 10 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
language: php

php:
- '7.4'
- '7.3'
- '7.2'
- '7.1'
- '7.0'
- '5.6'
- hhvm
matrix:
exclude:
- php: hhvm
env: ENABLE_REDIS_EXT=1
allow_failures:
- php: '7.4'
- php: '7.3'
- php: '7.2'
- php: hhvm

env:
- ENABLE_REDIS_EXT=0
- ENABLE_REDIS_EXT=1
before_script:

matrix:
allow_failures:
- php: '7.4'
- php: '5.6'

install:
- echo 'error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- sh -c "if [ $ENABLE_REDIS_EXT -eq 1 ]; then echo \"extension=redis.so\" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
- composer install
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@ jobs on one or more queues, and processing them later.
[![Downloads](https://img.shields.io/packagist/dt/resque/php-resque.svg?style=flat-square)](https://packagist.org/packages/resque/php-resque)

[![Build Status](https://img.shields.io/travis/resque/php-resque.svg?style=flat-square&logo=travis)](http://travis-ci.org/resque/php-resque)
[![Tested With HHVM](https://img.shields.io/hhvm/resque/php-resque.svg?style=flat-square)](http://travis-ci.org/resque/php-resque)
[![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/)
[![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/)
[![Dependency Status](https://img.shields.io/librariesio/github/resque/php-resque.svg?style=flat-square)](https://libraries.io/github/resque/php-resque)

[![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)
[![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)
[![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)
[![Maintenance Status](https://img.shields.io/maintenance/yes/2019.svg?style=flat-square&logo=github&logoColor=white)](https://github.com/resque/php-resque)
[![Maintenance Status](https://img.shields.io/maintenance/yes/2020.svg?style=flat-square&logo=github&logoColor=white)](https://github.com/resque/php-resque)

[![Contributors](https://img.shields.io/github/contributors/resque/php-resque.svg?style=flat-square&logo=github&logoColor=white)](https://github.com/resque/php-resque)
[![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)
Expand Down Expand Up @@ -361,7 +360,7 @@ $ PREFIX=my-app-name bin/resque

### Setting Redis backend ###

When you have the Redis database on a different host than the one the workers
When you have the Redis database on a different host than the one the workers
are running, you must set the `REDIS_BACKEND` environment variable:

```sh
Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@
}
],
"require": {
"php": ">=5.3.0",
"ext-pcntl": "*",
"php": ">=5.6.0",
"colinmollenhour/credis": "~1.7",
"psr/log": "~1.0"
},
"suggest": {
"ext-pcntl": "REQUIRED for forking processes on platforms that support it (so anything but Windows).",
"ext-proctitle": "Allows php-resque to rename the title of UNIX processes to show the status of a worker.",
"ext-redis": "Native PHP extension for Redis connectivity. Credis will automatically utilize when available."
},
"require-dev": {
"phpunit/phpunit": "3.7.*"
"phpunit/phpunit": "^5.7"
},
"bin": [
"bin/resque",
Expand All @@ -49,10 +49,10 @@
"Resque": "lib",
"ResqueScheduler": "lib"
}
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
}
}

0 comments on commit 7a47571

Please sign in to comment.