dedalozzo / eoc-client

src/EoC/Opt/DocOpts.php

Braces +5 added lines, -4 removed lines

@@ -143,10 +143,11 @@
    * @param[in] string|array $revs The revision(s) identifier(s).
    */
   public function includeOpenRevs($revs = 'all') {
-    if (is_array($revs))
-      $this->options['open_revs'] = json_encode($revs);
-    else
-      $this->options['open_revs'] = 'all';
+    if (is_array($revs)) {
+          $this->options['open_revs'] = json_encode($revs);
+    } else {
+          $this->options['open_revs'] = 'all';
+    }
 
     return $this;
   }

src/EoC/Message/Request.php

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[in] 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[in] 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[in] 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[in] 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[in] array $params An associative array of parameters.
    */
   public function setMultipleQueryParamsAtOnce(array $params) {
-    if (Helper\ArrayHelper::isAssociative($params))
-      foreach ($params as $name => $value)
+    if (Helper\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/EoC/Message/Message.php

Braces +26 added lines, -20 removed lines

@@ -206,8 +206,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;
   }
@@ -238,10 +239,11 @@ 
    * @retval 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;
+    }
   }
 
 
@@ -251,10 +253,11 @@ 
    * @param[in] 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.");
+    }
   }
 
 
@@ -263,8 +266,9 @@ 
    * @param[in] 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]);
+    }
   }
 
 
@@ -273,11 +277,12 @@ 
    * @param[in] array $headerFields An associative array of header fields.
    */
   public function setMultipleHeaderFieldsAtOnce(array $headerFields) {
-    if (Helper\ArrayHelper::isAssociative($headerFields))
-      foreach ($headerFields as $name => $value)
+    if (Helper\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.");
+    }
   }
 
 
@@ -286,10 +291,11 @@ 
    * @param[in] 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/EoC/Adapter/AbstractAdapter.php

Braces +3 added lines, -2 removed lines

@@ -68,9 +68,10 @@
       $this->scheme = isset($matches['scheme']) ? $matches['scheme'] : "tcp://";
       $this->host = isset($matches['host']) ? $matches['host'] : self::DEFAULT_HOST;
       $this->port = isset($matches['port']) ? substr($matches['port'], 1) : self::DEFAULT_PORT;
-    }
-    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;

src/EoC/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.");
+    }
   }
 
 
@@ -64,8 +65,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()) {
@@ -100,9 +102,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;
@@ -143,8 +145,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
@@ -176,8 +179,7 @@ 
       $response = new Response($header);
       $response->setBody($result);
       return $response;
-    }
-    else {
+    } else {
       $error = curl_error($this->handle);
       throw new \RuntimeException($error);
     }

src/EoC/Handler/ViewHandler.php

Braces +18 added lines, -12 removed lines

@@ -144,8 +144,9 @@ 
   public static function checkFn($fnImpl, $fnDef, $fnRegex) {
     Lint::checkSourceCode($fnImpl);
 
-    if (!preg_match($fnRegex, $fnImpl))
-      throw new \Exception("The \$closure must be defined like: $fnDef");
+    if (!preg_match($fnRegex, $fnImpl)) {
+          throw new \Exception("The \$closure must be defined like: $fnDef");
+    }
   }
 
 
@@ -153,14 +154,17 @@ 
     $view = [];
     $view['map'] = $this->mapFn;
 
-    if (!empty($this->language))
-      $view['language'] = $this->language;
+    if (!empty($this->language)) {
+          $view['language'] = $this->language;
+    }
 
-    if (!empty($this->reduceFn))
-      $view['reduce'] = $this->reduceFn;
+    if (!empty($this->reduceFn)) {
+          $view['reduce'] = $this->reduceFn;
+    }
 
-    if (!empty($this->options))
-      $view['options'] = $this->options;
+    if (!empty($this->options)) {
+          $view['options'] = $this->options;
+    }
 
     return $view;
   }
@@ -225,8 +229,9 @@ 
   public function setMapFn($value) {
     $fn = stripslashes((string)$value);
 
-    if ($this->language == "php")
-      self::checkFn($fn, self::MAP_DEFINITION, self::MAP_REGEX);
+    if ($this->language == "php") {
+          self::checkFn($fn, self::MAP_DEFINITION, self::MAP_REGEX);
+    }
 
     $this->mapFn = $fn;
   }
