Skip to content

Commit c61e82d

Browse files
authored
Merge pull request #302 from ptondereau/php8
Add PHP8 support.
2 parents af6676a + 5c4dd23 commit c61e82d

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

.travis.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ matrix:
1212
- php: 7.1
1313
- php: 7.2
1414
- php: 7.3
15-
- php: 7.3.0
16-
- php: 7.3.1
17-
- php: 7.3.2
15+
- php: 7.4
1816
- php: nightly
17+
env:
18+
- IGNORE_PLATFORM_REQ=true
1919
- php: hhvm-3.9
2020
sudo: required
2121
dist: trusty
@@ -36,7 +36,12 @@ before_install:
3636
- xdebug-disable
3737

3838
before_script:
39-
- travis_retry composer update --no-interaction --prefer-source --prefer-stable
39+
- if [[ "$IGNORE_PLATFORM_REQ" == "true" ]]; then
40+
composer self-update --preview;
41+
travis_retry composer update --no-interaction --prefer-stable --ignore-platform-req=php;
42+
else
43+
travis_retry composer update --no-interaction --prefer-stable;
44+
fi
4045

4146
script:
4247
- if [[ "$LINT" == "true" ]]; then

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"sort-packages": true
2424
},
2525
"require": {
26-
"php": "^7",
26+
"php": "^7.0 || ^8.0",
2727
"ext-intl": "*",
2828
"ext-simplexml": "*",
2929
"ext-mbstring": "*",

tests/Assert/Tests/AssertTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
use Assert\Assertion;
1818
use Assert\AssertionFailedException;
19+
use Assert\Tests\Fixtures\CustomAssertion;
1920
use Assert\Tests\Fixtures\OneCountable;
2021
use PDO;
2122
use PHPUnit\Framework\TestCase;
@@ -1832,7 +1833,8 @@ public function testValidCallable()
18321833
{
18331834
$this->assertTrue(Assertion::isCallable('\is_callable'));
18341835
$this->assertTrue(Assertion::isCallable(__NAMESPACE__.'\\Fixtures\\someCallable'));
1835-
$this->assertTrue(Assertion::isCallable([OneCountable::class, 'count']));
1836+
$this->assertTrue(Assertion::isCallable([new OneCountable(), 'count']));
1837+
$this->assertTrue(Assertion::isCallable([CustomAssertion::class, 'clearCalls']));
18361838
$this->assertTrue(
18371839
Assertion::isCallable(
18381840
function () {
@@ -2227,7 +2229,7 @@ public function testInvalidPropertiesExist($properties)
22272229

22282230
public function testIsResource()
22292231
{
2230-
self::assertTrue(Assertion::isResource(\curl_init()));
2232+
self::assertTrue(Assertion::isResource(\fopen('php://memory', 'w')));
22312233
}
22322234

22332235
/**

0 commit comments

Comments
 (0)