Declare strict types

guzzle · Dec 4, 2018 · f52e089 · f52e089
1 parent 1e1380a
commit f52e089
Show file tree

Hide file tree

Showing 45 changed files with 116 additions and 7 deletions.
diff --git a/src/AppendStream.php b/src/AppendStream.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\StreamInterface;

diff --git a/src/BufferStream.php b/src/BufferStream.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\StreamInterface;

diff --git a/src/CachingStream.php b/src/CachingStream.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\StreamInterface;

diff --git a/src/DroppingStream.php b/src/DroppingStream.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\StreamInterface;

diff --git a/src/FnStream.php b/src/FnStream.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\StreamInterface;

diff --git a/src/InflateStream.php b/src/InflateStream.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\StreamInterface;

diff --git a/src/LazyOpenStream.php b/src/LazyOpenStream.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\StreamInterface;

diff --git a/src/LimitStream.php b/src/LimitStream.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\StreamInterface;

diff --git a/src/MessageTrait.php b/src/MessageTrait.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\StreamInterface;

diff --git a/src/MultipartStream.php b/src/MultipartStream.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\StreamInterface;

diff --git a/src/NoSeekStream.php b/src/NoSeekStream.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\StreamInterface;

diff --git a/src/PumpStream.php b/src/PumpStream.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\StreamInterface;

diff --git a/src/Request.php b/src/Request.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use InvalidArgumentException;

diff --git a/src/Response.php b/src/Response.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\ResponseInterface;

diff --git a/src/Rfc7230.php b/src/Rfc7230.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 final class Rfc7230

diff --git a/src/ServerRequest.php b/src/ServerRequest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use InvalidArgumentException;

diff --git a/src/Stream.php b/src/Stream.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\StreamInterface;

diff --git a/src/StreamDecoratorTrait.php b/src/StreamDecoratorTrait.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\StreamInterface;

diff --git a/src/StreamWrapper.php b/src/StreamWrapper.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\StreamInterface;
@@ -38,7 +41,7 @@ public static function getResource(StreamInterface $stream)
                 . 'writable, or both.');
         }
 
-        return fopen('guzzle://stream', $mode, null, self::createStreamContext($stream));
+        return fopen('guzzle://stream', $mode, false, self::createStreamContext($stream));
     }
 
     /**

diff --git a/src/UploadedFile.php b/src/UploadedFile.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use InvalidArgumentException;

diff --git a/src/Uri.php b/src/Uri.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\UriInterface;
@@ -618,7 +621,7 @@ private function filterPort($port)
     /**
      * @param UriInterface $uri
      * @param array        $keys
-     * 
+     *
      * @return array
      */
     private static function getFilteredQueryString(UriInterface $uri, array $keys)
@@ -639,7 +642,7 @@ private static function getFilteredQueryString(UriInterface $uri, array $keys)
     /**
      * @param string      $key
      * @param string|null $value
-     * 
+     *
      * @return string
      */
     private static function generateQueryString($key, $value)

diff --git a/src/UriNormalizer.php b/src/UriNormalizer.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\UriInterface;

diff --git a/src/UriResolver.php b/src/UriResolver.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\UriInterface;

diff --git a/tests/AppendStreamTest.php b/tests/AppendStreamTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7\AppendStream;

diff --git a/tests/BufferStreamTest.php b/tests/BufferStreamTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7\BufferStream;

diff --git a/tests/CachingStreamTest.php b/tests/CachingStreamTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7;
@@ -141,7 +143,7 @@ public function testSkipsOverwrittenBytes()
     {
         $decorated = Psr7\stream_for(
             implode("\n", array_map(function ($n) {
-                return str_pad($n, 4, '0', STR_PAD_LEFT);
+                return str_pad((string)$n, 4, '0', STR_PAD_LEFT);
             }, range(0, 25)))
         );
 

diff --git a/tests/DroppingStreamTest.php b/tests/DroppingStreamTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7\BufferStream;

diff --git a/tests/FnStreamTest.php b/tests/FnStreamTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7;

diff --git a/tests/FunctionsTest.php b/tests/FunctionsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7;

diff --git a/tests/InflateStreamTest.php b/tests/InflateStreamTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7;

diff --git a/tests/LazyOpenStreamTest.php b/tests/LazyOpenStreamTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7\LazyOpenStream;

diff --git a/tests/LimitStreamTest.php b/tests/LimitStreamTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7;

diff --git a/tests/MultipartStreamTest.php b/tests/MultipartStreamTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7;

diff --git a/tests/NoSeekStreamTest.php b/tests/NoSeekStreamTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7;

diff --git a/tests/PumpStreamTest.php b/tests/PumpStreamTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7\LimitStream;

diff --git a/tests/RequestTest.php b/tests/RequestTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7;

diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7;

diff --git a/tests/ServerRequestTest.php b/tests/ServerRequestTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7\ServerRequest;

diff --git a/tests/StreamDecoratorTraitTest.php b/tests/StreamDecoratorTraitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use Psr\Http\Message\StreamInterface;

diff --git a/tests/StreamTest.php b/tests/StreamTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7\NoSeekStream;

diff --git a/tests/StreamWrapperTest.php b/tests/StreamWrapperTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7\StreamWrapper;

diff --git a/tests/UploadedFileTest.php b/tests/UploadedFileTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use ReflectionProperty;
@@ -197,8 +199,6 @@ public function testMoveRaisesExceptionForInvalidPath($path)
         $stream = \GuzzleHttp\Psr7\stream_for('Foo bar!');
         $upload = new UploadedFile($stream, 0, UPLOAD_ERR_OK);
 
-        $this->cleanup[] = $path;
-
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('path');
         $upload->moveTo($path);

diff --git a/tests/UriNormalizerTest.php b/tests/UriNormalizerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7\Uri;
@@ -28,7 +30,7 @@ public function testCapitalizePercentEncoding()
     /**
      * @dataProvider getUnreservedCharacters
      */
-    public function testDecodeUnreservedCharacters($char)
+    public function testDecodeUnreservedCharacters(string $char)
     {
         $percentEncoded = '%'.bin2hex($char);
         // Add encoded reserved characters to test that those are not decoded and include the percent-encoded