Skip to content

Commit 2c487fa

Browse files
authored
Merge pull request #18 from adriansuter/patch-php
Drop PHP 7.1 and update PHPUnit
2 parents 9a0359f + 98e7ed6 commit 2c487fa

File tree

10 files changed

+15
-11
lines changed

10 files changed

+15
-11
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
.idea
3+
.phpunit.result.cache
34
composer.lock
45
coverage
56
docs/_site

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ dist: trusty
44

55
matrix:
66
include:
7-
- php: 7.1
87
- php: 7.2
98
- php: 7.3
109
- php: 7.4
1110
env: ANALYSIS='true'
11+
- php: nightly
12+
13+
allow_failures:
14+
- php: nightly
1215

1316
before_script:
1417
- if [[ "$ANALYSIS" == 'true' ]]; then composer require php-coveralls/php-coveralls:^2.2.0 ; fi

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ only.**
1616

1717
## Requirements
1818

19-
- PHP 7.1 or later
19+
- PHP 7.2 or later
2020
- Composer with PSR-4 (PSR-0 is not supported)
2121

2222

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
]
3535
},
3636
"require": {
37-
"php": "^7.1",
37+
"php": "^7.2 || ^8.0",
3838
"nikic/php-parser": "^4.4"
3939
},
4040
"require-dev": {
4141
"phpstan/phpstan": "^0.12.25",
42-
"phpunit/phpunit": "^7.5",
42+
"phpunit/phpunit": "^8.5",
4343
"squizlabs/php_codesniffer": "^3.5"
4444
},
4545
"scripts": {

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ only.**
1111

1212
# Requirements
1313

14-
- PHP 7.1 or later
14+
- PHP 7.2 or later
1515
- Composer with PSR-4 (PSR-0 is not supported)
1616

1717

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="http://schema.phpunit.de/7.1/phpunit.xsd"
3+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.5/phpunit.xsd"
44
backupGlobals="true"
55
beStrictAboutOutputDuringTests="true"
66
colors="true"

tests/AbstractIntegrationTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ abstract class AbstractIntegrationTest extends TestCase
1919

2020
private static $classLoader;
2121

22-
public static function setUpBeforeClass()
22+
public static function setUpBeforeClass(): void
2323
{
2424
self::$classLoader = require(__DIR__ . '/../vendor/autoload.php');
2525
}
2626

27-
protected function setUp()
27+
protected function setUp(): void
2828
{
2929
parent::setUp();
3030
if (!$this->overrideApplied) {

tests/FileStreamWrapperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ final class FileStreamWrapperTest extends TestCase
2222
*/
2323
private $tempFilePath;
2424

25-
protected function tearDown()
25+
protected function tearDown(): void
2626
{
2727
// Make sure that we restore the default file stream wrapper.
2828
\stream_wrapper_restore('file');

tests/IntegrationCustomNamespaceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
class IntegrationCustomNamespaceTest extends AbstractIntegrationTest
1414
{
15-
public static function setUpBeforeClass()
15+
public static function setUpBeforeClass(): void
1616
{
1717
require_once(__DIR__ . '/assets/PHPCustomAutoloadOverride.php');
1818
}

tests/IntegrationNamespaceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
class IntegrationNamespaceTest extends AbstractIntegrationTest
1414
{
15-
public static function setUpBeforeClass()
15+
public static function setUpBeforeClass(): void
1616
{
1717
require_once(__DIR__ . '/assets/PHPAutoloadOverride.php');
1818
}

0 commit comments

Comments
 (0)