@@ -240,8 +245,9 @@ 
   public function setReduceFn($value) {
     $fn = stripslashes((string)$value);
 
-    if ($this->language == "php")
-      self::checkFn($fn, self::REDUCE_DEFINITION, self::REDUCE_REGEX);
+    if ($this->language == "php") {
+          self::checkFn($fn, self::REDUCE_DEFINITION, self::REDUCE_REGEX);
+    }
 
     $this->reduceFn = $fn;
   }

src/EoC/Couch.php

Braces +182 added lines, -134 removed lines

@@ -107,10 +107,13 @@ 
       foreach ($keys as $key) {
         $hash = md5(json_encode($key));
 
-        if (isset($matches[$hash])) // Match found.
+        if (isset($matches[$hash])) {
+          // Match found.
           $allRows[] = $matches[$hash];
-        else // No match found.
+        } else {
+          // No match found.
           $allRows[] = ['id' => NULL, 'key' => $key, 'value' => NULL];
+        }
       }
 
       // Overrides the response, replacing rows.
@@ -190,15 +193,18 @@ 
    * @param[in] bool $excludeLocal Document path.
    */
   public function validateDocPath($path, $excludeLocal = FALSE) {
-    if (empty($path)) // STD_DOC_PATH
+    if (empty($path)) {
+      // STD_DOC_PATH
       return;
+    }
 
-    if ($path == self::DESIGN_DOC_PATH)
-      return;
-    elseif ($path == self::LOCAL_DOC_PATH && $excludeLocal)
-      throw new \InvalidArgumentException("Local document doesn't have attachments.");
-    else
-      throw new \InvalidArgumentException("Invalid document path.");
+    if ($path == self::DESIGN_DOC_PATH) {
+          return;
+    } elseif ($path == self::LOCAL_DOC_PATH && $excludeLocal) {
+          throw new \InvalidArgumentException("Local document doesn't have attachments.");
+    } else {
+          throw new \InvalidArgumentException("Invalid document path.");
+    }
   }
 
 
@@ -209,10 +215,11 @@ 
    * @param string $docId Document id.
    */
   public function validateAndEncodeDocId(&$docId) {
-    if (!empty($docId))
-      $docId = rawurlencode($docId);
-    else
-      throw new \InvalidArgumentException("\$docId must be a non-empty string.");
+    if (!empty($docId)) {
+          $docId = rawurlencode($docId);
+    } else {
+          throw new \InvalidArgumentException("\$docId must be a non-empty string.");
+    }
   }
 
   //!@}
@@ -244,10 +251,10 @@ 
     // before the client has received the entire response. To avoid problems, we trap the exception and we go on.
     try {
       $this->send($request);
-    }
-    catch (\Exception $e) {
-      if ($e->getCode() > 0)
-        throw $e;
+    } catch (\Exception $e) {
+      if ($e->getCode() > 0) {
+              throw $e;
+      }
     }
   }
 
@@ -284,10 +291,11 @@ 
   public function getFavicon() {
     $response = $this->send(new Request(Request::GET_METHOD, "/favicon.ico"));
 
-    if ($response->getHeaderFieldValue(Request::CONTENT_TYPE_HF) == "image/x-icon")
-      return $response->getBody();
-    else
-      throw new \InvalidArgumentException("Content-Type must be image/x-icon.");
+    if ($response->getHeaderFieldValue(Request::CONTENT_TYPE_HF) == "image/x-icon") {
+          return $response->getBody();
+    } else {
+          throw new \InvalidArgumentException("Content-Type must be image/x-icon.");
+    }
   }
 
 
@@ -321,8 +329,9 @@ 
   public function getDbUpdates(Opt\DbUpdatesFeedOpts $opts = NULL) {
     $request = new Request(Request::GET_METHOD, "/_db_updates");
 
-    if (isset($opts))
-      $request->setMultipleQueryParamsAtOnce($opts->asArray());
+    if (isset($opts)) {
+          $request->setMultipleQueryParamsAtOnce($opts->asArray());
+    }
 
     return $this->send($request)->getBodyAsArray();
   }
@@ -351,9 +360,9 @@ 
       $request = new Request(Request::GET_METHOD, "/_log");
       $request->setQueryParam("bytes", $bytes);
       return $this->send($request)->getBody();
+    } else {
+          throw new \InvalidArgumentException("\$bytes must be a positive integer.");
     }
