Skip to content

Add PHP8 Support #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 17, 2022
Merged

Add PHP8 Support #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
],

"require": {
"php": "^7.0",
"guzzlehttp/guzzle": "~6.0|~7.0",
"php": "^7.0 || ^8.0",
"guzzlehttp/guzzle": "~6.0 || ^7.5.0",
"eightpoints/guzzle-bundle": "~8.0",
"symfony/http-kernel": "~4.0|~5.0",
"symfony/config": "~4.0|~5.0",
"symfony/dependency-injection": "~4.0|~5.0",
"symfony/expression-language": "~4.0|~5.0",
"symfony/http-kernel": "~4.0 || ~5.0",
"symfony/config": "~4.0 || ~5.0",
"symfony/dependency-injection": "~4.0 || ~5.0",
"symfony/expression-language": "~4.0 || ~5.0",
"kevinrob/guzzle-cache-middleware": "~3.0"
},

Expand Down
4 changes: 2 additions & 2 deletions src/Event/InvalidateRequestEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public function getRequest(): Request
$baseUri = $this->client->getConfig('base_uri');

if ($baseUri instanceof UriInterface) {
$uri = Psr7\UriResolver::resolve($baseUri, Psr7\uri_for($this->uri));
$uri = Psr7\UriResolver::resolve($baseUri, Psr7\Utils::uriFor($this->uri));
} else {
$uri = $this->uri;
}
Expand Down Expand Up @@ -131,7 +131,7 @@ public function getRequest(): Request
$baseUri = $this->client->getConfig('base_uri');

if ($baseUri instanceof UriInterface) {
$uri = Psr7\UriResolver::resolve($baseUri, Psr7\uri_for($this->uri));
$uri = Psr7\UriResolver::resolve($baseUri, Psr7\Utils::uriFor($this->uri));
} else {
$uri = $this->uri;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Event/InvalidateRequestEventTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class InvalidateRequestEventTest extends TestCase
{
public function testGeneralUseCase()
{
$baseUri = Psr7\uri_for('http://api.domain.tld');
$baseUri = Psr7\Utils::uriFor('http://api.domain.tld');

/** @var Client|\PHPUnit_Framework_MockObject_MockObject $client */
$client = $this->getMockBuilder(Client::class)->getMock();
Expand Down
2 changes: 1 addition & 1 deletion tests/EventListener/InvalidateRequestSubscriberTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function testGeneralUseCase()

public function testGetSubscribedEventsResultType()
{
$this->assertInternalType('array', InvalidateRequestSubscriber::getSubscribedEvents());
$this->assertIsArray(InvalidateRequestSubscriber::getSubscribedEvents());
}

public function testGetSubscribedEventsHasInvalidateEvent()
Expand Down
2 changes: 1 addition & 1 deletion tests/GuzzleBundleCachePluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class GuzzleBundleCachePluginTest extends TestCase
/** @var GuzzleBundleCachePlugin */
protected $plugin;

public function setUp()
public function setUp(): void
{
parent::setUp();

Expand Down