dedalozzo / surfer

src/Surfer/Adapter/SocketAdapter.php

Indentation +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
   /**
    * @copydoc AbstractAdapter::__construct()
    * @param bool $persistent (optional) When `true` the client uses a persistent connection.
-  */
+   */
   public function __construct($server = parent::DEFAULT_SERVER, $userName = "", $password = "", $persistent = TRUE) {
     $this->initialize();
 

Braces +46 added lines, -32 removed lines

@@ -56,13 +56,15 @@ 
     $this->timeout = static::$defaultSocketTimeout;
 
     // Establishes a connection within the server.
-    if ($persistent)
-      $this->handle = @pfsockopen($this->scheme.$this->host, $this->port, $errno, $errstr, $this->timeout);
-    else
-      $this->handle = @fsockopen($this->scheme.$this->host, $this->port, $errno, $errstr, $this->timeout);
+    if ($persistent) {
+          $this->handle = @pfsockopen($this->scheme.$this->host, $this->port, $errno, $errstr, $this->timeout);
+    } else {
+          $this->handle = @fsockopen($this->scheme.$this->host, $this->port, $errno, $errstr, $this->timeout);
+    }
 
-    if (!is_resource($this->handle))
-      throw new \ErrorException($errstr, $errno);
+    if (!is_resource($this->handle)) {
+          throw new \ErrorException($errstr, $errno);
+    }
   }
 
 
@@ -123,8 +125,9 @@ 
       $statusCodeAndHeader .= $buffer;
 
       // The header is separated from the body by a newline, so we break when we read it.
-      if ($buffer == Message::CRLF)
-        break;
+      if ($buffer == Message::CRLF) {
+              break;
+      }
     }
 
     return $statusCodeAndHeader;
@@ -145,18 +148,21 @@ 
 
       // If it's only a newline, this normally means it's read the total amount of data requested minus the newline
       // continue to next loop to make sure we're done.
-      if ($line == Message::CRLF)
-        continue;
+      if ($line == Message::CRLF) {
+              continue;
+      }
 
       // The length of the block is expressed in hexadecimal.
       $length = hexdec($line);
 
-      if (!is_int($length))
-        throw new \RuntimeException("The response doesn't seem chunk encoded.");
+      if (!is_int($length)) {
+              throw new \RuntimeException("The response doesn't seem chunk encoded.");
+      }
 
       // Zero is sent when at the end of the chunks or the end of the stream.
-      if ($length < 1)
-        break;
+      if ($length < 1) {
+              break;
+      }
 
       // Reads the chunk.
       // When reading from network streams or pipes, such as those returned when reading remote files or from popen()
@@ -169,18 +175,21 @@ 
         $size = min(self::BUFFER_LENGTH, $length);
         $data = fread($this->handle, $size);
 
-        if (strlen($data) == 0)
-          break; // EOF
+        if (strlen($data) == 0) {
+                  break;
+        }
+        // EOF
 
         $buffer .= $data;
         $length -= strlen($data);
       }
 
       // If a function has been hooked, calls it, else just adds the buffer to the body.
-      if (is_null($chunkHook))
-        $body .= $buffer;
-      else
-        $chunkHook->process($buffer);
+      if (is_null($chunkHook)) {
+              $body .= $buffer;
+      } else {
+              $chunkHook->process($buffer);
+      }
     }
 
     // A chunk response might have some footer, but CouchDB doesn't use them, so we simply ignore them.
@@ -189,8 +198,9 @@ 
       $buffer = fgets($this->handle, self::BUFFER_LENGTH);
 
       // The chunk response ends with a newline, so we break when we read it.
-      if ($buffer == Message::CRLF)
-        break;
+      if ($buffer == Message::CRLF) {
+              break;
+      }
     }
 
     return $body;
@@ -217,8 +227,9 @@ 
         $body .= $buffer;
         $bytes += strlen($buffer);
 
-        if ($bytes >= $length)
-          break;
+        if ($bytes >= $length) {
+                  break;
+        }
       }
     }
 
