Skip to content
This repository has been archived by the owner on Mar 20, 2024. It is now read-only.

Fix PHP8 deprecation #373

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ php:
- 7.0
- 7.1
- 7.2
- 8.0
- hhvm

matrix:
Expand All @@ -26,6 +27,8 @@ matrix:
# Test against dev dependencies
- php: 7.2
env: DEPS=dev
- php: 8.0
env: DEPS=dev

before_install:
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/lts=$SYMFONY_VERSION; fi;
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

"require-dev": {
"behat/mink-goutte-driver": "^1.1",
"phpspec/phpspec": "^2.0"
"phpspec/phpspec": "^7.0"
},

"autoload": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,11 @@ private function buildGuzzle3Client(array $parameters)
private function isGoutte1()
{
$refl = new \ReflectionParameter(array('Goutte\Client', 'setClient'), 0);

if ($refl->getClass() && 'Guzzle\Http\ClientInterface' === $refl->getClass()->getName()) {
return true;
if (version_compare(PHP_VERSION, '8.0.0', '<')) {
return $refl->getClass() && 'Guzzle\Http\ClientInterface' === $refl->getClass()->getName();
}

return false;
return $refl->getType() instanceof \ReflectionNamedType && 'Guzzle\Http\ClientInterface' === $refl->getType()->getName();
}

private function isGuzzle6()
Expand Down