-    else
-      throw new \InvalidArgumentException("\$bytes must be a positive integer.");
   }
 
 
@@ -370,13 +379,15 @@ 
 
       $response = $this->send($request);
 
-      if ($count == 1) // We don't need to use === operator because, just above, we made a type checking.
+      if ($count == 1) {
+        // We don't need to use === operator because, just above, we made a type checking.
         return $response->getBodyAsArray()['uuids'][0];
-      else
-        return $response->getBodyAsArray()['uuids'];
+      } else {
+              return $response->getBodyAsArray()['uuids'];
+      }
+    } else {
+          throw new \InvalidArgumentException("\$count must be a positive integer.");
     }
-    else
-      throw new \InvalidArgumentException("\$count must be a positive integer.");
   }
 
   //!@}
@@ -400,8 +411,9 @@ 
     if (!empty($section)) {
       $path .= "/".$section;
 
-      if (!empty($key))
-        $path .= "/".$key;
+      if (!empty($key)) {
+              $path .= "/".$key;
+      }
     }
 
     return $this->send(new Request(Request::GET_METHOD, $path))->getBodyAsArray();
@@ -416,14 +428,17 @@ 
    * @see http://docs.couchdb.org/en/latest/api/server/configuration.html#put--_config-section-key
    */
   public function setConfigKey($section, $key, $value) {
-    if (!is_string($section) or empty($section))
-      throw new \InvalidArgumentException("\$section must be a not empty string.");
+    if (!is_string($section) or empty($section)) {
+          throw new \InvalidArgumentException("\$section must be a not empty string.");
+    }
 
-    if (!is_string($key) or empty($key))
-      throw new \InvalidArgumentException("\$key must be a not empty string.");
+    if (!is_string($key) or empty($key)) {
+          throw new \InvalidArgumentException("\$key must be a not empty string.");
+    }
 
-    if (is_null($value))
-      throw new \InvalidArgumentException("\$value cannot be null.");
+    if (is_null($value)) {
+          throw new \InvalidArgumentException("\$value cannot be null.");
+    }
 
     $request = new Request(Request::PUT_METHOD, "/_config/".$section."/".$key);
     $request->setHeaderField(Request::CONTENT_TYPE_HF, "application/json");
@@ -439,11 +454,13 @@ 
    * @see http://docs.couchdb.org/en/latest/api/configuration.html#delete-config-section-key
    */
   public function deleteConfigKey($section, $key) {
-    if (!is_string($section) or empty($section))
-      throw new \InvalidArgumentException("\$section must be a not empty string.");
+    if (!is_string($section) or empty($section)) {
+          throw new \InvalidArgumentException("\$section must be a not empty string.");
+    }
 
-    if (!is_string($key) or empty($key))
-      throw new \InvalidArgumentException("\$key must be a not empty string.");
+    if (!is_string($key) or empty($key)) {
+          throw new \InvalidArgumentException("\$key must be a not empty string.");
+    }
 
     $this->send(new Request(Request::DELETE_METHOD, "/_config/".$section."/".$key));
   }
@@ -470,11 +487,13 @@ 
    * @see http://docs.couchdb.org/en/latest/api/server/authn.html#post--_session
    */
   public function setSession($userName, $password) {
-    if (!is_string($userName) or empty($userName))
-      throw new \InvalidArgumentException("\$userName must be a not empty string.");
+    if (!is_string($userName) or empty($userName)) {
+          throw new \InvalidArgumentException("\$userName must be a not empty string.");
+    }
 
-    if (!is_string($password) or empty($password))
-      throw new \InvalidArgumentException("\$password must be a not empty string.");
+    if (!is_string($password) or empty($password)) {
+          throw new \InvalidArgumentException("\$password must be a not empty string.");
+    }
 
     $request = new Request(Request::POST_METHOD, "/_session");
 
@@ -561,8 +580,9 @@ 
     #    One of the characters “_$()” «_$()»
     #    A character in the range between “+” and “/” «+-/»
     # Assert position at the very end of the string «\z»
-    if (preg_match('%\A[a-z][a-z\d_$()+-/]++\z%', $name) === FALSE)
-      throw new \InvalidArgumentException("Invalid database name.");
+    if (preg_match('%\A[a-z][a-z\d_$()+-/]++\z%', $name) === FALSE) {
+          throw new \InvalidArgumentException("Invalid database name.");
+    }
 
     $this->send(new Request(Request::PUT_METHOD, "/".rawurlencode($this->prefix.$name)."/"));
   }
@@ -600,8 +620,9 @@ 
   public function getDbChanges($name, Opt\ChangesFeedOpts $opts = NULL) {
     $request = new Request(Request::GET_METHOD, "/".rawurlencode($this->prefix.$name)."/_changes");
 
-    if (isset($opts))
-      $request->setMultipleQueryParamsAtOnce($opts->asArray());
+    if (isset($opts)) {
+          $request->setMultipleQueryParamsAtOnce($opts->asArray());
+    }
 
     return $this->send($request);
   }
@@ -790,40 +811,47 @@ 
       is_string($targetDbUrl) && !empty($targetDbUrl)) {
       $body["source"] = $sourceDbUrl;
       $body["target"] = $targetDbUrl;
+    } else {
+          throw new \InvalidArgumentException("\$source_db_url and \$target_db_url must be non-empty strings.");
     }