@@ -233,10 +244,11 @@ 
    * @return string
    */
   protected function readResponseBody(Response $response, $chunkHook) {
-    if ($response->getHeaderFieldValue(Response::TRANSFER_ENCODING_HF) == "chunked")
-      return $this->readChunkedResponseBody($chunkHook);
-    else
-      return $this->readStandardResponseBody($response);
+    if ($response->getHeaderFieldValue(Response::TRANSFER_ENCODING_HF) == "chunked") {
+          return $this->readChunkedResponseBody($chunkHook);
+    } else {
+          return $this->readStandardResponseBody($response);
+    }
   }
 
 
@@ -246,12 +258,14 @@ 
   public function send(Request $request, IChunkHook $chunkHook = NULL) {
     $request->setHeaderField(Request::HOST_HF, $this->host.":".$this->port);
 
-    if (!empty($this->userName))
-      $request->setBasicAuth($this->userName, $this->password);
+    if (!empty($this->userName)) {
+          $request->setBasicAuth($this->userName, $this->password);
+    }
 
     // Sets the Content-Length header only when the given request has a message body.
-    if ($request->hasBody())
-      $request->setHeaderField(Message::CONTENT_LENGTH_HF, $request->getBodyLength());
+    if ($request->hasBody()) {
+          $request->setHeaderField(Message::CONTENT_LENGTH_HF, $request->getBodyLength());
+    }
 
     // Writes the request over the socket.
     $this->writeRequest($request);

src/Surfer/Adapter/CurlAdapter.php

Braces +12 added lines, -10 removed lines

@@ -52,8 +52,9 @@ 
    * @copydoc AbstractAdapter::initialize()
    */
   public function initialize() {
-    if (!extension_loaded("curl"))
-      throw new \RuntimeException("The cURL extension is not loaded.");
+    if (!extension_loaded("curl")) {
+          throw new \RuntimeException("The cURL extension is not loaded.");
+    }
   }
 
 
@@ -65,8 +66,9 @@ 
     $opts = [];
 
     // Resets all the cURL options. The curl_reset() function is available only since PHP 5.5.
-    if (function_exists('curl_reset'))
-      curl_reset($this->handle);
+    if (function_exists('curl_reset')) {
+          curl_reset($this->handle);
+    }
 
     // Sets the methods and its related options.
     switch ($request->getMethod()) {
@@ -101,9 +103,9 @@ 
 
             $opts[CURLOPT_INFILE] = $fd;
             $opts[CURLOPT_INFILESIZE] = $request->getBodyLength();
+          } else {
+                      throw new \RuntimeException("Cannot create the stream.");
           }
-          else
-            throw new \RuntimeException("Cannot create the stream.");
         }
 
         break;
@@ -144,8 +146,9 @@ 
     // This fix a known cURL bug: see http://the-stickman.com/web-development/php-and-curl-disabling-100-continue-header/
     // cURL sets the Expect header field automatically, ignoring the fact that a client may not need it for the specific
     // request.
-    if (!$request->hasHeaderField(Request::EXPECT_HF))
-      curl_setopt($this->handle, CURLOPT_HTTPHEADER, array("Expect:"));
+    if (!$request->hasHeaderField(Request::EXPECT_HF)) {
+          curl_setopt($this->handle, CURLOPT_HTTPHEADER, array("Expect:"));
+    }
 
     // Sets the request header.
     // Due to a stupid bug, using curl_setopt_array(), cURL doesn't override the Content-Type header field. So we must
@@ -177,8 +180,7 @@ 
       $response = new Response($header);
       $response->setBody($result);
       return $response;
-    }
-    else {
+    } else {
       $error = curl_error($this->handle);
       throw new \RuntimeException($error);
     }

src/Surfer/Message/Response.php

Braces +31 added lines, -24 removed lines

@@ -423,13 +423,15 @@ 
    */
   protected function parseStatusCode($rawMessage) {
     $matches = [];
-    if (preg_match('%HTTP/1\.[0-1] (\d\d\d) %', $rawMessage, $matches))
-      $this->statusCode = $matches[1];
-    else
-      throw new \UnexpectedValueException("HTTP Status Code undefined.");
+    if (preg_match('%HTTP/1\.[0-1] (\d\d\d) %', $rawMessage, $matches)) {
+          $this->statusCode = $matches[1];
+    } else {
+          throw new \UnexpectedValueException("HTTP Status Code undefined.");
+    }
 
-    if (!array_key_exists($this->statusCode, self::$supportedStatusCodes))
-      throw new \UnexpectedValueException("HTTP Status Code unknown.");
+    if (!array_key_exists($this->statusCode, self::$supportedStatusCodes)) {
+          throw new \UnexpectedValueException("HTTP Status Code unknown.");
+    }
   }
 
 
