Add PHP8 Support

composer.json

@@ -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"
  },
 

src/Event/InvalidateRequestEvent.php

@@ -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;
  }
@@ -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;
  }

tests/Event/InvalidateRequestEventTest.php

@@ -12,7 +12,7 @@ class InvalidateRequestEventTest extends TestCase
 {
  public function testGeneralUseCase()
  {
- $baseUri = Psr7\uri_for('https://api.domain.tld');
+ $baseUri = Psr7\Utils::uriFor('https://api.domain.tld');
 
  /** @var Client|\PHPUnit_Framework_MockObject_MockObject $client */
  $client = $this->getMockBuilder(Client::class)->getMock();

tests/EventListener/InvalidateRequestSubscriberTest.php

@@ -55,7 +55,7 @@ public function testGeneralUseCase()
 
  public function testGetSubscribedEventsResultType()
  {
- $this->assertInternalType('array', InvalidateRequestSubscriber::getSubscribedEvents());
+ $this->assertIsArray(InvalidateRequestSubscriber::getSubscribedEvents());
  }
 
  public function testGetSubscribedEventsHasInvalidateEvent()

tests/GuzzleBundleCachePluginTest.php

@@ -19,7 +19,7 @@ class GuzzleBundleCachePluginTest extends TestCase
  /** @var GuzzleBundleCachePlugin */
  protected $plugin;
 
- public function setUp()
+ public function setUp(): void
  {
  parent::setUp();