Skip to content

Commit eef1b84

Browse files
authored
Merge pull request #78 from shivas/support-php8
Add support for PHP 8
2 parents 97a0897 + b5b3c45 commit eef1b84

File tree

5 files changed

+22
-15
lines changed

5 files changed

+22
-15
lines changed

.travis.yml

+11-6
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ matrix:
1818
fast_finish: true
1919
include:
2020
# Minimum supported dependencies with the latest and oldest PHP version
21-
- php: 7.4
21+
- php: 8.0
2222
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
2323
- php: 7.2
2424
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
2525

26-
# Test the latest stable release
26+
# Test supported PHP versions
2727
- php: 7.2
2828
- php: 7.3
2929
- php: 7.4
30-
env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-text --coverage-clover=coverage.clover"
30+
- php: 8.0
31+
env: COVERAGE=true XDEBUG_MODE=coverage PHPUNIT_FLAGS="-v --coverage-text --coverage-clover=coverage.clover"
3132

3233
# Test with Symfony 3
3334
- php: 7.4
@@ -38,17 +39,21 @@ matrix:
3839
env: SYMFONY_VERSION="^4"
3940

4041
# Latest commit to master
41-
- php: 7.4
42+
- php: 8.0
4243
env: STABILITY="dev"
4344

44-
# Upcoming PHP version
45+
# Upcoming PHP versions
4546
- php: 7.4snapshot
47+
- php: 8.0snapshot
48+
- php: nightly
4649

4750
allow_failures:
4851
# dev-master is allowed to fail
4952
- env: STABILITY="dev"
50-
# Upcoming PHP version is allowed to fail
53+
# Upcoming PHP versions are allowed to fail
5154
- php: 7.4snapshot
55+
- php: 8.0snapshot
56+
- php: nightly
5257

5358
before_install:
5459
- if [ "$COVERAGE" != true ]; then phpenv config-rm xdebug.ini || true; fi

Tests/Provider/GitRepositoryProviderTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
namespace Shivas\VersioningBundle\Tests\Provider;
55

6-
use org\bovigo\vfs\vfsStream;
7-
use org\bovigo\vfs\vfsStreamDirectory;
6+
use bovigo\vfs\vfsStream;
7+
use bovigo\vfs\vfsStreamDirectory;
88
use PHPUnit\Framework\TestCase;
99
use RuntimeException;
1010
use Shivas\VersioningBundle\Provider\GitRepositoryProvider;

Tests/Provider/RevisionProviderTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
namespace Shivas\VersioningBundle\Tests\Provider;
55

6-
use org\bovigo\vfs\vfsStream;
7-
use org\bovigo\vfs\vfsStreamDirectory;
6+
use bovigo\vfs\vfsStream;
7+
use bovigo\vfs\vfsStreamDirectory;
88
use PHPUnit\Framework\TestCase;
99
use Shivas\VersioningBundle\Provider\RevisionProvider;
1010

Tests/Provider/VersionProviderTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
namespace Shivas\VersioningBundle\Tests\Provider;
55

6-
use org\bovigo\vfs\vfsStream;
7-
use org\bovigo\vfs\vfsStreamDirectory;
6+
use bovigo\vfs\vfsStream;
7+
use bovigo\vfs\vfsStreamDirectory;
88
use PHPUnit\Framework\TestCase;
99
use Shivas\VersioningBundle\Provider\VersionProvider;
1010

composer.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
"wiki": "https://github.com/shivas/versioning-bundle/wiki"
1818
},
1919
"require": {
20-
"php": "^7.2",
20+
"php": "^7.2 || ^8",
2121
"nikolaposa/version": "^4",
2222
"symfony/console": "^3.4 || ^4 || ^5",
2323
"symfony/framework-bundle": "^3.4 || ^4 || ^5",
2424
"symfony/process": "^3.4 || ^4 || ^5"
2525
},
2626
"require-dev": {
27-
"mikey179/vfsstream": "^1.6",
27+
"mikey179/vfsstream": "^2",
2828
"nyholm/symfony-bundle-test": "^1.7",
2929
"phpunit/phpunit": "^7 || ^8",
3030
"symfony/phpunit-bridge": "^5",
@@ -35,5 +35,7 @@
3535
},
3636
"autoload": {
3737
"psr-4": { "Shivas\\VersioningBundle\\": "" }
38-
}
38+
},
39+
"minimum-stability": "dev",
40+
"prefer-stable": true
3941
}

0 commit comments

Comments
 (0)