@@ -449,10 +451,11 @@ 
             },
             strtolower(trim($matches[1])));
 
-        if (isset($this->header[$matches[1]]))
-          $this->header[$matches[1]] = array($this->header[$matches[1]], $matches[2]);
-        else
-          $this->header[$matches[1]] = trim($matches[2]);
+        if (isset($this->header[$matches[1]])) {
+                  $this->header[$matches[1]] = array($this->header[$matches[1]], $matches[2]);
+        } else {
+                  $this->header[$matches[1]] = trim($matches[2]);
+        }
       }
     }
   }
@@ -463,11 +466,13 @@ 
    * @param string $rawMessage The raw message.
    */
   protected function parseStatusCodeAndHeader($rawMessage) {
-    if (!is_string($rawMessage))
-      throw new \InvalidArgumentException("\$rawMessage must be a string.");
+    if (!is_string($rawMessage)) {
+          throw new \InvalidArgumentException("\$rawMessage must be a string.");
+    }
 
-    if (empty($rawMessage))
-      throw new \UnexpectedValueException("\$rawMessage is null.");
+    if (empty($rawMessage)) {
+          throw new \UnexpectedValueException("\$rawMessage is null.");
+    }
 
     $this->parseStatusCode($rawMessage);
 
@@ -481,8 +486,9 @@ 
 
     $rawMessage = preg_split('/\r\n\r\n/', $rawMessage, 2);
 
-    if (empty($rawMessage))
-      throw new \RuntimeException("The server didn't return a valid Response for the Request.");
+    if (empty($rawMessage)) {
+          throw new \RuntimeException("The server didn't return a valid Response for the Request.");
+    }
 
     // $rawMessage[0] contains header fields.
     $this->parseHeaderFields($rawMessage[0]);
@@ -508,9 +514,9 @@ 
   public function setStatusCode($value) {
     if (array_key_exists($value, self::$supportedStatusCodes)) {
       $this->statusCode = $value;
+    } else {
+          throw new \UnexpectedValueException("Status Code $value is not supported.");
     }
-    else
-      throw new \UnexpectedValueException("Status Code $value is not supported.");
   }
 
 
@@ -529,12 +535,13 @@ 
    * @param string $description A description for the Status Code.
    */
   public static function addCustomStatusCode($code, $description) {
-    if (in_array($code, self::$supportedStatusCodes))
-      throw new \UnexpectedValueException("Status Code $code is supported and already exists.");
-    elseif (is_int($code) and $code > 0)
-      self::$supportedStatusCodes[$code] = $description;
-    else
-      throw new \InvalidArgumentException("\$code must be a positive integer.");
+    if (in_array($code, self::$supportedStatusCodes)) {
+          throw new \UnexpectedValueException("Status Code $code is supported and already exists.");
+    } elseif (is_int($code) and $code > 0) {
+          self::$supportedStatusCodes[$code] = $description;
+    } else {
+          throw new \InvalidArgumentException("\$code must be a positive integer.");
+    }
   }
 
 }
\ No newline at end of file

src/Surfer/Message/Message.php

Braces +26 added lines, -20 removed lines

@@ -205,8 +205,9 @@ 
    */
   public function getHeaderAsArray() {
     $wellformedHeader = [];
-    foreach ($this->header as $name => $value)
-      $wellformedHeader[] = $name.": ".$value;
+    foreach ($this->header as $name => $value) {
+          $wellformedHeader[] = $name.": ".$value;
+    }
 
     return $wellformedHeader;
   }
@@ -237,10 +238,11 @@ 
    * @return string
    */
   public function getHeaderFieldValue($name) {
-    if ($this->hasHeaderField($name))
-      return $this->header[$name];
-    else
-      return FALSE;
+    if ($this->hasHeaderField($name)) {
+          return $this->header[$name];
+    } else {
+          return FALSE;
+    }
   }
 
 
@@ -250,10 +252,11 @@ 
    * @param string $value The header field value.
    */
   public function setHeaderField($name, $value) {
-    if (array_key_exists($name, static::$supportedHeaderFields))
-      $this->header[$name] = $value;
-    else
-      throw new \Exception("$name header field is not supported.");
+    if (array_key_exists($name, static::$supportedHeaderFields)) {
+          $this->header[$name] = $value;
+    } else {
+          throw new \Exception("$name header field is not supported.");
+    }
   }
 
 
