Skip to content

Commit 4e1ad63

Browse files
committed
Bump dependency versions.
1 parent 771e8db commit 4e1ad63

File tree

5 files changed

+40
-46
lines changed

5 files changed

+40
-46
lines changed

.travis.yml

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
language: php
22

33
cache:
4-
directories:
5-
- ~/.cache/composer
4+
directories:
5+
- ~/.cache/composer
66

77
php:
8-
- 7.2
9-
- 7.3
8+
- 7.2
9+
- 7.3
10+
- 7.4
11+
- nightly
1012

1113
matrix:
12-
fast_finish: true
14+
allow_failures:
15+
- php: nightly
16+
fast_finish: true
1317

1418
install:
15-
- composer install
19+
- composer install
1620

1721
script:
18-
- vendor/bin/grumphp run
22+
- vendor/bin/grumphp run

composer.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
},
1818
"require-dev": {
1919
"friendsofphp/php-cs-fixer": "^2.12",
20-
"phpunit/phpunit": "^8.0",
21-
"phpro/grumphp": "^0.15.0",
22-
"jakub-onderka/php-parallel-lint": "^1.0"
23-
20+
"phpunit/phpunit": "^8.0 || ^9.0",
21+
"phpro/grumphp": "^0.19",
22+
"php-parallel-lint/php-parallel-lint": "^1.2"
2423
},
2524
"autoload": {
2625
"psr-4": {

grumphp.yml

+14-16
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
parameters:
2-
git_dir: .
3-
bin_dir: vendor/bin
4-
tasks:
5-
composer:
6-
strict: true
7-
phpcsfixer2:
8-
config: .php_cs
9-
phpunit: ~
10-
phplint: ~
11-
git_blacklist:
12-
keywords:
13-
- "die("
14-
- "var_dump("
15-
- "exit("
16-
triggered_by: [php]
1+
grumphp:
2+
tasks:
3+
composer:
4+
strict: true
5+
phpcsfixer2:
6+
config: .php_cs
7+
phpunit: ~
8+
phplint: ~
9+
git_blacklist:
10+
keywords:
11+
- "die("
12+
- "var_dump("
13+
- "exit("
14+
triggered_by: [php]

phpunit.xml

+11-18
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
5-
bootstrap="tests/bootstrap.php"
6-
colors="true"
7-
backupGlobals="false"
8-
verbose="true"
9-
>
10-
<testsuites>
11-
<testsuite name="Unit tests">
12-
<directory>tests/unit</directory>
13-
</testsuite>
14-
</testsuites>
15-
<filter>
16-
<whitelist>
17-
<directory>src</directory>
18-
</whitelist>
19-
</filter>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="tests/bootstrap.php" colors="true" backupGlobals="false" verbose="true">
3+
<coverage>
4+
<include>
5+
<directory>src</directory>
6+
</include>
7+
</coverage>
8+
<testsuites>
9+
<testsuite name="Unit tests">
10+
<directory>tests/unit</directory>
11+
</testsuite>
12+
</testsuites>
2013
</phpunit>

tests/unit/PluginLoaderTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function testPluginLoad()
2727
$this->anything(),
2828
$this->anything(),
2929
$this->callback('is_callable')
30-
);
30+
);
3131

3232
$instance = new PluginLoader(new ParameterResolver($container));
3333
$dirs = [dirname(__DIR__).'/resources/plugins'];

0 commit comments

Comments
 (0)