Merge branch 'hotfix/125' into develop

Forward port #125

Author: Xerkus

src/Client.php

@@ -1240,20 +1240,20 @@ protected function prepareBody()
         }
 
         $body = '';
-        $totalFiles = 0;
+        $hasFiles = false;
 
         if (! $this->getRequest()->getHeaders()->has('Content-Type')) {
-            $totalFiles = count($this->getRequest()->getFiles()->toArray());
+            $hasFiles = ! empty($this->getRequest()->getFiles()->toArray());
             // If we have files to upload, force encType to multipart/form-data
-            if ($totalFiles > 0) {
+            if ($hasFiles) {
                 $this->setEncType(self::ENC_FORMDATA);
             }
         } else {
             $this->setEncType($this->getHeader('Content-Type'));
         }
 
         // If we have POST parameters or files, encode and add them to the body
-        if (count($this->getRequest()->getPost()->toArray()) > 0 || $totalFiles > 0) {
+        if (! empty($this->getRequest()->getPost()->toArray()) || $hasFiles) {
             if (stripos($this->getEncType(), self::ENC_FORMDATA) === 0) {
                 $boundary = '---ZENDHTTPCLIENT-' . md5(microtime());
                 $this->setEncType(self::ENC_FORMDATA, $boundary);

src/Request.php

@@ -121,7 +121,7 @@ public static function fromString($string, $allowCustomMethods = true)
             $request->setVersion($matches['version']);
         }
 
-        if (count($lines) == 0) {
+        if (empty($lines)) {
             return $request;
         }
 

src/Response.php

@@ -202,7 +202,7 @@ public static function fromString($string)
         $response->setStatusCode($matches['status']);
         $response->setReasonPhrase((isset($matches['reason']) ? $matches['reason'] : ''));
 
-        if (count($lines) === 0) {
+        if (empty($lines)) {
             return $response;
         }
 

src/Response/Stream.php

@@ -160,7 +160,7 @@ public static function fromStream($responseString, $stream)
             $responseArray = explode("\n", $responseString);
         }
 
-        while (count($responseArray)) {
+        while (! empty($responseArray)) {
             $nextLine        = array_shift($responseArray);
             $headersString  .= $nextLine . "\n";
             $nextLineTrimmed = trim($nextLine);
@@ -191,7 +191,7 @@ public static function fromStream($responseString, $stream)
             $response->setStream($stream);
         }
 
-        if (count($responseArray)) {
+        if (! empty($responseArray)) {
             $response->content = implode("\n", $responseArray);
         }