Use strict types

amphp · Aug 22, 2016 · 52f7ec6 · 52f7ec6
1 parent def6a6b
commit 52f7ec6
Show file tree

Hide file tree

Showing 69 changed files with 81 additions and 79 deletions.
diff --git a/lib/Body.php b/lib/Body.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/BodyParser.php b/lib/BodyParser.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 
@@ -133,7 +133,7 @@ private function end($data) {
                         $metadata[$name][count($fields[$name]) - 1]["mime"] = $headers["content-type"];
                     }
                 }
-
+    
                 return new ParsedBody($fields, $metadata);
 
             } else {
@@ -216,7 +216,9 @@ public function stream(string $name, int $size = 0): FieldBody {
                 return new FieldBody($body->getObservable(), $metadata->getAwaitable());
             }
         } elseif (empty($this->bodies[$name])) {
-            return new FieldBody(new Success, new Success([]));
+            $postponed = new Postponed;
+            $postponed->resolve();
+            return new FieldBody($postponed->getObservable(), new Success([]));
         }
 
         $key = key($this->bodies[$name]);

diff --git a/lib/Bootable.php b/lib/Bootable.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Bootstrapper.php b/lib/Bootstrapper.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Client.php b/lib/Client.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 
@@ -22,7 +22,7 @@ class Client {
     public $readWatcher;
     public $writeWatcher;
 
-    public $writeBuffer;
+    public $writeBuffer = "";
     public $bufferSize = 0;
     public $bufferDeferred;
     public $onWriteDrain;

diff --git a/lib/ClientException.php b/lib/ClientException.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/ClientSizeException.php b/lib/ClientSizeException.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/CommandClient.php b/lib/CommandClient.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Console.php b/lib/Console.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/ConsoleLogger.php b/lib/ConsoleLogger.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/DebugProcess.php b/lib/DebugProcess.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/FieldBody.php b/lib/FieldBody.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/FilterException.php b/lib/FilterException.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Host.php b/lib/Host.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 
@@ -140,7 +140,7 @@ public function encrypt(string $certificate, string $key = null, array $options
      * The following example redirects all unencrypted requests to the equivalent
      * encrypted resource:
      *
-     *      <?php
+     *      <?php declare(strict_types = 1);
      *      // Redirect http://mysite.com to https://mysite.com
      *      $host = new Aerys\Host;
      *      $host->setName("mysite.com");

diff --git a/lib/Http1Driver.php b/lib/Http1Driver.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 
@@ -256,7 +256,7 @@ public function parser(Client $client): \Generator {
             }
 
             $protocol = \strtok(" ");
-            if (stripos($protocol, "HTTP/") !== 0) {
+            if (!is_string($protocol) || stripos($protocol, "HTTP/") !== 0) {
                 $error = "Bad Request: invalid request line";
                 break;
             }

diff --git a/lib/Http2Driver.php b/lib/Http2Driver.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/HttpDriver.php b/lib/HttpDriver.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/InternalRequest.php b/lib/InternalRequest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/IpcLogger.php b/lib/IpcLogger.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Logger.php b/lib/Logger.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Middleware.php b/lib/Middleware.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Monitor.php b/lib/Monitor.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/NullBody.php b/lib/NullBody.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Options.php b/lib/Options.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/ParsedBody.php b/lib/ParsedBody.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Process.php b/lib/Process.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Request.php b/lib/Request.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Response.php b/lib/Response.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Root.php b/lib/Root.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Router.php b/lib/Router.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Server.php b/lib/Server.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/ServerObserver.php b/lib/ServerObserver.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/StandardRequest.php b/lib/StandardRequest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/StandardResponse.php b/lib/StandardResponse.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Ticker.php b/lib/Ticker.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 
@@ -59,7 +59,7 @@ public function updateTime() {
         // Date string generation is (relatively) expensive. Since we only need HTTP
         // dates at a granularity of one second we're better off to generate this
         // information once per second and cache it.
-        $now = (int) round(microtime(1));
+        $now = (int) round(microtime(true));
         $this->currentTime = $now;
         $this->currentHttpDate = gmdate("D, d M Y H:i:s", $now) . " GMT";
         foreach ($this->useCallbacks as $useCallback) {

diff --git a/lib/Vhost.php b/lib/Vhost.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/VhostContainer.php b/lib/VhostContainer.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 
@@ -164,7 +164,7 @@ private function selectHostByAuthority(InternalRequest $ireq) {
             $ipComparison = $ireq->uriHost;
 
             if (!@inet_pton($ipComparison)) {
-                $ipComparison = substr($ipComparison, 1, -1); // IPv6 braces
+                $ipComparison = (string) substr($ipComparison, 1, -1); // IPv6 braces
                 if (!@inet_pton($ipComparison)) {
                     return null;
                 }

diff --git a/lib/WatcherProcess.php b/lib/WatcherProcess.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Websocket.php b/lib/Websocket.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/Websocket/Code.php b/lib/Websocket/Code.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys\Websocket;
 

diff --git a/lib/Websocket/Endpoint.php b/lib/Websocket/Endpoint.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys\Websocket;
 

diff --git a/lib/Websocket/Handshake.php b/lib/Websocket/Handshake.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys\Websocket;
 

diff --git a/lib/Websocket/Message.php b/lib/Websocket/Message.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys\Websocket;
 

diff --git a/lib/Websocket/Rfc6455Client.php b/lib/Websocket/Rfc6455Client.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys\Websocket;
 

diff --git a/lib/Websocket/Rfc6455Endpoint.php b/lib/Websocket/Rfc6455Endpoint.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys\Websocket;
 
@@ -622,7 +622,7 @@ public function send(/* int|array|null */ $clientId, string $data, bool $binary
             if (\strlen($data) > 1.5 * $this->autoFrameSize) {
                 $len = \strlen($data);
                 $slices = ceil($len / $this->autoFrameSize);
-                $frames = str_split($data, ceil($len / $slices));
+                $frames = str_split($data, (int) ceil($len / $slices));
                 $data = array_pop($frames);
                 foreach ($frames as $frame) {
                     $this->compile($client, $frame, $opcode, false);

diff --git a/lib/Websocket/Rfc6455EndpointProxy.php b/lib/Websocket/Rfc6455EndpointProxy.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys\Websocket;
 

diff --git a/lib/WorkerProcess.php b/lib/WorkerProcess.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/constants.php b/lib/constants.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/lib/functions.php b/lib/functions.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys;
 

diff --git a/test/BodyParsingTest.php b/test/BodyParsingTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys\Test;
 
@@ -61,7 +61,7 @@ function testImmediateWatch($header, $data, $fields, $metadata) {
             });
             yield $body;
 
-            $this->assertEquals(count($fieldlist), count($fieldlist, true));
+            $this->assertEquals(count($fieldlist), count($fieldlist, \COUNT_RECURSIVE));
             $this->assertEquals($fields, $result["fields"]);
             $this->assertEquals($metadata, $result["metadata"]);
         });
@@ -97,7 +97,7 @@ function testIncrementalWatch($header, $data, $fields, $metadata) {
             });
             yield $body;
 
-            $this->assertEquals(count($fieldlist), count($fieldlist, true));
+            $this->assertEquals(count($fieldlist), count($fieldlist, \COUNT_RECURSIVE));
             $this->assertEquals($fields, $result["fields"]);
             $this->assertEquals($metadata, $result["metadata"]);
         });

diff --git a/test/BodyTest.php b/test/BodyTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Aerys\Test;