neilherbertuk / celcatwebapi

src/Traits/GetResourcesTrait.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
         if (empty($this->parameters['pageSize']))
             $this->parameters['pageSize'] = $pagesize;
 
-        $this->celcatWebAPI->log()->info('Getting '. (new \ReflectionClass($this))->getShortName());// . (empty($this->parameters) ?: ' with ' . implode(',', $this->parameters)));
+        $this->celcatWebAPI->log()->info('Getting '.(new \ReflectionClass($this))->getShortName()); // . (empty($this->parameters) ?: ' with ' . implode(',', $this->parameters)));
         return $this->celcatWebAPI->get((empty($this->name) ? (new \ReflectionClass($this))->getShortName() : $this->name), $this->parameters);
     }
 
@@ -49,8 +49,8 @@ 
 
         $results = $this->get();
 
-        if($this->hasPagination($results)){
-            for($page = 1; $page < $results['pagination']['TotalPages']; $page++){
+        if ($this->hasPagination($results)) {
+            for ($page = 1; $page < $results['pagination']['TotalPages']; $page++) {
                 $this->parameters['page'] = $page;
                 $pageResults = $this->get();
 

Braces +6 added lines, -4 removed lines

@@ -29,8 +29,9 @@ 
      */
     public function get($pagesize = 50)
     {
-        if (empty($this->parameters['pageSize']))
-            $this->parameters['pageSize'] = $pagesize;
+        if (empty($this->parameters['pageSize'])) {
+                    $this->parameters['pageSize'] = $pagesize;
+        }
 
         $this->celcatWebAPI->log()->info('Getting '. (new \ReflectionClass($this))->getShortName());// . (empty($this->parameters) ?: ' with ' . implode(',', $this->parameters)));
         return $this->celcatWebAPI->get((empty($this->name) ? (new \ReflectionClass($this))->getShortName() : $this->name), $this->parameters);
@@ -44,8 +45,9 @@ 
      */
     public function getAll($pagesize = 1000)
     {
-        if (empty($this->parameters['pageSize']))
-            $this->parameters['pageSize'] = $pagesize;
+        if (empty($this->parameters['pageSize'])) {
+                    $this->parameters['pageSize'] = $pagesize;
+        }
 
         $results = $this->get();
 

src/CelcatWebAPI.php

Spacing +16 added lines, -16 removed lines

@@ -68,24 +68,24 @@ 
      */
     private function query($name, $requestMethod = 'GET', $parameters = [])
     {
-        $this->log()->info("Starting to perform query - resource: {$name} method: {$requestMethod}". (empty($parameters ?: " parameters: ". implode($parameters))));
+        $this->log()->info("Starting to perform query - resource: {$name} method: {$requestMethod}".(empty($parameters ?: " parameters: ".implode($parameters))));
         $client = new Client();
         if ($this->config['PROXY']) {
             $client = new Client(['proxy' => $this->config['PROXY']]);
-            if(!empty($this->config['PROXY']['no'])) {
-                putenv('no_proxy='. implode(' ,', $this->config['PROXY']['no']));
+            if (!empty($this->config['PROXY']['no'])) {
+                putenv('no_proxy='.implode(' ,', $this->config['PROXY']['no']));
             }
         }
 
         $options = $this->buildRequest($requestMethod)->options($parameters);
         $url = $this->buildRequest()->URL($name);
 
-        try{
+        try {
             $request = $client->request($requestMethod, $url, $options);
             $header = $request->getHeaders();
-            if($request->getStatusCode() >= 200 and $request->getStatusCode() <= 299) {
+            if ($request->getStatusCode() >= 200 and $request->getStatusCode() <= 299) {
 
-                $this->log()->info('Received ' . $request->getStatusCode());
+                $this->log()->info('Received '.$request->getStatusCode());
 
                 // Build object to return
                 // Include pagination details
@@ -101,24 +101,24 @@ 
                 return $result;
             } else {
                 // TODO - Error Handling
-                $this->log()->error('An error occurred, received a '. $request->getStatusCode());
+                $this->log()->error('An error occurred, received a '.$request->getStatusCode());
                 $this->log()->transferLogs();
-                $this->throwRunTimeException('An error occurred, received a '. $request->getStatusCode());
+                $this->throwRunTimeException('An error occurred, received a '.$request->getStatusCode());
             }
         }
-        catch (\Exception $exception){
-            if($exception instanceof ClientException){
-                if($exception->getCode() == 404) {
-                    $this->log()->info('Received '. $exception->getCode());
+        catch (\Exception $exception) {
+            if ($exception instanceof ClientException) {
+                if ($exception->getCode() == 404) {
+                    $this->log()->info('Received '.$exception->getCode());
                     $result['error']['code'] = 404;
                     $result['error']['message'] = "No Results Found";
                     return $result;
                 }
             }
             // TODO - Error Handling
-            $this->log()->error('An error occurred, received a '. $exception->getCode() . ' '. $exception->getMessage());
+            $this->log()->error('An error occurred, received a '.$exception->getCode().' '.$exception->getMessage());
             $this->log()->transferLogs();
-            $this->throwRunTimeException('An error occurred, received a '. $exception->getCode());
+            $this->throwRunTimeException('An error occurred, received a '.$exception->getCode());
         }
     }
 
@@ -128,7 +128,7 @@ 
      * @param string $requestMethod
      * @return RequestBuilder
      */
-    private function buildRequest($requestMethod = 'GET'){
+    private function buildRequest($requestMethod = 'GET') {
         return new RequestBuilder($requestMethod, $this->config);
     }
 
@@ -149,7 +149,7 @@ 
      *
      * @return Log
      */
-    public function log(){
+    public function log() {
         return new Log($this);
     }
 

Braces +1 added lines, -2 removed lines

@@ -105,8 +105,7 @@
                 $this->log()->transferLogs();
                 $this->throwRunTimeException('An error occurred, received a '. $request->getStatusCode());
             }
-        }
-        catch (\Exception $exception){
+        } catch (\Exception $exception){
             if($exception instanceof ClientException){
                 if($exception->getCode() == 404) {
                     $this->log()->info('Received '. $exception->getCode());

src/Classes/Log.php

Spacing +2 added lines, -2 removed lines

@@ -45,9 +45,9 @@
     {
         foreach ($this->celcatWebAPI->logs as $log) {
             if ($log['type'] == "info") {
-                Logs::info("Celcat Web API: ". $log['string']);
+                Logs::info("Celcat Web API: ".$log['string']);
             } else if ($log['type'] == "error") {
-                Logs::error("Celcat Web API: ". $log['string']);
+                Logs::error("Celcat Web API: ".$log['string']);
             }
         }
     }

src/Classes/RequestBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -92,6 +92,6 @@
      */
     public function URL($name)
     {
-        return rtrim($this->config['ServerAddress'], '/') . '/' . $name;
+        return rtrim($this->config['ServerAddress'], '/').'/'.$name;
     }
 }
\ No newline at end of file

src/CelcatWebAPIServiceProvider.php

Spacing +3 added lines, -3 removed lines

@@ -36,11 +36,11 @@ 
     public function register()
     {
         $this->mergeConfigFrom(
-            __DIR__ . '/Config/config.php',
+            __DIR__.'/Config/config.php',
             'celcat'
         );
 
-        $this->app->singleton('CelcatWebAPI', function($app){
+        $this->app->singleton('CelcatWebAPI', function($app) {
             return new CelcatWebAPI($app['config']);
         });
     }
@@ -52,7 +52,7 @@ 
     {
         if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) {
             $this->publishes([
-                __DIR__ . '/Config/config.php' => config_path('celcat.php'),
+                __DIR__.'/Config/config.php' => config_path('celcat.php'),
             ], "config");
         }
     }