knut7 / framework

src/Ballybran/Core/View/ViewrInterface.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 interface ViewrInterface
 {
-    public function render(object $controller , string $view);
+    public function render(object $controller, string $view);
 
     public function fetch($data = null);
 

src/Ballybran/Core/View/View.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 
     public function add(array $data) : void
     {
-        $this->data = array_merge( $this->data, $data );
+        $this->data = array_merge($this->data, $data);
 
     }
 

src/Ballybran/Core/Collections/Collection/ValidateDot.php

Spacing +8 added lines, -8 removed lines

@@ -180,16 +180,16 @@
      */
     public function merge($key, $value = null)
     {
-        if (is_array( $key )) {
-            $this->elements = array_merge( $this->elements , $key );
+        if (is_array($key)) {
+            $this->elements = array_merge($this->elements, $key);
         }
-        if (is_string( $key )) {
-            $items = (array)$this->get( $key );
-            $value = array_merge( $items , $this->getArrayItems( $value ) );
-            $this->set( $key , $value );
+        if (is_string($key)) {
+            $items = (array)$this->get($key);
+            $value = array_merge($items, $this->getArrayItems($value));
+            $this->set($key, $value);
         }
-        if (is_object( $key ) || $key instanceof IteratorDot) {
-            $this->elements = array_merge( $this->elements , $key->all() );
+        if (is_object($key) || $key instanceof IteratorDot) {
+            $this->elements = array_merge($this->elements, $key->all());
         }
     }
 }
\ No newline at end of file

src/Ballybran/Database/QueryBuilder.php

Spacing +68 added lines, -68 removed lines

@@ -42,13 +42,13 @@ 
      * @param $arguments
      * @return $this
      */
-    function __call($name , $arguments)
+    function __call($name, $arguments)
     {
         $clausule = $arguments[0];
-        if (count( $arguments ) > 1) {
+        if (count($arguments) > 1) {
             $clausule = $arguments;
         }
-        $this->clausules[strtolower( $name )] = $clausule;
+        $this->clausules[strtolower($name)] = $clausule;
 
         return $this;
     }
@@ -59,7 +59,7 @@ 
      */
     public function __construct(array $options)
     {
-        parent::__construct( $options );
+        parent::__construct($options);
         $this->conn = $this->connection();
 
     }
@@ -68,15 +68,15 @@ 
      * @param array $values
      * @return string
      */
-    public function insert(array $values = [] )
+    public function insert(array $values = [])
     {
         // recupera o nome da tabela
         // ou deixa uma marcação para mostrar que faltou informar esse campo
-        $table = isset( $this->clausules['table'] ) ? $this->clausules['table'] : '<table>';
+        $table = isset($this->clausules['table']) ? $this->clausules['table'] : '<table>';
 
         // recupera o array dos campos
         // ou deixa uma marcação para mostrar que faltou informar esse campo
-        $_fields = isset( $this->clausules['fields'] ) ? $this->clausules['fields'] : '<fields>';
+        $_fields = isset($this->clausules['fields']) ? $this->clausules['fields'] : '<fields>';
 //        $fields = implode( ', ' , $_fields );
 //
 //        // cria uma lista de rótulos para usar "prepared statement"
@@ -100,9 +100,9 @@ 
 
         // INSERT INTO {table} ({fields}) VALUES ({values});
         // junta o comando
-        $sql = implode( ' ' , $command );
+        $sql = implode(' ', $command);
 
-        return $this->executeInsert( $sql , $values );
+        return $this->executeInsert($sql, $values);
     }
 
     /**
@@ -113,14 +113,14 @@ 
     {
         // recupera o nome da tabela
         // ou deixa uma marcação para mostrar que faltou informar esse campo
-        $table = isset( $this->clausules['table'] ) ? $this->clausules['table'] : '<table>';
+        $table = isset($this->clausules['table']) ? $this->clausules['table'] : '<table>';
 
         // recupera o array dos campos
         // ou deixa uma marcação para mostrar que faltou informar esse campo
-        $_fields = isset( $this->clausules['fields'] ) ? $this->clausules['fields'] : '*';
-        $fields = implode( ', ' , $_fields );
+        $_fields = isset($this->clausules['fields']) ? $this->clausules['fields'] : '*';
+        $fields = implode(', ', $_fields);
 
-        $join = isset( $this->clausules['join'] ) ? $this->clausules['join'] : '';
+        $join = isset($this->clausules['join']) ? $this->clausules['join'] : '';
 
         $command = [];
         $command[] = 'SELECT';
@@ -133,31 +133,31 @@ 
 
         $clausules = [
             'where' => [
-                'instruction' => 'WHERE' ,
-                'separator' => ' ' ,
-            ] ,
+                'instruction' => 'WHERE',
+                'separator' => ' ',
+            ],
             'group' => [
-                'instruction' => 'GROUP BY' ,
-                'separator' => ', ' ,
-            ] ,
+                'instruction' => 'GROUP BY',
+                'separator' => ', ',
+            ],
             'order' => [
-                'instruction' => 'ORDER BY' ,
-                'separator' => ', ' ,
-            ] ,
+                'instruction' => 'ORDER BY',
+                'separator' => ', ',
+            ],
             'having' => [
-                'instruction' => 'HAVING' ,
-                'separator' => ' AND ' ,
-            ] ,
+                'instruction' => 'HAVING',
+                'separator' => ' AND ',
+            ],
             'limit' => [
-                'instruction' => 'LIMIT' ,
-                'separator' => ',' ,
-            ] ,
+                'instruction' => 'LIMIT',
+                'separator' => ',',
+            ],
         ];
         foreach ($clausules as $key => $clausule) {
-            if (isset( $this->clausules[$key] )) {
+            if (isset($this->clausules[$key])) {
                 $value = $this->clausules[$key];
-                if (is_array( $value )) {
-                    $value = implode( $clausule['separator'] , $this->clausules[$key] );
+                if (is_array($value)) {
+                    $value = implode($clausule['separator'], $this->clausules[$key]);
                 }
                 $command[] = $clausule['instruction'] . ' ' . $value;
             }
@@ -165,10 +165,10 @@ 
 
         // SELECT {fields} FROM <JOIN> {table} <WHERE> <GROUP> <ORDER> <HAVING> <LIMIT>;
         // junta o comando
-        $sql = implode( ' ' , $command );
+        $sql = implode(' ', $command);
         var_dump($sql);
 
-        return $this->executeSelect( $sql , $values );
+        return $this->executeSelect($sql, $values);
     }
 
     /**
@@ -178,13 +178,13 @@ 
     {
         // recupera o nome da tabela
         // ou deixa uma marcação para mostrar que faltou informar esse campo
-        $table = isset( $this->clausules['table'] ) ? $this->clausules['table'] : '<table>';
+        $table = isset($this->clausules['table']) ? $this->clausules['table'] : '<table>';
 
-        $join = isset( $this->clausules['join'] ) ? $this->clausules['join'] : '';
+        $join = isset($this->clausules['join']) ? $this->clausules['join'] : '';
 
         // recupera o array dos campos
         // ou deixa uma marcação para mostrar que faltou informar esse campo
-        $_fields = isset( $this->clausules['fields'] ) ? $this->clausules['fields'] : '<fields>';
+        $_fields = isset($this->clausules['fields']) ? $this->clausules['fields'] : '<fields>';
 
 
         ksort($_fields);
@@ -208,19 +208,19 @@ 
 
         $clausules = [
             'where' => [
-                'instruction' => 'WHERE' ,
-                'separator' => ' ' ,
+                'instruction' => 'WHERE',
+                'separator' => ' ',
             ],
             'limit' => [
-                'instruction' => 'LIMIT' ,
-                'separator' => ',' ,
-            ] ,
+                'instruction' => 'LIMIT',
+                'separator' => ',',
+            ],
         ];
         foreach ($clausules as $key => $clausule) {
-            if (isset( $this->clausules[$key] )) {
+            if (isset($this->clausules[$key])) {
                 $value = $this->clausules[$key];
-                if (is_array( $value )) {
-                    $value = implode( $clausule['separator'] , $this->clausules[$key] );
+                if (is_array($value)) {
+                    $value = implode($clausule['separator'], $this->clausules[$key]);
                 }
                 $command[] = $clausule['instruction'] . ' ' . $value;
             }
@@ -228,22 +228,22 @@ 
 
         // UPDATE {table} SET {set} <WHERE>
         // junta o comando
-        $sql = implode( ' ' , $command );
+        $sql = implode(' ', $command);
 
-        return $this->executeUpdate( $sql , $_fields );
+        return $this->executeUpdate($sql, $_fields);
     }
 
     /**
      * @param $filters
      * @return int
      */
-    public function delete($filters = null )
+    public function delete($filters = null)
     {
         // recupera o nome da tabela
         // ou deixa uma marcação para mostrar que faltou informar esse campo
-        $table = isset( $this->clausules['table'] ) ? $this->clausules['table'] : '<table>';
+        $table = isset($this->clausules['table']) ? $this->clausules['table'] : '<table>';
 
-        $join = isset( $this->clausules['join'] ) ? $this->clausules['join'] : '';
+        $join = isset($this->clausules['join']) ? $this->clausules['join'] : '';
 
         $command = [];
         $command[] = 'DELETE FROM';
@@ -254,20 +254,20 @@ 
 
         $clausules = [
             'where' => [
-                'instruction' => 'WHERE' ,
-                'separator' => ' ' ,
+                'instruction' => 'WHERE',
+                'separator' => ' ',
             ],
             'limit' => [
-                'instruction' => 'LIMIT' ,
-                'separator' => ',' ,
-            ] ,
+                'instruction' => 'LIMIT',
+                'separator' => ',',
+            ],
 
         ];
         foreach ($clausules as $key => $clausule) {
-            if (isset( $this->clausules[$key] )) {
+            if (isset($this->clausules[$key])) {
                 $value = $this->clausules[$key];
-                if (is_array( $value )) {
-                    $value = implode( $clausule['separator'] , $this->clausules[$key] );
+                if (is_array($value)) {
+                    $value = implode($clausule['separator'], $this->clausules[$key]);
                 }
                 $command[] = $clausule['instruction'] . ' ' . $value;
             }
@@ -275,30 +275,30 @@ 
 
         // DELETE FROM {table} <JOIN> <USING> <WHERE>
         // junta o comando
-        $sql = implode( ' ' , $command );
+        $sql = implode(' ', $command);
 
-        return $this->executeDelete( $sql , $filters );
+        return $this->executeDelete($sql, $filters);
     }
 
-    private function executeSelect($sql , $value)
+    private function executeSelect($sql, $value)
     {
 
-        $stmt = $this->conn->prepare( $sql );
+        $stmt = $this->conn->prepare($sql);
 
         foreach ($value as $key => $values) {
-            return $stmt->bindValue( "$key" , $values );
+            return $stmt->bindValue("$key", $values);
         }
         $stmt->execute();
 
         do {
-            return $stmt->fetchAll( $fetchMode );
+            return $stmt->fetchAll($fetchMode);
         } while (
             $stmt->nextRowset());
         $stmt->close();
 
     }
 
-    private function executeInsert($sql , $value)
+    private function executeInsert($sql, $value)
     {
         try {
 
@@ -306,11 +306,11 @@ 
 
             $stmt = $this->conn->prepare($sql);
             foreach ($value as $key => $values) {
-                $stmt->bindValue( ":$key" , $values );
+                $stmt->bindValue(":$key", $values);
             }
             $this->_commit();
             $stmt->execute();
-            unset( $stmt );
+            unset($stmt);
         } catch (\Exception $e) {
             $this->_Rollback();
             echo 'error insert ' . $e->getMessage();
@@ -319,7 +319,7 @@ 
     }
 
 
-    private function executeUpdate($sql , $data)
+    private function executeUpdate($sql, $data)
     {
         $stmt = $this->conn->prepare($sql);
         foreach ($data as $key => $values) {
@@ -329,7 +329,7 @@ 
         return $stmt->execute();
     }
 
-    private function executeDelete($sql , $value)
+    private function executeDelete($sql, $value)
     {
         return $this->conn->exec($sql);
 

src/Ballybran/Database/MySQLDump.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     public function save($file)
     {
         $this->createWritableFolder($file);
-        $file = DIR_STORAGE. $file;
+        $file = DIR_STORAGE . $file;
         $handle = strcasecmp(substr($file, -3), '.gz') ? fopen($file, 'wb') : gzopen($file, 'wb');
         if (!$handle) {
             throw new \Exception("ERROR: Cannot write file '$file'.");

src/Ballybran/Helpers/Http/Cookie.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
  */
 
 namespace Ballybran\Helpers\Http;
-use Ballybran\Core\Http\{Request , Response , RestUtilities};
+use Ballybran\Core\Http\{Request, Response, RestUtilities};
 
 
 /**
@@ -109,7 +109,7 @@ 
 
         if (!is_null($maxage)) {
             $maxage = intval($maxage);
-            $this->data['maxage'] = 'Expires=' .gmdate("D, d M Y H:i:s",  $maxage > 0 ? time() + $maxage : 0)." GMT" . 'Max-Age=' . $maxage;
+            $this->data['maxage'] = 'Expires=' . gmdate("D, d M Y H:i:s", $maxage > 0 ? time() + $maxage : 0) . " GMT" . 'Max-Age=' . $maxage;
         }
         $this->data['maxage'] = $maxage;
         return $this;

src/Ballybran/Helpers/Log/FileLogger.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
      */
     public function write($message, string $type = null)
     {
-        if ($this->handle = fopen(getcwd() . DS. DIR_STORAGE.$this->filename, 'a')) {
+        if ($this->handle = fopen(getcwd() . DS . DIR_STORAGE . $this->filename, 'a')) {
             if (is_array($message) && $type == 'A') {
                 foreach ($message as $key => $value) {
                     fwrite($this->handle, date('Y-m-d G:i:s') . ' - ' . print_r($key . " -> " . $value, true) . "\n");
@@ -72,7 +72,7 @@ 
 
         fclose($this->handle);
         if ($this->filename == true) {
-            chmod(getcwd() . DS. DIR_STORAGE.$this->filename, 0755);
+            chmod(getcwd() . DS . DIR_STORAGE . $this->filename, 0755);
         }
     }
 

src/Ballybran/Helpers/Stdlib/CreateFiles.php

Spacing +4 added lines, -4 removed lines

@@ -14,10 +14,10 @@
     private function createWritableFolder($file)
     {
         $currPath = '';
-        $path = explode( "/" , $file );
-        $currPath .= trim( $path[0] );
-        if($currPath != '.' && $currPath != '/' ) {
-            @mkdir( DIR_STORAGE.$currPath , 0777 , true );
+        $path = explode("/", $file);
+        $currPath .= trim($path[0]);
+        if ($currPath != '.' && $currPath != '/') {
+            @mkdir(DIR_STORAGE . $currPath, 0777, true);
         }
 
     }

src/Ballybran/Core/Http/RestClient.php

Spacing +59 added lines, -59 removed lines

@@ -24,7 +24,7 @@ 
     // Populated as-needed.
     public $decoded_response; // Decoded response body.
 
-    public function __construct($options=[]){
+    public function __construct($options = []) {
         $default_options = [
             'headers' => [],
             'parameters' => [],
@@ -43,94 +43,94 @@ 
         ];
 
         $this->options = array_merge($default_options, $options);
-        if(array_key_exists('decoders', $options))
+        if (array_key_exists('decoders', $options))
             $this->options['decoders'] = array_merge(
                 $default_options['decoders'], $options['decoders']);
     }
 
-    public function set_option($key, $value){
+    public function set_option($key, $value) {
         $this->options[$key] = $value;
     }
 
-    public function register_decoder($format, $method){
+    public function register_decoder($format, $method) {
         // Decoder callbacks must adhere to the following pattern:
         //   array my_decoder(string $data)
         $this->options['decoders'][$format] = $method;
     }
 
     // Iterable methods:
-    public function rewind(){
+    public function rewind() {
         $this->decode_response();
         return reset($this->decoded_response);
     }
 
-    public function current(){
+    public function current() {
         return current($this->decoded_response);
     }
 
-    public function key(){
+    public function key() {
         return key($this->decoded_response);
     }
 
-    public function next(){
+    public function next() {
         return next($this->decoded_response);
     }
 
-    public function valid(){
+    public function valid() {
         return is_array($this->decoded_response)
             && (key($this->decoded_response) !== NULL);
     }
 
     // ArrayAccess methods:
-    public function offsetExists($key){
+    public function offsetExists($key) {
         $this->decode_response();
-        return is_array($this->decoded_response)?
+        return is_array($this->decoded_response) ?
             isset($this->decoded_response[$key]) : isset($this->decoded_response->{$key});
     }
 
-    public function offsetGet($key){
+    public function offsetGet($key) {
         $this->decode_response();
-        if(!$this->offsetExists($key))
+        if (!$this->offsetExists($key))
             return NULL;
 
-        return is_array($this->decoded_response)?
+        return is_array($this->decoded_response) ?
             $this->decoded_response[$key] : $this->decoded_response->{$key};
     }
 
-    public function offsetSet($key, $value){
+    public function offsetSet($key, $value) {
         throw new RestClientException("Decoded response data is immutable.");
     }
 
-    public function offsetUnset($key){
+    public function offsetUnset($key) {
         throw new RestClientException("Decoded response data is immutable.");
     }
 
     // Request methods:
-    public function get($url, $parameters=[], $headers=[]){
+    public function get($url, $parameters = [], $headers = []) {
         return $this->execute($url, 'GET', $parameters, $headers);
     }
 
-    public function post($url, $parameters=[], $headers=[]){
+    public function post($url, $parameters = [], $headers = []) {
         return $this->execute($url, 'POST', $parameters, $headers);
     }
 
-    public function put($url, $parameters=[], $headers=[]){
+    public function put($url, $parameters = [], $headers = []) {
         return $this->execute($url, 'PUT', $parameters, $headers);
     }
 
-    public function patch($url, $parameters=[], $headers=[]){
+    public function patch($url, $parameters = [], $headers = []) {
         return $this->execute($url, 'PATCH', $parameters, $headers);
     }
 
-    public function delete($url, $parameters=[], $headers=[]){
+    public function delete($url, $parameters = [], $headers = []) {
         return $this->execute($url, 'DELETE', $parameters, $headers);
     }
 
-    public function head($url, $parameters=[], $headers=[]){
+    public function head($url, $parameters = [], $headers = []) {
         return $this->execute($url, 'HEAD', $parameters, $headers);
     }
 
-    public function execute($url, $method='GET', $parameters=[], $headers=[]){
+    public function execute($url, $method = 'GET', $parameters = [], $headers = []) {
         $client = clone $this;
         $client->url = $url;
         $client->handle = curl_init();
@@ -140,89 +140,89 @@ 
             CURLOPT_USERAGENT => $client->options['user_agent']
         ];
 
-        if($client->options['username'] && $client->options['password'])
+        if ($client->options['username'] && $client->options['password'])
             $curlopt[CURLOPT_USERPWD] = sprintf("%s:%s",
                 $client->options['username'], $client->options['password']);
 
-        if(count($client->options['headers']) || count($headers)){
+        if (count($client->options['headers']) || count($headers)) {
             $curlopt[CURLOPT_HTTPHEADER] = [];
             $headers = array_merge($client->options['headers'], $headers);
-            foreach($headers as $key => $values){
-                foreach(is_array($values)? $values : [$values] as $value){
+            foreach ($headers as $key => $values) {
+                foreach (is_array($values) ? $values : [$values] as $value) {
                     $curlopt[CURLOPT_HTTPHEADER][] = sprintf("%s:%s", $key, $value);
                 }
             }
         }
 
-        if($client->options['format'])
-            $client->url .= '.'.$client->options['format'];
+        if ($client->options['format'])
+            $client->url .= '.' . $client->options['format'];
 
         // Allow passing parameters as a pre-encoded string (or something that
         // allows casting to a string). Parameters passed as strings will not be
         // merged with parameters specified in the default options.
-        if(is_array($parameters)){
+        if (is_array($parameters)) {
             $parameters = array_merge($client->options['parameters'], $parameters);
             $parameters_string = http_build_query($parameters);
 
             // http_build_query automatically adds an array index to repeated
             // parameters which is not desirable on most systems. This hack
             // reverts "key[0]=foo&key[1]=bar" to "key[]=foo&key[]=bar"
-            if(!$client->options['build_indexed_queries'])
+            if (!$client->options['build_indexed_queries'])
                 $parameters_string = preg_replace(
                     "/%5B[0-9]+%5D=/simU", "%5B%5D=", $parameters_string);
         }
         else
-            $parameters_string = (string) $parameters;
+            $parameters_string = (string)$parameters;
 
-        if(strtoupper($method) == 'POST'){
+        if (strtoupper($method) == 'POST') {
             $curlopt[CURLOPT_POST] = TRUE;
             $curlopt[CURLOPT_POSTFIELDS] = $parameters_string;
         }
-        elseif(strtoupper($method) == 'HEAD'){
+        elseif (strtoupper($method) == 'HEAD') {
             $curlopt[CURLOPT_NOBODY] = TRUE;
         }
-        elseif(strtoupper($method) != 'GET'){
+        elseif (strtoupper($method) != 'GET') {
             $curlopt[CURLOPT_CUSTOMREQUEST] = strtoupper($method);
             $curlopt[CURLOPT_POSTFIELDS] = $parameters_string;
         }
-        elseif($parameters_string){
-            $client->url .= strpos($client->url, '?')? '&' : '?';
+        elseif ($parameters_string) {
+            $client->url .= strpos($client->url, '?') ? '&' : '?';
             $client->url .= $parameters_string;
         }
 
-        if($client->options['base_url']){
-            if($client->url[0] != '/' && substr($client->options['base_url'], -1) != '/')
+        if ($client->options['base_url']) {
+            if ($client->url[0] != '/' && substr($client->options['base_url'], -1) != '/')
                 $client->url = '/' . $client->url;
             $client->url = $client->options['base_url'] . $client->url;
         }
         $curlopt[CURLOPT_URL] = $client->url;
 
-        if($client->options['curl_options']){
+        if ($client->options['curl_options']) {
             // array_merge would reset our numeric keys.
-            foreach($client->options['curl_options'] as $key => $value){
+            foreach ($client->options['curl_options'] as $key => $value) {
                 $curlopt[$key] = $value;
             }
         }
         curl_setopt_array($client->handle, $curlopt);
 
         $client->parse_response(curl_exec($client->handle));
-        $client->info = (object) curl_getinfo($client->handle);
+        $client->info = (object)curl_getinfo($client->handle);
         $client->error = curl_error($client->handle);
 
         curl_close($client->handle);
         return $client;
     }
 
-    public function parse_response($response){
+    public function parse_response($response) {
         $headers = [];
         $this->response_status_lines = [];
         $line = strtok($response, "\n");
         do {
-            if(strlen(trim($line)) == 0){
+            if (strlen(trim($line)) == 0) {
                 // Since we tokenize on \n, use the remaining \r to detect empty lines.
-                if(count($headers) > 0) break; // Must be the newline after headers, move on to response body
+                if (count($headers) > 0) break; // Must be the newline after headers, move on to response body
             }
-            elseif(strpos($line, 'HTTP') === 0){
+            elseif (strpos($line, 'HTTP') === 0) {
                 // One or more HTTP status lines
                 $this->response_status_lines[] = trim($line);
             }
@@ -232,42 +232,42 @@ 
                 $key = trim(strtolower(str_replace('-', '_', $key)));
                 $value = trim($value);
 
-                if(empty($headers[$key]))
+                if (empty($headers[$key]))
                     $headers[$key] = $value;
-                elseif(is_array($headers[$key]))
+                elseif (is_array($headers[$key]))
                     $headers[$key][] = $value;
                 else
                     $headers[$key] = [$headers[$key], $value];
             }
-        } while($line = strtok("\n"));
+        } while ($line = strtok("\n"));
 
-        $this->headers = (object) $headers;
+        $this->headers = (object)$headers;
         $this->response = strtok("");
     }
 
-    public function get_response_format(){
-        if(!$this->response)
+    public function get_response_format() {
+        if (!$this->response)
             throw new RestClientException(
                 "A response must exist before it can be decoded.");
 
         // User-defined format.
-        if(!empty($this->options['format']))
+        if (!empty($this->options['format']))
             return $this->options['format'];
 
         // Extract format from response content-type header.
-        if(!empty($this->headers->content_type))
-        if(preg_match($this->options['format_regex'], $this->headers->content_type, $matches))
+        if (!empty($this->headers->content_type))
+        if (preg_match($this->options['format_regex'], $this->headers->content_type, $matches))
             return $matches[2];
 
         throw new RestClientException(
             "Response format could not be determined.");
     }
 
-    public function decode_response(){
-        if(empty($this->decoded_response)){
+    public function decode_response() {
+        if (empty($this->decoded_response)) {
             $format = $this->get_response_format();
-            if(!array_key_exists($format, $this->options['decoders']))
-                throw new RestClientException("'${format}' is not a supported ".
+            if (!array_key_exists($format, $this->options['decoders']))
+                throw new RestClientException("'${format}' is not a supported " .
                     "format, register a decoder to handle this response.");
 
             $this->decoded_response = call_user_func(

Braces +48 added lines, -39 removed lines

@@ -43,9 +43,10 @@ 
         ];
 
         $this->options = array_merge($default_options, $options);
-        if(array_key_exists('decoders', $options))
-            $this->options['decoders'] = array_merge(
+        if(array_key_exists('decoders', $options)) {
+                    $this->options['decoders'] = array_merge(
                 $default_options['decoders'], $options['decoders']);
+        }
     }
 
     public function set_option($key, $value){
@@ -90,8 +91,9 @@ 
 
     public function offsetGet($key){
         $this->decode_response();
-        if(!$this->offsetExists($key))
-            return NULL;
+        if(!$this->offsetExists($key)) {
+                    return NULL;
+        }
 
         return is_array($this->decoded_response)?
             $this->decoded_response[$key] : $this->decoded_response->{$key};
@@ -140,9 +142,10 @@ 
             CURLOPT_USERAGENT => $client->options['user_agent']
         ];
 
-        if($client->options['username'] && $client->options['password'])
-            $curlopt[CURLOPT_USERPWD] = sprintf("%s:%s",
+        if($client->options['username'] && $client->options['password']) {
+                    $curlopt[CURLOPT_USERPWD] = sprintf("%s:%s",
                 $client->options['username'], $client->options['password']);
+        }
 
         if(count($client->options['headers']) || count($headers)){
             $curlopt[CURLOPT_HTTPHEADER] = [];
@@ -154,8 +157,9 @@ 
             }
         }
 
-        if($client->options['format'])
-            $client->url .= '.'.$client->options['format'];
+        if($client->options['format']) {
+                    $client->url .= '.'.$client->options['format'];
+        }
 
         // Allow passing parameters as a pre-encoded string (or something that
         // allows casting to a string). Parameters passed as strings will not be
@@ -167,32 +171,31 @@ 
             // http_build_query automatically adds an array index to repeated
             // parameters which is not desirable on most systems. This hack
             // reverts "key[0]=foo&key[1]=bar" to "key[]=foo&key[]=bar"
-            if(!$client->options['build_indexed_queries'])
-                $parameters_string = preg_replace(
+            if(!$client->options['build_indexed_queries']) {
+                            $parameters_string = preg_replace(
                     "/%5B[0-9]+%5D=/simU", "%5B%5D=", $parameters_string);
+            }
+        } else {
+                    $parameters_string = (string) $parameters;
         }
-        else
-            $parameters_string = (string) $parameters;
 
         if(strtoupper($method) == 'POST'){
             $curlopt[CURLOPT_POST] = TRUE;
             $curlopt[CURLOPT_POSTFIELDS] = $parameters_string;
-        }
-        elseif(strtoupper($method) == 'HEAD'){
+        } elseif(strtoupper($method) == 'HEAD'){
             $curlopt[CURLOPT_NOBODY] = TRUE;
-        }
-        elseif(strtoupper($method) != 'GET'){
+        } elseif(strtoupper($method) != 'GET'){
             $curlopt[CURLOPT_CUSTOMREQUEST] = strtoupper($method);
             $curlopt[CURLOPT_POSTFIELDS] = $parameters_string;
-        }
-        elseif($parameters_string){
+        } elseif($parameters_string){
             $client->url .= strpos($client->url, '?')? '&' : '?';
             $client->url .= $parameters_string;
         }
 
         if($client->options['base_url']){
-            if($client->url[0] != '/' && substr($client->options['base_url'], -1) != '/')
-                $client->url = '/' . $client->url;
+            if($client->url[0] != '/' && substr($client->options['base_url'], -1) != '/') {
+                            $client->url = '/' . $client->url;
+            }
             $client->url = $client->options['base_url'] . $client->url;
         }
         $curlopt[CURLOPT_URL] = $client->url;
@@ -220,24 +223,26 @@ 
         do {
             if(strlen(trim($line)) == 0){
                 // Since we tokenize on \n, use the remaining \r to detect empty lines.
-                if(count($headers) > 0) break; // Must be the newline after headers, move on to response body
-            }
-            elseif(strpos($line, 'HTTP') === 0){
+                if(count($headers) > 0) {
+                    break;
+                }
+                // Must be the newline after headers, move on to response body
+            } elseif(strpos($line, 'HTTP') === 0){
                 // One or more HTTP status lines
                 $this->response_status_lines[] = trim($line);
-            }
-            else {
+            } else {
                 // Has to be a header
                 list($key, $value) = explode(':', $line, 2);
                 $key = trim(strtolower(str_replace('-', '_', $key)));
                 $value = trim($value);
 
-                if(empty($headers[$key]))
-                    $headers[$key] = $value;
-                elseif(is_array($headers[$key]))
-                    $headers[$key][] = $value;
-                else
-                    $headers[$key] = [$headers[$key], $value];
+                if(empty($headers[$key])) {
+                                    $headers[$key] = $value;
+                } elseif(is_array($headers[$key])) {
+                                    $headers[$key][] = $value;
+                } else {
+                                    $headers[$key] = [$headers[$key], $value];
+                }
             }
         } while($line = strtok("\n"));
 
@@ -246,18 +251,21 @@ 
     }
 
     public function get_response_format(){
-        if(!$this->response)
-            throw new RestClientException(
+        if(!$this->response) {
+                    throw new RestClientException(
                 "A response must exist before it can be decoded.");
+        }
 
         // User-defined format.
-        if(!empty($this->options['format']))
-            return $this->options['format'];
+        if(!empty($this->options['format'])) {
+                    return $this->options['format'];
+        }
 
         // Extract format from response content-type header.
-        if(!empty($this->headers->content_type))
-        if(preg_match($this->options['format_regex'], $this->headers->content_type, $matches))
+        if(!empty($this->headers->content_type)) {
+                if(preg_match($this->options['format_regex'], $this->headers->content_type, $matches))
             return $matches[2];
+        }
 
         throw new RestClientException(
             "Response format could not be determined.");
@@ -266,9 +274,10 @@ 
     public function decode_response(){
         if(empty($this->decoded_response)){
             $format = $this->get_response_format();
-            if(!array_key_exists($format, $this->options['decoders']))
-                throw new RestClientException("'${format}' is not a supported ".
+            if(!array_key_exists($format, $this->options['decoders'])) {
+                            throw new RestClientException("'${format}' is not a supported ".
                     "format, register a decoder to handle this response.");
+            }
 
             $this->decoded_response = call_user_func(
                 $this->options['decoders'][$format], $this->response);