Add types to constructors and private/final/internal methods (Batch II)

Author: derrabus

Tests/DataCollector/HttpClientDataCollectorTest.php

@@ -164,7 +164,7 @@ public function testItIsEmptyAfterReset()
         $this->assertEquals(0, $sut->getRequestCount());
     }
 
-    private function httpClientThatHasTracedRequests($tracedRequests)
+    private function httpClientThatHasTracedRequests($tracedRequests): TraceableHttpClient
     {
         $httpClient = new TraceableHttpClient(new NativeHttpClient());
 

Tests/Exception/HttpExceptionTraitTest.php

@@ -20,7 +20,7 @@
  */
 class HttpExceptionTraitTest extends TestCase
 {
-    public function provideParseError()
+    public function provideParseError(): iterable
     {
         yield ['application/ld+json', '{"hydra:title": "An error occurred", "hydra:description": "Some details"}'];
         yield ['application/problem+json', '{"title": "An error occurred", "detail": "Some details"}'];

Tests/HttpClientTraitTest.php

@@ -24,7 +24,7 @@ class HttpClientTraitTest extends TestCase
     /**
      * @dataProvider providePrepareRequestUrl
      */
-    public function testPrepareRequestUrl($expected, $url, $query = [])
+    public function testPrepareRequestUrl(string $expected, string $url, array $query = [])
     {
         $defaults = [
             'base_uri' => 'http://example.com?c=c',
@@ -36,7 +36,7 @@ public function testPrepareRequestUrl($expected, $url, $query = [])
         $this->assertSame($expected, implode('', $url));
     }
 
-    public function providePrepareRequestUrl()
+    public function providePrepareRequestUrl(): iterable
     {
         yield ['http://example.com/', 'http://example.com/'];
         yield ['http://example.com/?a=1&b=b', '.'];
@@ -48,15 +48,15 @@ public function providePrepareRequestUrl()
     /**
      * @dataProvider provideResolveUrl
      */
-    public function testResolveUrl($base, $url, $expected)
+    public function testResolveUrl(string $base, string $url, string $expected)
     {
         $this->assertSame($expected, implode('', self::resolveUrl(self::parseUrl($url), self::parseUrl($base))));
     }
 
     /**
      * From https://github.com/guzzle/psr7/blob/master/tests/UriResoverTest.php.
      */
-    public function provideResolveUrl()
+    public function provideResolveUrl(): array
     {
         return [
             [self::RFC3986_BASE, 'http:h',        'http:h'],
@@ -123,14 +123,14 @@ public function provideResolveUrl()
     /**
      * @dataProvider provideParseUrl
      */
-    public function testParseUrl($expected, $url, $query = [])
+    public function testParseUrl(array $expected, string $url, array $query = [])
     {
         $expected = array_combine(['scheme', 'authority', 'path', 'query', 'fragment'], $expected);
 
         $this->assertSame($expected, self::parseUrl($url, $query));
     }
 
-    public function provideParseUrl()
+    public function provideParseUrl(): iterable
     {
         yield [['http:', '//example.com', null, null, null], 'http://Example.coM:80'];
         yield [['https:', '//xn--dj-kia8a.example.com:8000', '/', null, null], 'https://DÉjà.Example.com:8000/'];

Tests/HttpOptionsTest.php

@@ -19,7 +19,7 @@
  */
 class HttpOptionsTest extends TestCase
 {
-    public function provideSetAuthBasic()
+    public function provideSetAuthBasic(): iterable
     {
         yield ['user:password', 'user', 'password'];
         yield ['user:password', 'user:password'];