@@ -262,8 +265,9 @@ 
    * @param string $name The header field name.
    */
   public function removeHeaderField($name) {
-    if (array_key_exists($name, static::$supportedHeaderFields))
-      unset($this->header[$name]);
+    if (array_key_exists($name, static::$supportedHeaderFields)) {
+          unset($this->header[$name]);
+    }
   }
 
 
@@ -272,11 +276,12 @@ 
    * @param array $headerFields An associative array of header fields.
    */
   public function setMultipleHeaderFieldsAtOnce(array $headerFields) {
-    if (ArrayHelper::isAssociative($headerFields))
-      foreach ($headerFields as $name => $value)
+    if (ArrayHelper::isAssociative($headerFields)) {
+          foreach ($headerFields as $name => $value)
         $this->setHeaderField($name, $value);
-    else
-      throw new \Exception("\$headerFields must be an associative array.");
+    } else {
+          throw new \Exception("\$headerFields must be an associative array.");
+    }
   }
 
 
@@ -285,10 +290,11 @@ 
    * @param string $name Header field name.
    */
   public static function addCustomHeaderField($name) {
-    if (array_key_exists($name, static::$supportedHeaderFields))
-      throw new \Exception("$name header field is supported but already exists.");
-    else
-      static::$supportedHeaderFields[] = $name;
+    if (array_key_exists($name, static::$supportedHeaderFields)) {
+          throw new \Exception("$name header field is supported but already exists.");
+    } else {
+          static::$supportedHeaderFields[] = $name;
+    }
   }
 
 

src/Surfer/Message/Request.php

Spacing +4 added lines, -4 removed lines

@@ -189,9 +189,9 @@ 
    */
   const X_FORWARDED_FOR_HF = "X-Forwarded-For";
 
-  const DESTINATION_HF = "Destination";  //!< This header field is not supported by HTTP 1.1. It's a special header field used by CouchDB.
-  const X_COUCHDB_WWW_AUTHENTICATE_HF = "X-CouchDB-WWW-Authenticate";  //!< This header field is not supported by HTTP 1.1. It's a special method header field by CouchDB.
-  const X_COUCHDB_FULL_COMMIT_HF = "X-Couch-Full-Commit";  //!< This header field is not supported by HTTP 1.1. It's a special header field used by CouchDB.
+  const DESTINATION_HF = "Destination"; //!< This header field is not supported by HTTP 1.1. It's a special header field used by CouchDB.
+  const X_COUCHDB_WWW_AUTHENTICATE_HF = "X-CouchDB-WWW-Authenticate"; //!< This header field is not supported by HTTP 1.1. It's a special method header field by CouchDB.
+  const X_COUCHDB_FULL_COMMIT_HF = "X-Couch-Full-Commit"; //!< This header field is not supported by HTTP 1.1. It's a special header field used by CouchDB.
 
   //!@}
 
@@ -408,7 +408,7 @@ 
       $params = explode('&', $query);
 
       foreach ($params as $param) {
-        @list($name, $value)  = explode('=', $param, 2);
+        @list($name, $value) = explode('=', $param, 2);
         $this->setQueryParam($name, $value);
       }
     }

Braces +36 added lines, -28 removed lines

@@ -281,11 +281,13 @@ 
     $this->setMethod($method);
     $this->setPath($path);
 
-    if (isset($queryParams))
-      $this->setMultipleQueryParamsAtOnce($queryParams);
+    if (isset($queryParams)) {
+          $this->setMultipleQueryParamsAtOnce($queryParams);
+    }
 
-    if (isset($headerFields))
-      $this->setMultipleHeaderFieldsAtOnce($headerFields);
+    if (isset($headerFields)) {
+          $this->setMultipleHeaderFieldsAtOnce($headerFields);
+    }
   }
 
 
@@ -318,10 +320,11 @@ 
    * @param string $method The HTTP method for the request. You should use one of the public constants, like GET_METHOD.
    */
   public function setMethod($method) {
-    if (array_key_exists($method, self::$supportedMethods))
-      $this->method = $method;
-    else
-      throw new \UnexpectedValueException("$method method not supported. Use addCustomMethod() to add an unsupported method.");
+    if (array_key_exists($method, self::$supportedMethods)) {
+          $this->method = $method;
+    } else {
+          throw new \UnexpectedValueException("$method method not supported. Use addCustomMethod() to add an unsupported method.");
+    }
   }
 
 
