Skip to content

Commit 9b9b57b

Browse files
authored
Merge pull request #18 from jakzal/php-and-phpunit-bump
Raise minimum required PHP version to 7.2 and PHPUnit version to 8.0
2 parents f9aafcd + 4b4f5f7 commit 9b9b57b

File tree

12 files changed

+23
-22
lines changed

12 files changed

+23
-22
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/build/
22
/box.json
33
/composer.lock
4+
/tests/phar/.phpunit.result.cache
45
/vendor/
56
/.php_cs.cache
7+
/.phpunit.result.cache

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
language: php
22
matrix:
33
include:
4-
- php: 7.1
5-
env: EXECUTE_DEPLOYMENT=true
64
- php: 7.2
5+
env: EXECUTE_DEPLOYMENT=true
76
- php: 7.3
87
env: deps=low
98
fast_finish: true

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ test-package: package test-package-tools
3030
.PHONY: test-package
3131

3232
cs: tools/php-cs-fixer
33-
PHP_CS_FIXER_IGNORE_ENV=1 tools/php-cs-fixer --dry-run --allow-risky=yes --no-interaction --ansi fix
33+
tools/php-cs-fixer --dry-run --allow-risky=yes --no-interaction --ansi fix
3434
.PHONY: cs
3535

3636
cs-fix: tools/php-cs-fixer
37-
PHP_CS_FIXER_IGNORE_ENV=1 tools/php-cs-fixer --allow-risky=yes --no-interaction --ansi fix
37+
tools/php-cs-fixer --allow-risky=yes --no-interaction --ansi fix
3838
.PHONY: cs-fix
3939

4040
deptrac: tools/deptrac
4141
tools/deptrac --no-interaction --ansi --formatter-graphviz-display=0
4242
.PHONY: deptrac
4343

4444
infection: tools/infection tools/infection.pubkey
45-
phpdbg -qrr ./tools/infection --no-interaction --formatter=progress --min-msi=95 --min-covered-msi=95 --only-covered --ansi
45+
phpdbg -qrr ./tools/infection --no-interaction --formatter=progress --min-msi=96 --min-covered-msi=96 --only-covered --ansi
4646
.PHONY: infection
4747

4848
phpunit: tools/phpunit
@@ -71,7 +71,7 @@ package: tools/box
7171

7272
cd build/phar && \
7373
composer remove phpunit/phpunit --no-update && \
74-
composer config platform.php 7.1 && \
74+
composer config platform.php 7.2 && \
7575
composer update --no-dev -o -a
7676

7777
tools/box compile
@@ -93,16 +93,16 @@ tools/deptrac:
9393
curl -Ls http://get.sensiolabs.de/deptrac.phar -o tools/deptrac && chmod +x tools/deptrac
9494

9595
tools/infection: tools/infection.pubkey
96-
curl -Ls https://github.com/infection/infection/releases/download/0.9.0/infection.phar -o tools/infection && chmod +x tools/infection
96+
curl -Ls https://github.com/infection/infection/releases/download/0.12.0/infection.phar -o tools/infection && chmod +x tools/infection
9797

9898
tools/infection.pubkey:
99-
curl -Ls https://github.com/infection/infection/releases/download/0.9.0/infection.phar.pubkey -o tools/infection.pubkey
99+
curl -Ls https://github.com/infection/infection/releases/download/0.12.0/infection.phar.pubkey -o tools/infection.pubkey
100100

101101
tools/box:
102-
curl -Ls https://github.com/humbug/box/releases/download/3.0.0-beta.4/box.phar -o tools/box && chmod +x tools/box
102+
curl -Ls https://github.com/humbug/box/releases/download/3.4.0/box.phar -o tools/box && chmod +x tools/box
103103

104104
tests/phar/tools/phpunit:
105-
curl -Ls https://phar.phpunit.de/phpunit-7.phar -o tests/phar/tools/phpunit && chmod +x tests/phar/tools/phpunit
105+
curl -Ls https://phar.phpunit.de/phpunit-8.phar -o tests/phar/tools/phpunit && chmod +x tests/phar/tools/phpunit
106106

107107
tests/phar/tools/phpunit.d/zalas-phpunit-injector-extension.phar: build/zalas-phpunit-injector-extension.phar
108108
cp build/zalas-phpunit-injector-extension.phar tests/phar/tools/phpunit.d/zalas-phpunit-injector-extension.phar

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Put the extension in your PHPUnit extensions directory.
2626
Remember to instruct PHPUnit to load extensions in your `phpunit.xml`:
2727

2828
```xml
29-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.0/phpunit.xsd"
29+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.0/phpunit.xsd"
3030
extensionsDirectory="tools/phpunit.d"
3131
>
3232
</phpunit>
@@ -39,7 +39,7 @@ in the [PHPUnit configuration file](https://phpunit.de/manual/current/en/appendi
3939

4040
```xml
4141
<?xml version="1.0" encoding="UTF-8"?>
42-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.0/phpunit.xsd">
42+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.0/phpunit.xsd">
4343

4444
<!-- ... -->
4545

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"description": "Injects services from a PSR-11 dependency injection container to PHPUnit test cases",
44
"type": "library",
55
"require": {
6-
"php": "^7.1",
7-
"phpunit/phpunit": "^7.0",
6+
"php": "^7.2",
7+
"phpunit/phpunit": "^8.0",
88
"psr/container": "^1.0",
99
"zalas/injector": "^1.0"
1010
},

manifest.xml.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<phar xmlns="https://phar.io/xml/manifest/1.0">
33
<contains name="zalas/phpunit-injector" version="@@version@@" type="extension">
4-
<extension for="phpunit/phpunit" compatible="^7.0"/>
4+
<extension for="phpunit/phpunit" compatible="^8.0"/>
55
</contains>
66

77
<copyright>
@@ -10,6 +10,6 @@
1010
</copyright>
1111

1212
<requires>
13-
<php version="^7.1"/>
13+
<php version="^7.2"/>
1414
</requires>
1515
</phar>

phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.0/phpunit.xsd"
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.0/phpunit.xsd"
44
bootstrap="vendor/autoload.php"
55
beStrictAboutOutputDuringTests="true"
66
beStrictAboutTodoAnnotatedTests="true"

tests/Symfony/Compiler/Discovery/PropertyDiscoveryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class PropertyDiscoveryTest extends TestCase
4040
*/
4141
private $classFinder;
4242

43-
protected function setUp()
43+
protected function setUp(): void
4444
{
4545
$this->discovery = new PropertyDiscovery($this->classFinder->reveal(), $this->extractorFactory->reveal());
4646

tests/Symfony/Compiler/ExposeServicesForTestsPassTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class ExposeServicesForTestsPassTest extends TestCase
3434
*/
3535
private $discovery;
3636

37-
protected function setUp()
37+
protected function setUp(): void
3838
{
3939
$this->pass = new ExposeServicesForTestsPass($this->discovery->reveal());
4040
}

tests/Symfony/TestCase/SymfonyTestContainerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class SymfonyTestContainerTest extends TestCase implements ServiceContainerTestC
1414
{
1515
use SymfonyTestContainer;
1616

17-
protected function setUp()
17+
protected function setUp(): void
1818
{
1919
if (!\class_exists(TestContainer::class)) {
2020
$this->markTestSkipped('SymfonyTestContainer requires Symfony >= 4.1.');

0 commit comments

Comments
 (0)