php-resta / resta-core

src/resta/Client/ClientHttpManager.php

Braces +6 added lines, -3 removed lines

@@ -84,8 +84,9 @@ 
 

         /* Read the data 1 KB at a time

            and write to the file */

-        while ($chunk = fread($putdata, 1024))

-            $raw_data .= $chunk;

+        while ($chunk = fread($putdata, 1024)) {

+                    $raw_data .= $chunk;

+        }

 

         /* Close the streams */

         fclose($putdata);

@@ -105,7 +106,9 @@ 
 

         foreach ($parts as $part) {

             // If this is the last part, break

-            if ($part == "--\r\n") break;

+            if ($part == "--\r\n") {

+                break;

+            }

 

             // Separate content from headers

             $part = ltrim($part, "\r\n");

Spacing +19 added lines, -19 removed lines

@@ -40,19 +40,19 @@ 
     {

         $inputs = $this->app->get($this->method);

 

-        $content = json_decode($this->app['request']->getContent(),1);

+        $content = json_decode($this->app['request']->getContent(), 1);

 

-        if(is_array($inputs) && count($inputs)){

+        if (is_array($inputs) && count($inputs)) {

 

-            if(isset($inputs[$this->client->getClientName()])){

+            if (isset($inputs[$this->client->getClientName()])) {

                 return $inputs[$this->client->getClientName()];

             }

             return $inputs;

         }

 

-        if(is_array($content)){

+        if (is_array($content)) {

 

-            if(isset($content[$this->client->getClientName()])){

+            if (isset($content[$this->client->getClientName()])) {

                 return $content[$this->client->getClientName()];

             }

             return $content;

@@ -60,8 +60,8 @@ 
 

         $this->inputVars();

 

-        if(is_array($GLOBALS[ '_PUT' ])){

-            return $GLOBALS[ '_PUT' ];

+        if (is_array($GLOBALS['_PUT'])) {

+            return $GLOBALS['_PUT'];

         }

 

         return [];

@@ -91,9 +91,9 @@ 
         // Fetch content and determine boundary

         $boundary = substr($raw_data, 0, strpos($raw_data, "\r\n"));

 

-        if(empty($boundary)){

-            parse_str($raw_data,$data);

-            $GLOBALS[ '_PUT' ] = $data;

+        if (empty($boundary)) {

+            parse_str($raw_data, $data);

+            $GLOBALS['_PUT'] = $data;

             return;

         }

 

@@ -103,7 +103,7 @@ 
 

         foreach ($parts as $part) {

             // If this is the last part, break

-            if ($part == "--\r\n") break;

+            if ($part=="--\r\n") break;

 

             // Separate content from headers

             $part = ltrim($part, "\r\n");

@@ -130,10 +130,10 @@ 
                 list(, $type, $name) = $matches;

 

                 //Parse File

-                if( isset($matches[4]) )

+                if (isset($matches[4]))

                 {

                     //if labeled the same as previous, skip

-                    if( isset( $_FILES[ $matches[ 2 ] ] ) )

+                    if (isset($_FILES[$matches[2]]))

                     {

                         continue;

                     }

@@ -142,16 +142,16 @@ 
                     $filename = $matches[4];

 

                     //get tmp name

-                    $filename_parts = pathinfo( $filename );

-                    $tmp_name = tempnam( ini_get('upload_tmp_dir'), $filename_parts['filename']);

+                    $filename_parts = pathinfo($filename);

+                    $tmp_name = tempnam(ini_get('upload_tmp_dir'), $filename_parts['filename']);

 

                     //populate $_FILES with information, size may be off in multibyte situation

                     /** @noinspection PhpUndefinedVariableInspection */

-                    $_FILES[ $matches[ 2 ] ] = array(

+                    $_FILES[$matches[2]] = array(

                         'error'=>0,

                         'name'=>$filename,

                         'tmp_name'=>$tmp_name,

-                        'size'=>strlen( $body ),

+                        'size'=>strlen($body),

                         'type'=>$value

                     );

 

@@ -161,12 +161,12 @@ 
                 //Parse Field

                 else

                 {

-                    $data[$name] = substr($body, 0, strlen($body) - 2);

+                    $data[$name] = substr($body, 0, strlen($body)-2);

                 }

             }

 

         }

-        $GLOBALS[ '_PUT' ] = $data;

+        $GLOBALS['_PUT'] = $data;

         return;

     }

 

src/resta/Exception/ErrorProvider.php

Braces +5 added lines, -10 removed lines

@@ -39,8 +39,7 @@ 
     {

         if($this->app->has('exceptiontrace')) {

             $this->data['status'] = (int)$this->app['exceptiontrace']['callNamespace']->getCode();

-        }

-        else {

+        } else {

             $this->data['status'] = (int)$this->exception::exceptionTypeCodes($this->data['errType']);

         }

     }

@@ -82,8 +81,7 @@ 
 

             //set as the success object is false

             $this->data['appExceptionSuccess'] = [];

-        }

-        else{

+        } else{

 

             //set as the success object is false

             $this->data['appExceptionSuccess'] = ['success'=>(bool)false,'status'=>$this->data['status']];

@@ -186,13 +184,11 @@ 
             $this->app->register('responseStatus',500);

 

 

-        }

-        else{

+        } else{

 

             if($environment=='production' && preg_match('@SQLSTATE@is',$this->data['errStrReal'])){

                 $externalMessage = 'An unexpected external error has occurred';

-            }

-            else{

+            } else{

                 $externalMessage = $this->data['errStrReal'];

             }

 

@@ -236,8 +232,7 @@ 
             header('Content-type:application/json;charset=utf-8');

 

             echo json_encode($this->app->get('out')->outputFormatter($this->result));

-        }

-        else{

+        } else{

             echo $restaOutHandle;

         }

 

Spacing +65 added lines, -66 removed lines

@@ -37,7 +37,7 @@ 
      */

     private function getStatusAccordingToExceptionTrace()

     {

-        if($this->app->has('exceptiontrace')) {

+        if ($this->app->has('exceptiontrace')) {

             $this->data['status'] = (int)$this->app['exceptiontrace']['callNamespace']->getCode();

         }

         else {

@@ -54,21 +54,21 @@ 
 

         $this->app->terminate('responseSuccess');

         $this->app->terminate('responseStatus');

-        $this->app->register('responseSuccess',(bool)false);

-        $this->app->register('responseStatus',$this->data['status']);

+        $this->app->register('responseSuccess', (bool)false);

+        $this->app->register('responseStatus', $this->data['status']);

 

 

-        $optionalException = str_replace("\\","\\\\",$this->app->namespace()->exception());

+        $optionalException = str_replace("\\", "\\\\", $this->app->namespace()->exception());

 

-        if(preg_match('@'.$optionalException.'@is',$this->data['errType'])){

+        if (preg_match('@'.$optionalException.'@is', $this->data['errType'])) {

 

             //trace pattern

             $trace = $this->data['errContext']['trace'];

-            if(preg_match('@Stack trace:\n#0(.*)\n#1@is',$trace,$traceArray)){

+            if (preg_match('@Stack trace:\n#0(.*)\n#1@is', $trace, $traceArray)) {

 

-                $traceFile = str_replace(root,'',$traceArray[1]);

+                $traceFile = str_replace(root, '', $traceArray[1]);

 

-                if(preg_match('@(.*)\((\d+)\)@is',$traceFile,$traceResolve)){

+                if (preg_match('@(.*)\((\d+)\)@is', $traceFile, $traceResolve)) {

                     $this->data['errFile'] = $traceResolve[1];

                     $this->data['errLine'] = (int)$traceResolve[2];

                 }

@@ -78,15 +78,15 @@ 
             $this->data['errType'] = class_basename($this->data['errType']);

         }

 

-        if(is_array($meta = config('response.meta'))){

+        if (is_array($meta = config('response.meta'))) {

 

             //set as the success object is false

             $this->data['appExceptionSuccess'] = [];

         }

-        else{

+        else {

 

             //set as the success object is false

-            $this->data['appExceptionSuccess'] = ['success'=>(bool)false,'status'=>$this->data['status']];

+            $this->data['appExceptionSuccess'] = ['success'=>(bool)false, 'status'=>$this->data['status']];

         }

     }

 

@@ -108,13 +108,13 @@ 
         //This function can be used for defining your own way of handling errors during runtime,

         //for example in applications in which you need to do cleanup of data/files when a critical error happens,

         //or when you need to trigger an error under certain conditions (using trigger_error()).

-        set_error_handler([$this,'setErrorHandler']);

+        set_error_handler([$this, 'setErrorHandler']);

 

         //Registers a callback to be executed after script execution finishes or exit() is called.

         //Multiple calls to register_shutdown_function() can be made, and each will be called in the same order as

         //they were registered. If you call exit() within one registered shutdown function,

         //processing will stop completely and no other registered shutdown functions will be called.

-        register_shutdown_function([$this,'fatalErrorShutdownHandler']);

+        register_shutdown_function([$this, 'fatalErrorShutdownHandler']);

 

     }

 

@@ -127,7 +127,7 @@ 
      * @param null|string $errLine

      * @param null|string $errContext

      */

-    public function setErrorHandler($errNo=null, $errStr=null, $errFile=null, $errLine=null, $errContext=null)

+    public function setErrorHandler($errNo = null, $errStr = null, $errFile = null, $errLine = null, $errContext = null)

     {

         // in case of a deficiency,

         // we need to boot our general needs to be needed for the exception.

@@ -154,7 +154,7 @@ 
         //get lang message for exception

         $this->getLangMessageForException();

 

-        if($this->app->has('exceptiontrace')){

+        if ($this->app->has('exceptiontrace')) {

 

             $customExceptionTrace   = $this->app['exceptiontrace'];

             $this->data['errFile']  = $customExceptionTrace['file'];

@@ -163,40 +163,39 @@ 
 

         $environment = $this->app->environment();

 

-        $vendorDirectory = str_replace(root.''.DIRECTORY_SEPARATOR.'','',$this->data['errFile']);

+        $vendorDirectory = str_replace(root.''.DIRECTORY_SEPARATOR.'', '', $this->data['errFile']);

 

-        if(preg_match('@vendor.*\.php@is',$vendorDirectory,$vd)){

+        if (preg_match('@vendor.*\.php@is', $vendorDirectory, $vd)) {

             $vendorDirectory = $vd[0];

         }

 

-        if(Str::startsWith($vendorDirectory,'vendor')

-            && Str::startsWith($vendorDirectory,'vendor/php-resta')===false)

+        if (Str::startsWith($vendorDirectory, 'vendor')

+            && Str::startsWith($vendorDirectory, 'vendor/php-resta')===false)

         {

 

             $externalMessage = ($environment==="production") ?

-                'An unexpected external error has occurred' :

-                $this->data['errStrReal'];

+                'An unexpected external error has occurred' : $this->data['errStrReal'];

 

-            $this->result = $this->getAppException($environment,$externalMessage);

+            $this->result = $this->getAppException($environment, $externalMessage);

 

 

             //Get or Set the HTTP response code

             http_response_code(500);

             $this->app->terminate('responseStatus');

-            $this->app->register('responseStatus',500);

+            $this->app->register('responseStatus', 500);

 

 

         }

-        else{

+        else {

 

-            if($environment=='production' && preg_match('@SQLSTATE@is',$this->data['errStrReal'])){

+            if ($environment=='production' && preg_match('@SQLSTATE@is', $this->data['errStrReal'])) {

                 $externalMessage = 'An unexpected external error has occurred';

             }

-            else{

+            else {

                 $externalMessage = $this->data['errStrReal'];

             }

 

-            $this->result = $this->getAppException($environment,$externalMessage);

+            $this->result = $this->getAppException($environment, $externalMessage);

 

             //Get or Set the HTTP response code

             http_response_code($this->data['status']);

@@ -206,41 +205,41 @@ 
         // that is presented as an extra to the exception result set.

         $this->result = $this->getExceptionExtender();

 

-        if($environment==="production"){

+        if ($environment==="production") {

 

-            $productionLogMessage = $this->getAppException('local',$this->data['errStrReal']);

-            $this->app->register('productionLogMessage',$this->app->get('out')->outputFormatter($productionLogMessage));

+            $productionLogMessage = $this->getAppException('local', $this->data['errStrReal']);

+            $this->app->register('productionLogMessage', $this->app->get('out')->outputFormatter($productionLogMessage));

         }

 

         //set json app exception

-        $this->app->register('routerResult',$this->result);

+        $this->app->register('routerResult', $this->result);

 

-        if($this->app->has('exceptionContainer')){

+        if ($this->app->has('exceptionContainer')) {

             $exceptionContainer = $this->app->get('exceptionContainer');

-            $exceptionContainer($this->result,$this->data['status']);

+            $exceptionContainer($this->result, $this->data['status']);

         }

 

-        if($this->app->has('exceptionExtenderContainer')){

+        if ($this->app->has('exceptionExtenderContainer')) {

             $exceptionExtenderContainer = $this->app->get('exceptionExtenderContainer');

             $this->result = $exceptionExtenderContainer($this->result);

         }

 

         $restaOutHandle = null;

 

-        if(!defined('responseApp')){

+        if (!defined('responseApp')) {

             $restaOutHandle = $this->app->get('out')->handle();

         }

 

         header("HTTP/1.1 ".$this->data['status']);

 

-        if($restaOutHandle===null){

+        if ($restaOutHandle===null) {

 

             //header set and symfony response call

             header('Content-type:application/json;charset=utf-8');

 

             echo json_encode($this->app->get('out')->outputFormatter($this->result));

         }

-        else{

+        else {

             echo $restaOutHandle;

         }

 

@@ -251,7 +250,7 @@ 
      * @param $environment

      * @return mixed

      */

-    private function getAppException($environment,$message)

+    private function getAppException($environment, $message)

     {

         return $this->data['appExceptionSuccess']+$this->data['exception']::$environment(

                 $this->data['errNo'],

@@ -271,7 +270,7 @@ 
     private function getExceptionExtender()

     {

         return  $this->app->resolve(

-            $this->app->get('macro')->call('exceptionExtender',function(){

+            $this->app->get('macro')->call('exceptionExtender', function() {

                 return ExceptionExtender::class;

             }),

             ['result'=>$this->result])->getResult();

@@ -289,13 +288,13 @@ 
 

         $this->inStackTrace($last_error);

 

-        if(!is_null($last_error)){

+        if (!is_null($last_error)) {

 

-            if(!defined('methodName')){

-                define('methodName',null);

+            if (!defined('methodName')) {

+                define('methodName', null);

             }

 

-            if($this->app->has('exceptionFile')){

+            if ($this->app->has('exceptionFile')) {

                 $last_error['file'] = $this->app['exceptionFile'];

                 $last_error['line'] = $this->app['exceptionLine'];

             }

@@ -315,13 +314,13 @@ 
      */

     public function inStackTrace($error)

     {

-        if($this->app->has('urlComponent')){

-            if(!preg_match('@'.$this->app['urlComponent']['project'].'@',$error['file'])

-                && !$this->app->has('exceptionFile')){

-                if(preg_match('@ in\s(.*?)\n@is',$error['message'],$result)){

-                    $errorMessage = explode(":",$result[1]);

-                    $this->app->register('exceptionFile',$errorMessage[0]);

-                    $this->app->register('exceptionLine',$errorMessage[1]);

+        if ($this->app->has('urlComponent')) {

+            if (!preg_match('@'.$this->app['urlComponent']['project'].'@', $error['file'])

+                && !$this->app->has('exceptionFile')) {

+                if (preg_match('@ in\s(.*?)\n@is', $error['message'], $result)) {

+                    $errorMessage = explode(":", $result[1]);

+                    $this->app->register('exceptionFile', $errorMessage[0]);

+                    $this->app->register('exceptionLine', $errorMessage[1]);

                 }

             }

         }

@@ -334,33 +333,33 @@ 
     {

         $clone = clone $this;

 

-        if($this->app->has('exceptionTranslate')){

+        if ($this->app->has('exceptionTranslate')) {

 

             $langMessage = trans('exception.'.$this->app->get('exceptionTranslate'));

 

-            if(!is_null($langMessage) && $this->app->has('exceptionTranslateParams')){

+            if (!is_null($langMessage) && $this->app->has('exceptionTranslateParams')) {

 

-                if(count($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']])){

-                    foreach ($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']] as $key=>$value){

+                if (count($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']])) {

+                    foreach ($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']] as $key=>$value) {

 

                         $valueLangName = !is_null(trans('default.'.$value)) ? trans('default.'.$value) : $value;

-                        $langMessage = preg_replace('@\('.$key.'\)@is',$valueLangName,$langMessage);

+                        $langMessage = preg_replace('@\('.$key.'\)@is', $valueLangName, $langMessage);

                     }

                 }

             }

 

-            if($langMessage!==null){

+            if ($langMessage!==null) {

                 $this->data['errStrReal'] = $langMessage;

             }

         }

 

-        if(class_exists($this->data['errorClassNamespace'])

+        if (class_exists($this->data['errorClassNamespace'])

             &&

-            (Str::startsWith($this->data['errorClassNamespace'],'App')

-                || Str::startsWith($this->data['errorClassNamespace'],__NAMESPACE__))){

+            (Str::startsWith($this->data['errorClassNamespace'], 'App')

+                || Str::startsWith($this->data['errorClassNamespace'], __NAMESPACE__))) {

 

             ClosureDispatcher::bind($this->data['errorClassNamespace'])->call(function() use ($clone) {

-                if(property_exists($this,'lang')){

+                if (property_exists($this, 'lang')) {

                     $clone->setLang($this->lang);

                 }

             });

@@ -370,7 +369,7 @@ 
 

         $langMessage = (!is_null($this->data['lang'])) ? trans('exception.'.$this->data['lang']) : null;

 

-        if($langMessage!==null){

+        if ($langMessage!==null) {

             $this->data['errStrReal'] = $langMessage;

         }

     }

@@ -384,14 +383,14 @@ 
     {

         // catch exception via preg match

         // and then clear the Uncaught statement from inside.

-        if(preg_match('@(.*?):@is',$this->data['errStrReal'],$errArr)){

+        if (preg_match('@(.*?):@is', $this->data['errStrReal'], $errArr)) {

 

-            $this->data['errType'] = trim(str_replace('Uncaught','',$errArr[1]));

+            $this->data['errType'] = trim(str_replace('Uncaught', '', $errArr[1]));

             $this->data['errorClassNamespace'] = $this->data['errType'];

         }

 

-        if(preg_match('@Uncaught@is',$this->data['errStrReal'])

-            && preg_match('@(.*?):(.*?)\sin\s@is',$this->data['errStrReal'],$errStrRealArray)){

+        if (preg_match('@Uncaught@is', $this->data['errStrReal'])

+            && preg_match('@(.*?):(.*?)\sin\s@is', $this->data['errStrReal'], $errStrRealArray)) {

             $this->data['errStrReal'] = trim($errStrRealArray[2]);

         }

 

@@ -411,7 +410,7 @@ 
     /**

      * @param null|string $lang

      */

-    public function setLang($lang=null)

+    public function setLang($lang = null)

     {

         $this->lang = $lang;

     }

src/resta/Console/Source/Client/Client.php

Spacing +9 added lines, -9 removed lines

@@ -32,7 +32,7 @@ 
     /**

      * @var array

      */

-    public $commandRule=['name','client'];

+    public $commandRule = ['name', 'client'];

 

     /**

      * @method create

@@ -54,25 +54,25 @@ 
         //set project directory

         $this->file->makeDirectory($this);

 

-        if(!file_exists($manager = $this->directory['clientNameDir'].'/'.$name.'Manager.php')){

+        if (!file_exists($manager = $this->directory['clientNameDir'].'/'.$name.'Manager.php')) {

             $this->touch['client/manager'] = $manager;

             $this->touch['client/managertrait'] = $this->directory['clientNameDir'].'/'.$name.'Trait.php';

             $this->argument['managerTraitNamespace'] = Utils::getNamespace($this->directory['clientNameDir'].'/'.$name.'Trait.php');

         }

 

-        if(!file_exists($this->directory['clientNameCreate'].'/Client.php')){

+        if (!file_exists($this->directory['clientNameCreate'].'/Client.php')) {

             $this->touch['client/client'] = $this->directory['clientNameCreate'].'/Client.php';

             $this->touch['client/clientGenerator'] = $this->directory['clientNameCreate'].'/ClientGenerator.php';

         }

 

         $clientSourceNamespace = Utils::getNamespace($this->directory['clientSource'].'/'.$client.'.php');

 

-        if(!file_exists($clientSourceName = $this->directory['clientSource'].'/'.$client.'.php')){

+        if (!file_exists($clientSourceName = $this->directory['clientSource'].'/'.$client.'.php')) {

             $this->touch['client/source'] = $clientSourceName.'';

             //$this->touch['client/sourcegenerator'] = $this->directory['clientSource'].'/'.$client.'Generator.php';

         }

 

-        if(!file_exists($this->directory['clientNameCreate'].'/ClientProvider.php')){

+        if (!file_exists($this->directory['clientNameCreate'].'/ClientProvider.php')) {

             $this->touch['client/clientProvider'] = $this->directory['clientNameCreate'].'/ClientProvider.php';

         }

 

@@ -86,13 +86,13 @@ 
 

         $nameGeneratorNamespace = Utils::getNamespace($managerPath = $this->directory['clientNameDir'].''.DIRECTORY_SEPARATOR.''.$nameManager.'.php');

 

-        $generator = new Generator(path()->version(),'ClientManager');

+        $generator = new Generator(path()->version(), 'ClientManager');

 

         $clientManager = app()->namespace()->version().'\\ClientManager';

 

         $clientManagerResolve = new $clientManager;

 

-        if(!method_exists($clientManagerResolve,strtolower($name))){

+        if (!method_exists($clientManagerResolve, strtolower($name))) {

 

             $generator->createMethod([

                 strtolower($name)

@@ -123,11 +123,11 @@ 
 

         }

 

-        $nameGenerator = new Generator($this->directory['clientNameDir'],$name.'Manager');

+        $nameGenerator = new Generator($this->directory['clientNameDir'], $name.'Manager');

 

         $nameGeneratorNamespaceResolve = new $nameGeneratorNamespace;

 

-        if(!method_exists($nameGeneratorNamespaceResolve,strtolower($client))){

+        if (!method_exists($nameGeneratorNamespaceResolve, strtolower($client))) {

 

             $nameGenerator->createMethod([

                 strtolower($client)

src/resta/Provider/ServiceProvider.php

Spacing +36 added lines, -36 removed lines

@@ -26,11 +26,11 @@ 
      *

      * @throws FileNotFoundException

      */

-    private function applyProvider($key,$provider,$method='register')

+    private function applyProvider($key, $provider, $method = 'register')

     {

         // If the provider classes are a real object

         // we will run them.

-        if(Utils::isNamespaceExists($provider)){

+        if (Utils::isNamespaceExists($provider)) {

 

             // after determining whether the register or boot methods

             // we are running the provider.

@@ -38,13 +38,13 @@ 
             $providerInstance = $this->app->resolve($provider);

 

             //we need to do method check for provider.

-            if(method_exists($providerInstance,$method)){

+            if (method_exists($providerInstance, $method)) {

                 $providerInstance->{$method}();

 

-                if($method=="register"){

+                if ($method=="register") {

                     /** @scrutinizer ignore-call */

-                    $this->app->register('loadedProviders',$key,$provider);

-                    $this->deferrableProvider($providerInstance,$provider);

+                    $this->app->register('loadedProviders', $key, $provider);

+                    $this->deferrableProvider($providerInstance, $provider);

                 }

             }

         }

@@ -58,48 +58,48 @@ 
      *

      * @throws FileNotFoundException

      */

-    private function deferrableProvider($providerInstance,$provider)

+    private function deferrableProvider($providerInstance, $provider)

     {

-        if($providerInstance instanceof DeferrableProvider && file_exists(serviceJson())){

+        if ($providerInstance instanceof DeferrableProvider && file_exists(serviceJson())) {

             $deferrableProvides = $providerInstance->provides();

 

             foreach ($deferrableProvides as $deferrableProvide) {

-                if($this->app->has($deferrableProvide)){

+                if ($this->app->has($deferrableProvide)) {

                     JsonHandler::$file = serviceJson();

                     $serviceJson = JsonHandler::get();

 

-                    if(!isset($serviceJson['providers'][$provider])){

-                        JsonHandler::set('providers-deferrable-classes',[

+                    if (!isset($serviceJson['providers'][$provider])) {

+                        JsonHandler::set('providers-deferrable-classes', [

                             $provider => true

                         ]);

 

                         $container = $this->app->get($deferrableProvide);

 

-                        if(!is_array($container)){

+                        if (!is_array($container)) {

 

-                            if($container instanceof \Closure){

-                                JsonHandler::set('container',[

+                            if ($container instanceof \Closure) {

+                                JsonHandler::set('container', [

                                     $deferrableProvide => SuperClosure::set($container)

                                 ]);

 

-                                JsonHandler::set('container-format',[

+                                JsonHandler::set('container-format', [

                                     $deferrableProvide => 'closure'

                                 ]);

                             }

-                            else{

-                                JsonHandler::set('container',[

+                            else {

+                                JsonHandler::set('container', [

                                     $deferrableProvide => $container

                                 ]);

 

-                                JsonHandler::set('container-format',[

+                                JsonHandler::set('container-format', [

                                     $deferrableProvide => 'string'

                                 ]);

                             }

 

                         }

-                        else{

+                        else {

                             foreach ($container as $containerKey=>$containerItem) {

-                                JsonHandler::set('container',[

+                                JsonHandler::set('container', [

                                     $deferrableProvide.'.'.$containerKey => SuperClosure::set($containerItem)

                                 ]);

                             }

@@ -118,12 +118,12 @@ 
      */

     private function assignerLoadedProvidersInitialCoreValue()

     {

-        if(!isset($this->app['loadedProviders'])){

+        if (!isset($this->app['loadedProviders'])) {

 

             // for loaded providers,

             // we register an empty array for the container object.

             /** @scrutinizer ignore-call */

-            $this->app->register('loadedProviders',[]);

+            $this->app->register('loadedProviders', []);

         }

     }

 

@@ -138,7 +138,7 @@ 
         /** @scrutinizer ignore-call */

         $providers = $this->app->serviceProviders();

 

-        if(count($providers)){

+        if (count($providers)) {

             $this->providers = $providers;

         }

 

@@ -152,7 +152,7 @@ 
      */

     public function handle()

     {

-        define ('serviceprovider',true);

+        define('serviceprovider', true);

 

         //check providers and resolve

         $this->resolveProviders($this->getServiceProviders());

@@ -165,7 +165,7 @@ 
      *

      * @throws FileNotFoundException

      */

-    public function resolveProviders($providers=array())

+    public function resolveProviders($providers = array())

     {

         // for loaded providers,

         // we register an empty array for the container object.

@@ -174,36 +174,36 @@ 
         $serviceJson = [];

 

         //first we are running register methods of provider classes.

-        foreach($providers as $key=>$provider){

+        foreach ($providers as $key=>$provider) {

 

-            if(file_exists(serviceJson())){

+            if (file_exists(serviceJson())) {

                 JsonHandler::$file = serviceJson();

                 $serviceJson = JsonHandler::get();

             }

 

             // providers can only be installed once.

             // apply providers and register for kernel

-            if(!isset($this->app['loadedProviders'][$key])){

+            if (!isset($this->app['loadedProviders'][$key])) {

 

-                if(is_array($provider) && isset($provider['status']) && $provider['status']){

-                    if(!isset($serviceJson['providers-deferrable-classes'][$provider['class']])){

-                        $this->applyProvider($key,$provider['class']);

+                if (is_array($provider) && isset($provider['status']) && $provider['status']) {

+                    if (!isset($serviceJson['providers-deferrable-classes'][$provider['class']])) {

+                        $this->applyProvider($key, $provider['class']);

                     }

 

                 }

-                else{

-                    $this->applyProvider($key,$provider);

+                else {

+                    $this->applyProvider($key, $provider);

                 }

 

             }

         }

 

         //then we are running boot methods of provider classes.

-        foreach($providers as $key=>$provider){

+        foreach ($providers as $key=>$provider) {

 

             //if the providers register is already booted.

-            if(isset($this->app['loadedProviders'][$key])){

-                $this->applyProvider($key,$provider,'boot');

+            if (isset($this->app['loadedProviders'][$key])) {

+                $this->applyProvider($key, $provider, 'boot');

             }

         }

     }

Braces +3 added lines, -6 removed lines

@@ -85,8 +85,7 @@ 
                                 JsonHandler::set('container-format',[

                                     $deferrableProvide => 'closure'

                                 ]);

-                            }

-                            else{

+                            } else{

                                 JsonHandler::set('container',[

                                     $deferrableProvide => $container

                                 ]);

@@ -96,8 +95,7 @@ 
                                 ]);

                             }

 

-                        }

-                        else{

+                        } else{

                             foreach ($container as $containerKey=>$containerItem) {

                                 JsonHandler::set('container',[

                                     $deferrableProvide.'.'.$containerKey => SuperClosure::set($containerItem)

@@ -190,8 +188,7 @@ 
                         $this->applyProvider($key,$provider['class']);

                     }

 

-                }

-                else{

+                } else{

                     $this->applyProvider($key,$provider);

                 }

 

src/resta/Container/ContainerClosureResolver.php

Spacing +3 added lines, -3 removed lines

@@ -18,12 +18,12 @@
      */
     public static function get($key)
     {
-        if(file_exists(serviceJson())){
+        if (file_exists(serviceJson())) {
             JsonHandler::$file = serviceJson();
             $serviceJson = JsonHandler::get();
 
-            if(isset($serviceJson['container'][$key])){
-                if($serviceJson['container-format'][$key]=='string'){
+            if (isset($serviceJson['container'][$key])) {
+                if ($serviceJson['container-format'][$key]=='string') {
                     return $serviceJson['container'][$key];
                 }
                 return SuperClosure::get($serviceJson['container'][$key]);