@@ -330,10 +333,11 @@ 
    * @param string $method The HTTP custom method.
    */
   public static function addCustomMethod($method) {
-    if (array_key_exists($method, self::$supportedMethods))
-      throw new \UnexpectedValueException("$method method is supported and already exists.");
-    else
-      self::$supportedMethods[] = $method;
+    if (array_key_exists($method, self::$supportedMethods)) {
+          throw new \UnexpectedValueException("$method method is supported and already exists.");
+    } else {
+          self::$supportedMethods[] = $method;
+    }
   }
 
 
@@ -351,10 +355,11 @@ 
    * @param string $path The absolute path of the request.
    */
   public function setPath($path) {
-    if (is_string($path))
-      $this->path = addslashes($path);
-    else
-      throw new \InvalidArgumentException("\$path must be a string.");
+    if (is_string($path)) {
+          $this->path = addslashes($path);
+    } else {
+          throw new \InvalidArgumentException("\$path must be a string.");
+    }
   }
 
 
@@ -364,11 +369,12 @@ 
    * @param string $value Parameter value.
    */
   public function setQueryParam($name, $value) {
-    if (preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $name))
-      $this->queryParams[$name] = $value;
-    else
-      throw new \InvalidArgumentException("\$name must start with a letter or underscore, followed by any number of
+    if (preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $name)) {
+          $this->queryParams[$name] = $value;
+    } else {
+          throw new \InvalidArgumentException("\$name must start with a letter or underscore, followed by any number of
           letters, numbers, or underscores.");
+    }
   }
 
 
@@ -377,11 +383,12 @@ 
    * @param array $params An associative array of parameters.
    */
   public function setMultipleQueryParamsAtOnce(array $params) {
-    if (ArrayHelper::isAssociative($params))
-      foreach ($params as $name => $value)
+    if (ArrayHelper::isAssociative($params)) {
+          foreach ($params as $name => $value)
         $this->setQueryParam($name, $value);
-    else
-      throw new \InvalidArgumentException("\$params must be an associative array.");
+    } else {
+          throw new \InvalidArgumentException("\$params must be an associative array.");
+    }
   }
 
 
@@ -390,11 +397,12 @@ 
    * @retval string
    */
   public function getQueryString() {
-    if (empty($this->queryParams))
-      return "";
-    else
-      // Encoding is based on RFC 3986.
+    if (empty($this->queryParams)) {
+          return "";
+    } else {
+          // Encoding is based on RFC 3986.
       return "?".http_build_query($this->queryParams, NULL, "&", PHP_QUERY_RFC3986);
+    }
   }
 
 

src/Surfer/Adapter/AbstractAdapter.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
     if (preg_match(self::SCHEME_HOST_PORT_URI, $server, $matches)) {
       $this->scheme = isset($matches['scheme']) ? $matches['scheme'] : "tcp://";
       $this->host = isset($matches['host']) ? $matches['host'] : self::DEFAULT_HOST;
-      $this->port = isset($matches['port']) ? (int) substr($matches['port'], 1) : self::$defaultPorts[$this->scheme];
+      $this->port = isset($matches['port']) ? (int)substr($matches['port'], 1) : self::$defaultPorts[$this->scheme];
     }
     else // Match attempt failed.
       throw new \InvalidArgumentException(sprintf("'%s' is not a valid URI.", $server));

Braces +3 added lines, -2 removed lines

@@ -77,9 +77,10 @@
       $this->scheme = isset($matches['scheme']) ? $matches['scheme'] : "tcp://";
       $this->host = isset($matches['host']) ? $matches['host'] : self::DEFAULT_HOST;
       $this->port = isset($matches['port']) ? (int) substr($matches['port'], 1) : self::$defaultPorts[$this->scheme];
-    }
-    else // Match attempt failed.
+    } else {
+      // Match attempt failed.
       throw new \InvalidArgumentException(sprintf("'%s' is not a valid URI.", $server));
+    }
 
     $this->userName = (string)$userName;
     $this->password = (string)$password;