Skip to content

Commit e57f0f6

Browse files
Merge pull request composer#100 from johnstevenson/php-updates
Updates for PHP and phpunit
2 parents 4b18177 + 1a2f8ff commit e57f0f6

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

.travis.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: php
22
dist: trusty
3-
sudo: false
43

54
git:
65
depth: 5
@@ -10,23 +9,25 @@ cache:
109
- $HOME/.composer/cache
1110
- vendor
1211

13-
php:
14-
- 5.4
15-
- 5.5
16-
- 5.6
17-
- 7.0
18-
- 7.1
19-
- 7.2
20-
- 7.3
21-
- nightly
22-
23-
matrix:
12+
jobs:
2413
include:
25-
- dist: precise
26-
php: 5.3
14+
- php: 5.3
15+
dist: precise
16+
- php: 5.4
17+
- php: 5.5
18+
- php: 5.6
19+
- php: 7.0
20+
- php: 7.1
21+
- php: 7.2
22+
- php: 7.3
23+
- php: 7.4snapshot
2724
fast_finish: true
2825
allow_failures:
29-
- php: nightly
26+
- php: 7.4snapshot
27+
28+
before_install:
29+
# disable Xdebug if present
30+
- phpenv config-rm xdebug.ini || echo "Xdebug not present"
3031

3132
install:
3233
- composer install --no-interaction --no-progress --prefer-dist --ansi

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ clone_depth: 5
33

44
environment:
55
# This sets the PHP version (from Chocolatey)
6-
PHPCI_CHOCO_VERSION: 7.3.1
6+
PHPCI_CHOCO_VERSION: 7.3.11
77
PHPCI_CACHE: C:\tools\phpci
88
PHPCI_PHP: C:\tools\phpci\php
99
PHPCI_COMPOSER: C:\tools\phpci\composer

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
"issues": "https://github.com/composer/xdebug-handler/issues"
1919
},
2020
"require": {
21-
"php": "^5.3.2 || ^7.0",
21+
"php": "^5.3.2 || ^7.0 || ^8.0",
2222
"psr/log": "^1.0"
2323
},
2424
"require-dev": {
25-
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
25+
"phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7"
2626
},
2727
"autoload": {
2828
"psr-4": {

phpunit.xml.dist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
convertWarningsToExceptions="true"
88
processIsolation="false"
99
stopOnFailure="false"
10-
syntaxCheck="false"
1110
bootstrap="vendor/autoload.php"
1211
>
1312
<testsuites>

0 commit comments

Comments
 (0)