-    else
-      throw new \InvalidArgumentException("\$source_db_url and \$target_db_url must be non-empty strings.");
 
-    if (!is_bool($continuous))
-      throw new \InvalidArgumentException("\$continuous must be a bool.");
-    elseif ($continuous)
-      $body["continuous"] = $continuous;
+    if (!is_bool($continuous)) {
+          throw new \InvalidArgumentException("\$continuous must be a bool.");
+    } elseif ($continuous) {
+          $body["continuous"] = $continuous;
+    }
 
     // Uses the specified proxy if any set.
-    if (isset($proxy))
-      $body["proxy"] = $proxy;
+    if (isset($proxy)) {
+          $body["proxy"] = $proxy;
+    }
 
     // create_target option
-    if (!is_bool($createTargetDb))
-      throw new \InvalidArgumentException("\$createTargetDb must be a bool.");
-    elseif ($createTargetDb)
-      $body["create_target"] = $createTargetDb;
+    if (!is_bool($createTargetDb)) {
+          throw new \InvalidArgumentException("\$createTargetDb must be a bool.");
+    } elseif ($createTargetDb) {
+          $body["create_target"] = $createTargetDb;
+    }
 
     if (!empty($filter)) {
-      if (is_string($filter)) // filter option
+      if (is_string($filter)) {
+        // filter option
         $body["filter"] = $filter;
-      elseif (is_array($filter)) // doc_ids option
+      } elseif (is_array($filter)) {
+        // doc_ids option
         $body["doc_ids"] = array_values($filter);
-      else
-        throw new \InvalidArgumentException("\$filter must be a string or an array.");
+      } else {
+              throw new \InvalidArgumentException("\$filter must be a string or an array.");
+      }
     }
 
     // queryParams option
     if (!is_null($opts)) {
-      if ($opts instanceof Opt\ViewQueryOpts)
-        $body["query_params"] = get_object_vars($opts);
-      else
-        throw new \InvalidArgumentException("\$queryParams must be an instance of ViewQueryOpts class.");
+      if ($opts instanceof Opt\ViewQueryOpts) {
+              $body["query_params"] = get_object_vars($opts);
+      } else {
+              throw new \InvalidArgumentException("\$queryParams must be an instance of ViewQueryOpts class.");
+      }
     }
 
     $request = new Request(Request::POST_METHOD, "/_replicate");
