zanysoft / laravel-serpapi

src/Lib/RestClient.php

Spacing +60 added lines, -60 removed lines

@@ -25,12 +25,12 @@ 
     // Populated as-needed.
     public $decoded_response; // Decoded response body.
 
-    public function __construct($options = [])
+    public function __construct($options = [ ])
     {
         $default_options = [
-            'headers' => [],
-            'parameters' => [],
-            'curl_options' => [],
+            'headers' => [ ],
+            'parameters' => [ ],
+            'curl_options' => [ ],
             'build_indexed_queries' => false,
             'user_agent' => "PHP RestClient/0.1.8",
             'base_url' => null,
@@ -46,9 +46,9 @@ 
 
         $this->options = array_merge($default_options, $options);
         if (array_key_exists('decoders', $options)) {
-            $this->options['decoders'] = array_merge(
-                $default_options['decoders'],
-                $options['decoders']
+            $this->options[ 'decoders' ] = array_merge(
+                $default_options[ 'decoders' ],
+                $options[ 'decoders' ]
             );
         }
     }
@@ -60,7 +60,7 @@ 
      */
     public function set_option($key, $value)
     {
-        $this->options[$key] = $value;
+        $this->options[ $key ] = $value;
     }
 
     /**
@@ -72,7 +72,7 @@ 
     {
         // Decoder callbacks must adhere to the following pattern:
         // array my_decoder(string $data)
-        $this->options['decoders'][$format] = $method;
+        $this->options[ 'decoders' ][ $format ] = $method;
     }
 
     // Iterable methods:
@@ -133,7 +133,7 @@ 
         $this->decode_response();
 
         return is_array($this->decoded_response) ?
-            isset($this->decoded_response[$key]) : isset($this->decoded_response->{$key});
+            isset($this->decoded_response[ $key ]) : isset($this->decoded_response->{$key});
     }
 
     public function offsetGet($key)
@@ -144,7 +144,7 @@ 
         }
 
         return is_array($this->decoded_response) ?
-            $this->decoded_response[$key] : $this->decoded_response->{$key};
+            $this->decoded_response[ $key ] : $this->decoded_response->{$key};
     }
 
     public function offsetSet($key, $value)
@@ -165,7 +165,7 @@ 
      * @param $headers
      * @return $this|RestClient
      */
-    public function get($url, $parameters = [], $headers = [])
+    public function get($url, $parameters = [ ], $headers = [ ])
     {
         return $this->execute($url, 'GET', $parameters, $headers);
     }
@@ -176,7 +176,7 @@ 
      * @param $headers
      * @return $this|RestClient
      */
-    public function post($url, $parameters = [], $headers = [])
+    public function post($url, $parameters = [ ], $headers = [ ])
     {
         return $this->execute($url, 'POST', $parameters, $headers);
     }
@@ -187,7 +187,7 @@ 
      * @param $headers
      * @return $this|RestClient
      */
-    public function put($url, $parameters = [], $headers = [])
+    public function put($url, $parameters = [ ], $headers = [ ])
     {
         return $this->execute($url, 'PUT', $parameters, $headers);
     }
@@ -198,7 +198,7 @@ 
      * @param $headers
      * @return $this|RestClient
      */
-    public function patch($url, $parameters = [], $headers = [])
+    public function patch($url, $parameters = [ ], $headers = [ ])
     {
         return $this->execute($url, 'PATCH', $parameters, $headers);
     }
@@ -209,7 +209,7 @@ 
      * @param $headers
      * @return $this|RestClient
      */
-    public function delete($url, $parameters = [], $headers = [])
+    public function delete($url, $parameters = [ ], $headers = [ ])
     {
         return $this->execute($url, 'DELETE', $parameters, $headers);
     }
@@ -220,7 +220,7 @@ 
      * @param $headers
      * @return $this|RestClient
      */
-    public function head($url, $parameters = [], $headers = [])
+    public function head($url, $parameters = [ ], $headers = [ ])
     {
         return $this->execute($url, 'HEAD', $parameters, $headers);
     }
@@ -232,7 +232,7 @@ 
      * @param $headers
      * @return $this|RestClient
      */
-    public function execute($url, $method = 'GET', $parameters = [], $headers = [])
+    public function execute($url, $method = 'GET', $parameters = [ ], $headers = [ ])
     {
         $client = clone $this;
         $client->url = $url;
@@ -240,42 +240,42 @@ 
         $curlopt = [
             CURLOPT_HEADER => true,
             CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_USERAGENT => $client->options['user_agent'],
+            CURLOPT_USERAGENT => $client->options[ 'user_agent' ],
         ];
 
-        if ($client->options['username'] && $client->options['password']) {
-            $curlopt[CURLOPT_USERPWD] = sprintf(
+        if ($client->options[ 'username' ] && $client->options[ 'password' ]) {
+            $curlopt[ CURLOPT_USERPWD ] = sprintf(
                 "%s:%s",
-                $client->options['username'],
-                $client->options['password']
+                $client->options[ 'username' ],
+                $client->options[ 'password' ]
             );
         }
 
-        if (count($client->options['headers']) || count($headers)) {
-            $curlopt[CURLOPT_HTTPHEADER] = [];
-            $headers = array_merge($client->options['headers'], $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) {
-                    $curlopt[CURLOPT_HTTPHEADER][] = sprintf("%s:%s", $key, $value);
+                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)) {
-            $parameters = array_merge($client->options['parameters'], $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=",
@@ -283,32 +283,32 @@ 
                 );
             }
         } else {
-            $parameters_string = (string)$parameters;
+            $parameters_string = (string) $parameters;
         }
 
         if (strtoupper($method) == 'POST') {
-            $curlopt[CURLOPT_POST] = true;
-            $curlopt[CURLOPT_POSTFIELDS] = $parameters_string;
+            $curlopt[ CURLOPT_POST ] = true;
+            $curlopt[ CURLOPT_POSTFIELDS ] = $parameters_string;
         } elseif (strtoupper($method) != 'GET') {
-            $curlopt[CURLOPT_CUSTOMREQUEST] = strtoupper($method);
-            $curlopt[CURLOPT_POSTFIELDS] = $parameters_string;
+            $curlopt[ CURLOPT_CUSTOMREQUEST ] = strtoupper($method);
+            $curlopt[ CURLOPT_POSTFIELDS ] = $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) != '/') {
+        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;
+            $client->url = $client->options[ 'base_url' ] . $client->url;
         }
-        $curlopt[CURLOPT_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) {
-                $curlopt[$key] = $value;
+            foreach ($client->options[ 'curl_options' ] as $key => $value) {
+                $curlopt[ $key ] = $value;
             }
         }
         curl_setopt_array($client->handle, $curlopt);
@@ -317,7 +317,7 @@ 
         if ($response !== false) {
             $client->parse_response($response);
         }
-        $client->info = (object)curl_getinfo($client->handle);
+        $client->info = (object) curl_getinfo($client->handle);
         $client->error = curl_error($client->handle);
 
         curl_close($client->handle);
@@ -331,8 +331,8 @@ 
      */
     public function parse_response($response)
     {
-        $headers = [];
-        $this->response_status_lines = [];
+        $headers = [ ];
+        $this->response_status_lines = [ ];
         $line = strtok($response, "\n");
         do {
             if (strlen(trim($line)) == 0) {
@@ -342,24 +342,24 @@ 
                 } // 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);
+                $this->response_status_lines[ ] = trim($line);
             } else {
                 // Has to be a header
                 list($key, $value) = explode(':', $line, 2);
                 $key = strtolower(trim(str_replace('-', '_', $key)));
                 $value = trim($value);
 
-                if (isset($headers[$key]) && empty($headers[$key])) {
-                    $headers[$key] = $value;
-                } elseif (isset($headers[$key]) && is_array($headers[$key])) {
-                    $headers[$key][] = $value;
+                if (isset($headers[ $key ]) && empty($headers[ $key ])) {
+                    $headers[ $key ] = $value;
+                } elseif (isset($headers[ $key ]) && is_array($headers[ $key ])) {
+                    $headers[ $key ][ ] = $value;
                 } else {
-                    $headers[$key] = [$headers[$key], $value];
+                    $headers[ $key ] = [ $headers[ $key ], $value ];
                 }
             }
         } while ($line = strtok("\n"));
 
-        $this->headers = (object)$headers;
+        $this->headers = (object) $headers;
         $this->response = strtok("");
     }
 
@@ -376,14 +376,14 @@ 
         }
 
         // 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)) {
-                return $matches[2];
+            if (preg_match($this->options[ 'format_regex' ], $this->headers->content_type, $matches)) {
+                return $matches[ 2 ];
             }
         }
 
@@ -400,13 +400,13 @@ 
     {
         if (empty($this->decoded_response)) {
             $format = $this->get_response_format();
-            if (!array_key_exists($format, $this->options['decoders'])) {
+            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->options[ 'decoders' ][ $format ],
                 $this->response
             );
         }

src/Lib/SerpApiSearch.php

Spacing +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
      */
     public function get_search_archive($search_id)
     {
-        return $this->query("/searches/$search_id.json", 'json', []);
+        return $this->query("/searches/$search_id.json", 'json', [ ]);
     }
 
     /**
@@ -110,7 +110,7 @@ 
      */
     public function get_account()
     {
-        return $this->query('/account', 'json', []);
+        return $this->query('/account', 'json', [ ]);
     }
 
     /**

src/SerpApiServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     {
         $this->mergeConfigFrom(__DIR__ . '/config/config.php', 'laravel-serpapi');
 
-        $this->app->bind('laravel-serpapi-search', function () {
+        $this->app->bind('laravel-serpapi-search', function() {
 
             $api_key = config('laravel-serpapi.api_key');
             $engine = config('laravel-serpapi.search_engine') ?: 'google';