@@ -840,8 +868,9 @@ 
    * @see http://docs.couchdb.org/en/latest/api/server/common.html#canceling-continuous-replication
    */
   public function stopReplication($replicationId) {
-    if (is_null($replicationId))
-      throw new \InvalidArgumentException("You must provide a replication id.");
+    if (is_null($replicationId)) {
+          throw new \InvalidArgumentException("You must provide a replication id.");
+    }
 
     $body["replication_id"] = $replicationId;
     $body["cancel"] = TRUE;
@@ -890,15 +919,16 @@ 
    * @see http://docs.couchdb.org/en/latest/api/database/bulk-api.html#post--db-_all_docs
    */
   public function queryAllDocs($dbName, array $keys = NULL, Opt\ViewQueryOpts $opts = NULL, Hook\IChunkHook $chunkHook = NULL) {
-    if (is_null($keys))
-      $request = new Request(Request::GET_METHOD, "/".rawurlencode($this->prefix.$dbName)."/_all_docs");
-    else {
+    if (is_null($keys)) {
+          $request = new Request(Request::GET_METHOD, "/".rawurlencode($this->prefix.$dbName)."/_all_docs");
+    } else {
       $request = new Request(Request::POST_METHOD, "/".rawurlencode($this->prefix.$dbName)."/_all_docs");
       $request->setBody(json_encode(['keys' => $keys]));
     }
 
-    if (isset($opts))
-      $request->setMultipleQueryParamsAtOnce($opts->asArray());
+    if (isset($opts)) {
+          $request->setMultipleQueryParamsAtOnce($opts->asArray());
+    }
 
     $result = $this->send($request, $chunkHook)->getBodyAsArray();
 
@@ -927,12 +957,13 @@ 
   public function queryView($dbName, $designDocName, $viewName, array $keys = NULL, Opt\ViewQueryOpts $opts = NULL, Hook\IChunkHook $chunkHook = NULL) {
     $this->validateAndEncodeDocId($designDocName);
 
-    if (empty($viewName))
-      throw new \InvalidArgumentException("You must provide a valid \$viewName.");
+    if (empty($viewName)) {
+          throw new \InvalidArgumentException("You must provide a valid \$viewName.");
+    }
 
-    if (empty($keys))
-      $request = new Request(Request::GET_METHOD, "/".rawurlencode($this->prefix.$dbName)."/_design/".$designDocName."/_view/".$viewName);
-    else {
+    if (empty($keys)) {
+          $request = new Request(Request::GET_METHOD, "/".rawurlencode($this->prefix.$dbName)."/_design/".$designDocName."/_view/".$viewName);
+    } else {
       $request = new Request(Request::POST_METHOD, "/".rawurlencode($this->prefix.$dbName)."/_design/".$designDocName."/_view/".$viewName);
       $request->setBody(json_encode(['keys' => $keys]));
     }
@@ -940,14 +971,15 @@ 
     if (isset($opts)) {
       $request->setMultipleQueryParamsAtOnce($opts->asArray());
       $includeMissingKeys = $opts->issetIncludeMissingKeys();
+    } else {
+          $includeMissingKeys = FALSE;
     }
-    else
-      $includeMissingKeys = FALSE;
 
     $result = $this->send($request, $chunkHook)->getBodyAsArray();
 
-    if ($includeMissingKeys)
-      $this->addMissingRows($keys, $result['rows']);
+    if ($includeMissingKeys) {
+          $this->addMissingRows($keys, $result['rows']);
+    }
 
     return new Result\QueryResult($result);
   }
@@ -974,30 +1006,33 @@ 
     $handler = new Handler\ViewHandler('temp');
     $handler->language = $language;
     $handler->mapFn = $mapFn;
-    if (!empty($reduce))
-      $handler->reduceFn = $reduceFn;
+    if (!empty($reduce)) {
+          $handler->reduceFn = $reduceFn;
+    }
 
     $request = new Request(Request::POST_METHOD, "/".rawurlencode($this->prefix.$dbName)."/_temp_view");
     $request->setHeaderField(Request::CONTENT_TYPE_HF, "application/json");
 
     $array = $handler->asArray();
 
-    if (!empty($keys))
-      $array['keys'] = $keys;
+    if (!empty($keys)) {
+          $array['keys'] = $keys;
+    }
 
     $request->setBody(json_encode($array));
 
     if (isset($opts)) {
       $request->setMultipleQueryParamsAtOnce($opts->asArray());
       $includeMissingKeys = $opts->issetIncludeMissingKeys();
+    } else {
+          $includeMissingKeys = FALSE;
     }
-    else
-      $includeMissingKeys = FALSE;
 
     $result = $this->send($request, $chunkHook)->getBodyAsArray();
 
-    if ($includeMissingKeys)
-      $this->addMissingRows($keys, $result['rows']);
+    if ($includeMissingKeys) {
+          $this->addMissingRows($keys, $result['rows']);
+    }
 
     return new Result\QueryResult($result);
   }
@@ -1056,8 +1091,9 @@ 
    * @see http://docs.couchdb.org/en/latest/api/database/misc.html#put--db-_revs_limit
    */
   public function setRevsLimit($dbName, $revsLimit = self::REVS_LIMIT) {
-    if (!is_int($revsLimit) or ($revsLimit <= 0))
-      throw new \InvalidArgumentException("\$revsLimit must be a positive integer.");
+    if (!is_int($revsLimit) or ($revsLimit <= 0)) {
+          throw new \InvalidArgumentException("\$revsLimit must be a positive integer.");
+    }
 
     $request = new Request(Request::PUT_METHOD, "/".rawurlencode($this->prefix.$dbName)."/_revs_limit");
     $request->setHeaderField(Request::CONTENT_TYPE_HF, "application/json");
@@ -1115,16 +1151,17 @@ 
     $request = new Request(Request::GET_METHOD, $requestPath);
 
     // Retrieves the specific revision of the document.
-    if (!empty($rev))
-      $request->setQueryParam("rev", (string)$rev);
+    if (!empty($rev)) {
+          $request->setQueryParam("rev", (string)$rev);
+    }
 
     // If there are any options, add them to the request.
     if (isset($opts)) {
       $request->setMultipleQueryParamsAtOnce($opts->asArray());
       $ignoreClass = $opts->issetIgnoreClass();
+    } else {
+          $ignoreClass = FALSE;
     }
-    else
-      $ignoreClass = FALSE;
 
     $response = $this->send($request);
     $body = $response->getBodyAsArray();
@@ -1136,18 +1173,18 @@ 
     if (!$ignoreClass && isset($body['class'])) { // Special document class inherited from Doc or LocalDoc.
       $class = "\\".$body['class'];
       $doc = new $class;
+    } elseif ($path == self::DESIGN_DOC_PATH) {
+          $doc = new Doc\DesignDoc;
+    } else {
+          $doc = NULL;
     }
-    elseif ($path == self::DESIGN_DOC_PATH)
-      $doc = new Doc\DesignDoc;
-    else
-      $doc = NULL;
 
     if (is_object($doc)) {
       $doc->assignArray($body);
       return $doc;
+    } else {
+          return $response;
     }
-    else
-      return $response;
   }
 
 
@@ -1167,8 +1204,9 @@ 
   public function saveDoc($dbName, Doc\IDoc $doc, $batchMode = FALSE) {
     // Whether the document has an id we use a different HTTP method. Using POST CouchDB generates an id for the doc
     // using PUT we need to specify one. We can still use the function getUuids() to ask CouchDB for some ids.
-    if (!$doc->issetId())
-      $doc->setId(Generator\UUID::generate(Generator\UUID::UUID_RANDOM, Generator\UUID::FMT_STRING));
+    if (!$doc->issetId()) {
+          $doc->setId(Generator\UUID::generate(Generator\UUID::UUID_RANDOM, Generator\UUID::FMT_STRING));
+    }
 
     $this->setDocInfo($doc);
 
@@ -1182,8 +1220,9 @@ 
     $request->setBody($doc->asJson());
 
     // Enables batch mode.
-    if ($batchMode)
-      $request->setQueryParam("batch", "ok");
+    if ($batchMode) {
+          $request->setQueryParam("batch", "ok");
+    }
 
     $this->send($request);
   }
@@ -1236,10 +1275,11 @@ 
     // This request uses the special method COPY.
     $request = new Request(Request::COPY_METHOD, $path);
 
-    if (empty($rev))
-      $request->setHeaderField(Request::DESTINATION_HF, $targetDocId);
-    else
-      $request->setHeaderField(Request::DESTINATION_HF, $targetDocId."?rev=".(string)$rev);
+    if (empty($rev)) {
+          $request->setHeaderField(Request::DESTINATION_HF, $targetDocId);
+    } else {
+          $request->setHeaderField(Request::DESTINATION_HF, $targetDocId."?rev=".(string)$rev);
+    }
 
     $this->send($request);
   }
@@ -1268,8 +1308,9 @@ 
     $request = new Request(Request::POST_METHOD, $path);
 
     $purge = [];
-    foreach ($refs as $ref)
-      $purge[] = $ref->asArray();
+    foreach ($refs as $ref) {
+          $purge[] = $ref->asArray();
+    }
 
     $request->setBody(json_encode($purge));
 
@@ -1301,26 +1342,30 @@ 
    * @see http://wiki.apache.org/couchdb/HTTP_Bulk_Document_API
    */
   public function performBulkOperations($dbName, array $docs, $fullCommit = FALSE, $allOrNothing = FALSE, $newEdits = TRUE) {
-    if (count($docs) == 0)
-      throw new \InvalidArgumentException("The \$docs array cannot be empty.");
-    else
-      $operations = [];
+    if (count($docs) == 0) {
+          throw new \InvalidArgumentException("The \$docs array cannot be empty.");
+    } else {
+          $operations = [];
+    }
 
     $path = "/".rawurlencode($this->prefix.$dbName)."/_bulk_docs";
 
     $request = new Request(Request::POST_METHOD, $path);
     $request->setHeaderField(Request::CONTENT_TYPE_HF, "application/json");
 
-    if ($fullCommit)
-      $request->setHeaderField(Request::X_COUCHDB_FULL_COMMIT_HF, "full_commit");
-    else
-      $request->setHeaderField(Request::X_COUCHDB_FULL_COMMIT_HF, "delay_commit");
+    if ($fullCommit) {
+          $request->setHeaderField(Request::X_COUCHDB_FULL_COMMIT_HF, "full_commit");
+    } else {
+          $request->setHeaderField(Request::X_COUCHDB_FULL_COMMIT_HF, "delay_commit");
+    }
 
-    if ($allOrNothing)
-      $operations['all_or_nothing'] = 'true';
+    if ($allOrNothing) {
+          $operations['all_or_nothing'] = 'true';
+    }
 
-    if (!$newEdits)
-      $operations['new_edits'] = 'false';
+    if (!$newEdits) {
+          $operations['new_edits'] = 'false';
+    }
 
     foreach ($docs as $doc) {
       $this->setDocInfo($doc);
@@ -1358,8 +1403,9 @@ 
     $request = new Request(Request::HEAD_METHOD, $path);
 
     // In case we want retrieve a specific document revision.
-    if (!empty($rev))
-      $request->setQueryParam("rev", (string)$rev);
+    if (!empty($rev)) {
+          $request->setQueryParam("rev", (string)$rev);
+    }
 
     return $this->send($request);
   }
@@ -1385,8 +1431,9 @@ 
     $request = new Request(Request::GET_METHOD, $path);
 
     // In case we want retrieve a specific document revision.
-    if (!empty($rev))
-      $request->setQueryParam("rev", (string)$rev);
+    if (!empty($rev)) {
+          $request->setQueryParam("rev", (string)$rev);
+    }
 
     return $this->send($request)->getBody();
   }
@@ -1415,8 +1462,9 @@ 
     $request->setBody(base64_encode($attachment->getData()));
 
     // In case of adding or updating an existence document.
-    if (!empty($rev))
-      $request->setQueryParam("rev", (string)$rev);
+    if (!empty($rev)) {
+          $request->setQueryParam("rev", (string)$rev);
+    }
 
     return $this->send($request);
   }

src/EoC/Opt/ViewQueryOpts.php

Braces +15 added lines, -12 removed lines

@@ -36,8 +36,9 @@ 
    * @attention Chainable.
    */
   public function unsetOpt($name) {
-    if (array_key_exists($name, $this->options))
-      unset($this->options['name']);
+    if (array_key_exists($name, $this->options)) {
+          unset($this->options['name']);
+    }
 
     return $this;
   }
@@ -137,10 +138,11 @@ 
    * @attention Chainable.
    */
   public function setLimit($value) {
-    if (is_int($value) && $value >= 0)
-      $this->options["limit"] = $value;
-    else
-      throw new \Exception("\$value must be a non-negative integer.");
+    if (is_int($value) && $value >= 0) {
+          $this->options["limit"] = $value;
+    } else {
+          throw new \Exception("\$value must be a non-negative integer.");
+    }
 
     return $this;
   }
@@ -173,9 +175,9 @@ 
     if (is_int($value) && $value > 0) {
       $this->options["group"] = "false"; // This parameter is used only if 'group' is 'false'.
       $this->options["group_level"] = $value;
+    } else {
+          throw new \Exception("\$value must be a positive integer.");
     }
-    else
-      throw new \Exception("\$value must be a positive integer.");
 
     return $this;
   }
@@ -311,10 +313,11 @@ 
    * @attention Chainable.
    */
   public function skipDocs($number) {
-    if (is_int($number) && $number > 0)
-      $this->options["skip"] = $number;
-    else
-      throw new \Exception("\$number must be a positive integer.");
+    if (is_int($number) && $number > 0) {
+          $this->options["skip"] = $number;
+    } else {
+          throw new \Exception("\$number must be a positive integer.");
+    }
 
     return $this;
   }

src/EoC/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[in] 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[in] 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