php-resta / resta-core

src/resta/Exception/ErrorProvider.php

Spacing +67 added lines, -68 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($this->data['status']=='500' && $environment=='production'){

+            if ($this->data['status']=='500' && $environment=='production') {

                 $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,39 +205,39 @@ 
         // that is presented as an extra to the exception result set.

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

 

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

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

-            $productionLogMessage = array_merge($this->result,$productionLogMessage);

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

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

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

+            $productionLogMessage = array_merge($this->result, $productionLogMessage);

+            $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('exceptionResponse')){

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

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

-            $exceptionResponse((isset($productionLogMessage)) ? $productionLogMessage : $this->result,$this->data['status']);

+            $exceptionResponse((isset($productionLogMessage)) ? $productionLogMessage : $this->result, $this->data['status']);

         }

 

         $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

             $lastResult = $this->app->get('out')->outputFormatter($this->result);

 

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

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

 

                 $responseType = $this->app->get('clientResponseType');

                 echo app()->resolve($this->app->get('out')->formatter())->{$responseType}($lastResult);

             }

-            else{

+            else {

 

                 $defaultResponseType = (is_null(config('app.response'))) ? 'json' : config('app.response');

                 echo app()->resolve($this->app->get('out')->formatter())->{$defaultResponseType}($lastResult);

@@ -246,7 +245,7 @@ 
 

 

         }

-        else{

+        else {

             echo $restaOutHandle;

         }

 

@@ -257,7 +256,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'],

@@ -277,7 +276,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();

@@ -295,13 +294,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'];

             }

@@ -321,13 +320,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]);

                 }

             }

         }

@@ -340,33 +339,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);

                 }

             });

@@ -376,7 +375,7 @@ 
 

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

 

-        if($langMessage!==null){

+        if ($langMessage!==null) {

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

         }

     }

@@ -390,14 +389,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]);

         }

 

@@ -417,7 +416,7 @@ 
     /**

      * @param null|string $lang

      */

-    public function setLang($lang=null)

+    public function setLang($lang = null)

     {

         $this->lang = $lang;

     }

Braces +6 added lines, -12 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($this->data['status']=='500' && $environment=='production'){

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

-            }

-            else{

+            } else{

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

             }

 

@@ -237,16 +233,14 @@ 
 

                 $responseType = $this->app->get('clientResponseType');

                 echo app()->resolve($this->app->get('out')->formatter())->{$responseType}($lastResult);

-            }

-            else{

+            } else{

 

                 $defaultResponseType = (is_null(config('app.response'))) ? 'json' : config('app.response');

                 echo app()->resolve($this->app->get('out')->formatter())->{$defaultResponseType}($lastResult);

             }

 

 

-        }

-        else{

+        } else{

             echo $restaOutHandle;

         }

 

src/resta/Console/Source/Controller/Controller.php

Braces +4 added lines, -8 removed lines

@@ -90,8 +90,7 @@ 
             // and as a result we print the result on the console screen.

             echo $this->classical(' > Resource Controller called as "'.$this->argument['resource'].'" has been successfully created in the '.$this->directory['resource'].'');

 

-        }

-        elseif(isset($this->argument['file']) && file_exists($this->directory['endpoint'])){

+        } elseif(isset($this->argument['file']) && file_exists($this->directory['endpoint'])){

             

 

 

@@ -106,8 +105,7 @@ 
                 files()->append($routePath,PHP_EOL.'Route::namespace(\''.$controller.'\')->put("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@update");');

                 files()->append($routePath,PHP_EOL.'Route::namespace(\''.$controller.'\')->delete("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@delete");');

 

-            }

-            else{

+            } else{

 

                 $this->touch['service/controllerfile']   = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].''. $this->argument['callClassPrefix'].'.php';

 

@@ -120,8 +118,7 @@ 
             // and as a result we print the result on the console screen.

             echo $this->classical(' > Controller called as "'.$this->argument['file'].'" has been successfully created in the '.$this->directory['endpoint'].'');

 

-        }

-        else{

+        } else{

 

             // we process the processes related to file creation operations.

             // and then create files related to the touch method of the file object as it is in the directory process.

@@ -130,8 +127,7 @@ 
                 $this->touch['service/endpointcrud']        = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''. $this->argument['callClassPrefix'].'.php';

                 $this->touch['service/routecrud']           = $routePath;

 

-            }

-            else{

+            } else{

                 $this->touch['service/endpoint']        = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''. $this->argument['callClassPrefix'].'.php';

                 $this->touch['service/route']           = $routePath;

 

Spacing +34 added lines, -34 removed lines

@@ -18,7 +18,7 @@ 
     /**

      * @var $type

      */

-    public $type='controller';

+    public $type = 'controller';

 

     /**

      * @var array

@@ -37,9 +37,9 @@ 
     /**

      * @var array

      */

-    protected $commandRule=[

+    protected $commandRule = [

         'create'    => ['controller'],

-        'rename'    => ['controller','rename'],

+        'rename'    => ['controller', 'rename'],

         'all'       => [],

     ];

 

@@ -55,7 +55,7 @@ 
 

         $this->argument['bundleName'] = $controller.''.StaticPathList::$controllerBundleName;

 

-        if(!file_exists(app()->path()->controller())){

+        if (!file_exists(app()->path()->controller())) {

             $this->directory['createController'] = app()->path()->controller();

         }

 

@@ -73,7 +73,7 @@ 
 

         $fullNamespaceForController             = $this->argument['controllerNamespace'].'\\'.$this->argument['serviceClass'].''.$this->argument['callClassPrefix'];

 

-        $this->directory['routes']       = path()->route();

+        $this->directory['routes'] = path()->route();

 

         $routePath = $this->directory['routes'].''.DIRECTORY_SEPARATOR.''.$controller.'Route.php';

 

@@ -81,9 +81,9 @@ 
         // we get to the service directory, which is called the controller.

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

 

-        if(isset($this->argument['resource']) && file_exists($this->directory['endpoint'])){

+        if (isset($this->argument['resource']) && file_exists($this->directory['endpoint'])) {

 

-            $this->touch['service/resource']   = $this->directory['resource'].''.DIRECTORY_SEPARATOR.''.$this->argument['resource'].'.php';

+            $this->touch['service/resource'] = $this->directory['resource'].''.DIRECTORY_SEPARATOR.''.$this->argument['resource'].'.php';

 

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

 

@@ -91,33 +91,33 @@ 
             echo $this->classical(' > Resource Controller called as "'.$this->argument['resource'].'" has been successfully created in the '.$this->directory['resource'].'');

 

         }

-        elseif(isset($this->argument['file']) && file_exists($this->directory['endpoint'])){

+        elseif (isset($this->argument['file']) && file_exists($this->directory['endpoint'])) {

             

 

 

-            if(isset($this->argument['type']) && $this->argument['type']=='Crud'){

+            if (isset($this->argument['type']) && $this->argument['type']=='Crud') {

 

-                $this->touch['service/controllerfilecrud']   = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].''. $this->argument['callClassPrefix'].'.php';

+                $this->touch['service/controllerfilecrud'] = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].''.$this->argument['callClassPrefix'].'.php';

 

-                $this->file->touch($this,[

+                $this->file->touch($this, [

                     'stub'=>'Controller_Create'

                 ]);

 

-                files()->append($routePath,PHP_EOL.'Route::namespace(\''.$controller.'\')->get("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@get");');

-                files()->append($routePath,PHP_EOL.'Route::namespace(\''.$controller.'\')->post("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@create");');

-                files()->append($routePath,PHP_EOL.'Route::namespace(\''.$controller.'\')->put("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@update");');

-                files()->append($routePath,PHP_EOL.'Route::namespace(\''.$controller.'\')->delete("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@delete");');

+                files()->append($routePath, PHP_EOL.'Route::namespace(\''.$controller.'\')->get("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@get");');

+                files()->append($routePath, PHP_EOL.'Route::namespace(\''.$controller.'\')->post("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@create");');

+                files()->append($routePath, PHP_EOL.'Route::namespace(\''.$controller.'\')->put("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@update");');

+                files()->append($routePath, PHP_EOL.'Route::namespace(\''.$controller.'\')->delete("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@delete");');

 

             }

-            else{

+            else {

 

-                $this->touch['service/controllerfile']   = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].''. $this->argument['callClassPrefix'].'.php';

+                $this->touch['service/controllerfile'] = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].''.$this->argument['callClassPrefix'].'.php';

 

-                $this->file->touch($this,[

+                $this->file->touch($this, [

                     'stub'=>'Controller_Create'

                 ]);

 

-                files()->append($routePath,PHP_EOL.'Route::namespace(\''.$controller.'\')->get("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@index");');

+                files()->append($routePath, PHP_EOL.'Route::namespace(\''.$controller.'\')->get("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@index");');

 

             }

 

@@ -127,18 +127,18 @@ 
             echo $this->classical(' > Controller called as "'.$this->argument['file'].'" has been successfully created in the '.$this->directory['endpoint'].'');

 

         }

-        else{

+        else {

 

             // we process the processes related to file creation operations.

             // and then create files related to the touch method of the file object as it is in the directory process.

             

-            if(isset($this->argument['type']) && $this->argument['type']=='Crud'){

-                $this->touch['service/endpointcrud']        = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''. $this->argument['callClassPrefix'].'.php';

+            if (isset($this->argument['type']) && $this->argument['type']=='Crud') {

+                $this->touch['service/endpointcrud']        = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''.$this->argument['callClassPrefix'].'.php';

                 $this->touch['service/routecrud']           = $routePath;

 

             }

-            else{

-                $this->touch['service/endpoint']        = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''. $this->argument['callClassPrefix'].'.php';

+            else {

+                $this->touch['service/endpoint']        = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''.$this->argument['callClassPrefix'].'.php';

                 $this->touch['service/route']           = $routePath;

 

             }

@@ -150,9 +150,9 @@ 
             $this->touch['service/dummy']           = $this->directory['configuration'].''.DIRECTORY_SEPARATOR.'Dummy.yaml';

             $this->touch['service/doc']             = $this->directory['configuration'].''.DIRECTORY_SEPARATOR.'Doc.yaml';

             $this->touch['service/readme']          = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.'README.md';

-            $this->touch['service/policy']          = $this->directory['policy'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''. $this->argument['callClassPrefix'].'Policy.php';

+            $this->touch['service/policy']          = $this->directory['policy'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''.$this->argument['callClassPrefix'].'Policy.php';

 

-            $this->file->touch($this,[

+            $this->file->touch($this, [

                 'stub'=>'Controller_Create'

             ]);

 

@@ -176,24 +176,24 @@ 
     {

         $path = path()->controller().'/'.$this->argument['controller'].''.StaticPathList::$controllerBundleName;

 

-        if(file_exists($path)){

+        if (file_exists($path)) {

 

-            $newPathName = str_replace($this->argument['controller'],$this->argument['rename'],$path);

+            $newPathName = str_replace($this->argument['controller'], $this->argument['rename'], $path);

 

 

-            rename($path,$newPathName);

+            rename($path, $newPathName);

 

             $getAllFiles = files()->getAllFilesInDirectory($newPathName);

 

-            $getPathWithPhpExtensions = Utils::getPathWithPhpExtension($getAllFiles,$newPathName);

+            $getPathWithPhpExtensions = Utils::getPathWithPhpExtension($getAllFiles, $newPathName);

 

-            foreach ($getPathWithPhpExtensions as $getPathWithPhpExtension){

+            foreach ($getPathWithPhpExtensions as $getPathWithPhpExtension) {

 

-                $withoutFullPath = str_replace($newPathName,"",$getPathWithPhpExtension);

+                $withoutFullPath = str_replace($newPathName, "", $getPathWithPhpExtension);

 

                 $newName = $newPathName."".preg_replace("((.*)".$this->argument['controller'].")", "$1".$this->argument['rename'], $withoutFullPath);

 

-                rename($getPathWithPhpExtension,$newName);

+                rename($getPathWithPhpExtension, $newName);

 

                 Utils::changeClass($newName,

                     [

@@ -212,7 +212,7 @@ 
      */

     private function docUpdate()

     {

-        $docPath = $this->directory['configuration'] .'/Doc.yaml';

+        $docPath = $this->directory['configuration'].'/Doc.yaml';

 

         $doc = Utils::yaml($docPath);

 

src/resta/Support/Arr.php

Spacing +45 added lines, -45 removed lines

@@ -45,7 +45,7 @@ 
         foreach ($array as $values) {

             if ($values instanceof Collection) {

                 $values = $values->all();

-            } elseif (! is_array($values)) {

+            } elseif (!is_array($values)) {

                 continue;

             }

             $results = array_merge($results, $values);

@@ -94,7 +94,7 @@ 
     {

         $results = [];

         foreach ($array as $key => $value) {

-            if (is_array($value) && ! empty($value)) {

+            if (is_array($value) && !empty($value)) {

                 $results = array_merge($results, static::dot($value, $prepend.$key.'.'));

             } else {

                 $results[$prepend.$key] = $value;

@@ -180,12 +180,12 @@ 
         $result = [];

         foreach ($array as $item) {

             $item = $item instanceof Collection ? $item->all() : $item;

-            if (! is_array($item)) {

+            if (!is_array($item)) {

                 $result[] = $item;

-            } elseif ($depth === 1) {

+            } elseif ($depth===1) {

                 $result = array_merge($result, array_values($item));

             } else {

-                $result = array_merge($result, static::flatten($item, $depth - 1));

+                $result = array_merge($result, static::flatten($item, $depth-1));

             }

         }

         return $result;

@@ -200,8 +200,8 @@ 
     public static function forget(&$array, $keys)

     {

         $original = &$array;

-        $keys = (array) $keys;

-        if (count($keys) === 0) {

+        $keys = (array)$keys;

+        if (count($keys)===0) {

             return;

         }

         foreach ($keys as $key) {

@@ -213,7 +213,7 @@ 
             $parts = explode('.', $key);

             // clean up before each pass

             $array = &$original;

-            while (count($parts) > 1) {

+            while (count($parts)>1) {

                 $part = array_shift($parts);

                 if (isset($array[$part]) && is_array($array[$part])) {

                     $array = &$array[$part];

@@ -234,7 +234,7 @@ 
      */

     public static function get($array, $key, $default = null)

     {

-        if (! static::accessible($array)) {

+        if (!static::accessible($array)) {

             return value($default);

         }

         if (is_null($key)) {

@@ -243,7 +243,7 @@ 
         if (static::exists($array, $key)) {

             return $array[$key];

         }

-        if (strpos($key, '.') === false) {

+        if (strpos($key, '.')===false) {

             return $array[$key] ?? value($default);

         }

         foreach (explode('.', $key) as $segment) {

@@ -267,11 +267,11 @@ 
         if (is_null($keys)) {

             return false;

         }

-        $keys = (array) $keys;

-        if (! $array) {

+        $keys = (array)$keys;

+        if (!$array) {

             return false;

         }

-        if ($keys === []) {

+        if ($keys===[]) {

             return false;

         }

         foreach ($keys as $key) {

@@ -300,7 +300,7 @@ 
     public static function isAssoc(array $array)

     {

         $keys = array_keys($array);

-        return array_keys($keys) !== $keys;

+        return array_keys($keys)!==$keys;

     }

     /**

      * Get a subset of the items from the given array.

@@ -311,7 +311,7 @@ 
      */

     public static function only($array, $keys)

     {

-        return array_intersect_key($array, array_flip((array) $keys));

+        return array_intersect_key($array, array_flip((array)$keys));

     }

     /**

      * Pluck an array of values from an array.

@@ -335,7 +335,7 @@ 
             } else {

                 $itemKey = data_get($item, $key);

                 if (is_object($itemKey) && method_exists($itemKey, '__toString')) {

-                    $itemKey = (string) $itemKey;

+                    $itemKey = (string)$itemKey;

                 }

                 $results[$itemKey] = $itemValue;

             }

@@ -368,7 +368,7 @@ 
         if (is_null($key)) {

             array_unshift($array, $value);

         } else {

-            $array = [$key => $value] + $array;

+            $array = [$key => $value]+$array;

         }

         return $array;

     }

@@ -399,7 +399,7 @@ 
     {

         $requested = is_null($number) ? 1 : $number;

         $count = count($array);

-        if ($requested > $count) {

+        if ($requested>$count) {

             throw new InvalidArgumentException(

                 "You requested {$requested} items, but there are only {$count} items available."

             );

@@ -407,12 +407,12 @@ 
         if (is_null($number)) {

             return $array[array_rand($array)];

         }

-        if ((int) $number === 0) {

+        if ((int)$number===0) {

             return [];

         }

         $keys = array_rand($array, $number);

         $results = [];

-        foreach ((array) $keys as $key) {

+        foreach ((array)$keys as $key) {

             $results[] = $array[$key];

         }

         return $results;

@@ -433,12 +433,12 @@ 
             return $array = $value;

         }

         $keys = explode('.', $key);

-        while (count($keys) > 1) {

+        while (count($keys)>1) {

             $key = array_shift($keys);

             // If the key doesn't exist at this depth, we will just create an empty array

             // to hold the next value, allowing us to create the arrays to hold final

             // values at the correct depth. Then we'll keep digging into the array.

-            if (! isset($array[$key]) || ! is_array($array[$key])) {

+            if (!isset($array[$key]) || !is_array($array[$key])) {

                 $array[$key] = [];

             }

             $array = &$array[$key];

@@ -459,7 +459,7 @@ 
             shuffle($array);

         } else {

             srand($seed);

-            usort($array, function () {

+            usort($array, function() {

                 return rand(-1, 1);

             });

         }

@@ -536,16 +536,16 @@ 
      * @param array $referenceArray

      * @return array

      */

-    public static function removeSameValues($removeArray=array(),$referenceArray=array())

+    public static function removeSameValues($removeArray = array(), $referenceArray = array())

     {

         $list = [];

 

-        foreach ($removeArray as $remove){

-            if(!in_array($remove,$referenceArray)){

-                $list[]=$remove;

+        foreach ($removeArray as $remove) {

+            if (!in_array($remove, $referenceArray)) {

+                $list[] = $remove;

             }

         }

-        return array_merge($referenceArray,$list);

+        return array_merge($referenceArray, $list);

     }

 

     /**

@@ -553,9 +553,9 @@ 
      * @param $key

      * @return null

      */

-    public static function isset($array,$key)

+    public static function isset($array, $key)

     {

-        if(isset($array[$key])){

+        if (isset($array[$key])) {

             return $array[$key];

         }

         return null;

@@ -566,13 +566,13 @@ 
      * @param null $withKey

      * @return bool

      */

-    public static function isArrayWithCount($array,$withKey=null)

+    public static function isArrayWithCount($array, $withKey = null)

     {

-        if($withKey===null){

+        if ($withKey===null) {

             return is_array($array) && count($array);

         }

 

-        return isset($array[$withKey]) && self::isArrayWithCount($array[$withKey],null);

+        return isset($array[$withKey]) && self::isArrayWithCount($array[$withKey], null);

     }

 

     /**

@@ -580,12 +580,12 @@ 
      * @param $array2

      * @return int

      */

-    public static function arrayDiffKey($array1,$array2)

+    public static function arrayDiffKey($array1, $array2)

     {

-        $forArray1 = array_diff_key($array1,$array2);

-        $forArray2 = array_diff_key($array2,$array1);

+        $forArray1 = array_diff_key($array1, $array2);

+        $forArray2 = array_diff_key($array2, $array1);

 

-        if(count($forArray1)=="0" && count($forArray2)=="0"){

+        if (count($forArray1)=="0" && count($forArray2)=="0") {

             return true;

         }

         return false;

@@ -597,12 +597,12 @@ 
      * @param $original

      * @param array $overwrite

      */

-    public static function overwriteWith($original,$overwrite=array())

+    public static function overwriteWith($original, $overwrite = array())

     {

-        foreach ($original as $key=>$item){

+        foreach ($original as $key=>$item) {

 

-            if(array_key_exists($key,$overwrite)){

-                array_splice($original,$key,0,$overwrite[$key]);

+            if (array_key_exists($key, $overwrite)) {

+                array_splice($original, $key, 0, $overwrite[$key]);

             }

         }

 

@@ -616,12 +616,12 @@ 
      * @param array $remove

      * @return array

      */

-    public static function removeKey($data,$remove=array())

+    public static function removeKey($data, $remove = array())

     {

         $list = [];

 

-        foreach($data as $key=>$value){

-            if(!in_array($key,$remove)){

+        foreach ($data as $key=>$value) {

+            if (!in_array($key, $remove)) {

                 $list[$key] = $value;

             }

         }

@@ -634,7 +634,7 @@ 
      * @param $key

      * @param $value

      */

-    public static function setNested($data=array(),$key,$value)

+    public static function setNested($data = array(), $key, $value)

     {

         dd($data);

     }

src/resta/Support/ArraySafe.php

Spacing +47 added lines, -47 removed lines

@@ -15,7 +15,7 @@ 
      *
      * @param array $data
      */
-    public function __construct( array $data = [] )
+    public function __construct(array $data = [])
     {
         $this->data = $data;
     }
@@ -26,16 +26,16 @@ 
      *
      * @return array|mixed|null
      */
-    public function safeGet( array $target, $indices )
+    public function safeGet(array $target, $indices)
     {
         $movingTarget = $target;
 
-        foreach ( $indices as $index )
+        foreach ($indices as $index)
         {
-            $isArray = is_array( $movingTarget ) || $movingTarget instanceof ArrayAccess;
-            if ( ! $isArray || ! isset( $movingTarget[ $index ] ) ) return NULL;
+            $isArray = is_array($movingTarget) || $movingTarget instanceof ArrayAccess;
+            if (!$isArray || !isset($movingTarget[$index])) return NULL;
 
-            $movingTarget = $movingTarget[ $index ];
+            $movingTarget = $movingTarget[$index];
         }
 
         return $movingTarget;
@@ -46,9 +46,9 @@ 
      *
      * @return array|mixed|null
      */
-    public function getKeys( array $keys )
+    public function getKeys(array $keys)
     {
-        return static::safeGet( $this->data, $keys );
+        return static::safeGet($this->data, $keys);
     }
 
     /**
@@ -60,9 +60,9 @@ 
      *
      * @return array|mixed|null
      */
-    public function get( $accessString )
+    public function get($accessString)
     {
-        return $this->getKeys( $this->parseDotNotation( $accessString ) );
+        return $this->getKeys($this->parseDotNotation($accessString));
     }
 
     /**
@@ -71,29 +71,29 @@ 
      *
      * @return $this
      */
-    public function set( $propString, $value )
+    public function set($propString, $value)
     {
         $movingTarget = &$this->data;
-        $keys         = $this->parseDotNotation( $propString );
-        $length       = count( $keys );
+        $keys         = $this->parseDotNotation($propString);
+        $length       = count($keys);
 
-        foreach ( $keys as $i => $key )
+        foreach ($keys as $i => $key)
         {
-            $lastKey = $i === $length - 1;
-            $isset   = isset( $movingTarget[ $key ] );
+            $lastKey = $i===$length-1;
+            $isset   = isset($movingTarget[$key]);
 
-            if ( $isset && ! $lastKey && ! is_array( $movingTarget[ $key ] ) )
+            if ($isset && !$lastKey && !is_array($movingTarget[$key]))
             {
-                throw new InvalidArgumentException( sprintf(
+                throw new InvalidArgumentException(sprintf(
                     "Attempted to set/access the property %s like an array, but is of type: %s",
                     $key,
-                    gettype( $movingTarget[ $key ] )
-                ) );
+                    gettype($movingTarget[$key])
+                ));
             }
 
-            if ( ! $isset || ! is_array( $movingTarget[ $key ] ) ) $movingTarget[ $key ] = [];
+            if (!$isset || !is_array($movingTarget[$key])) $movingTarget[$key] = [];
 
-            $movingTarget = &$movingTarget[ $key ];
+            $movingTarget = &$movingTarget[$key];
         }
 
         $movingTarget = $value;
@@ -106,9 +106,9 @@ 
      *
      * @return array
      */
-    protected function parseDotNotation( $string )
+    protected function parseDotNotation($string)
     {
-        return explode( '.', strval( $string ) );
+        return explode('.', strval($string));
     }
 
     /**
@@ -125,9 +125,9 @@ 
      *
      * @return string
      */
-    public function toJson( $options = 0, $depth = 512 )
+    public function toJson($options = 0, $depth = 512)
     {
-        return json_encode( $this, $options, $depth );
+        return json_encode($this, $options, $depth);
     }
 
     /**
@@ -135,9 +135,9 @@ 
      *
      * @return static
      */
-    public static function newFromArray( array $data )
+    public static function newFromArray(array $data)
     {
-        return new static( $data );
+        return new static($data);
     }
 
     /**
@@ -145,9 +145,9 @@ 
      *
      * @return static
      */
-    public static function newFromStdObject( \stdClass $data )
+    public static function newFromStdObject(\stdClass $data)
     {
-        return new static( json_decode( json_encode( $data ), TRUE ) );
+        return new static(json_decode(json_encode($data), TRUE));
     }
 
     /**
@@ -176,17 +176,17 @@ 
      * The return value will be casted to boolean if non-boolean was returned.
      * @since 5.0.0
      */
-    public function offsetExists( $offset )
+    public function offsetExists($offset)
     {
         $movingTarget = $this->data;
 
-        foreach ( $this->parseDotNotation( $offset ) as $i )
+        foreach ($this->parseDotNotation($offset) as $i)
         {
-            if ( ! isset( $movingTarget[ $i ] ) ) return FALSE;
-            $movingTarget = $movingTarget[ $i ];
+            if (!isset($movingTarget[$i])) return FALSE;
+            $movingTarget = $movingTarget[$i];
         }
 
-        return isset( $movingTarget );
+        return isset($movingTarget);
     }
 
     /**
@@ -200,9 +200,9 @@ 
      * @return mixed Can return all value types.
      * @since 5.0.0
      */
-    public function offsetGet( $offset )
+    public function offsetGet($offset)
     {
-        return $this->get( $offset );
+        return $this->get($offset);
     }
 
     /**
@@ -219,9 +219,9 @@ 
      * @return void
      * @since 5.0.0
      */
-    public function offsetSet( $offset, $value )
+    public function offsetSet($offset, $value)
     {
-        $this->set( $offset, $value );
+        $this->set($offset, $value);
     }
 
     /**
@@ -235,21 +235,21 @@ 
      * @return void
      * @since 5.0.0
      */
-    public function offsetUnset( $offset )
+    public function offsetUnset($offset)
     {
         $movingTarget = &$this->data;
-        $keys         = $this->parseDotNotation( $offset );
-        $length       = count( $keys );
+        $keys         = $this->parseDotNotation($offset);
+        $length       = count($keys);
 
-        foreach ( $keys as $i => $key )
+        foreach ($keys as $i => $key)
         {
-            if ( $i === $length - 1 )
+            if ($i===$length-1)
             {
-                unset( $movingTarget[ $key ] );
+                unset($movingTarget[$key]);
             }
             else
             {
-                $movingTarget = &$movingTarget[ $key ];
+                $movingTarget = &$movingTarget[$key];
             }
         }
     }
@@ -259,6 +259,6 @@ 
      */
     public function __toString()
     {
-        return json_encode( $this );
+        return json_encode($this);
     }
 }
\ No newline at end of file

Braces +10 added lines, -5 removed lines

@@ -33,7 +33,9 @@ 
         foreach ( $indices as $index )
         {
             $isArray = is_array( $movingTarget ) || $movingTarget instanceof ArrayAccess;
-            if ( ! $isArray || ! isset( $movingTarget[ $index ] ) ) return NULL;
+            if ( ! $isArray || ! isset( $movingTarget[ $index ] ) ) {

+                return NULL;

+            }

 
             $movingTarget = $movingTarget[ $index ];
         }
@@ -91,7 +93,9 @@ 
                 ) );
             }
 
-            if ( ! $isset || ! is_array( $movingTarget[ $key ] ) ) $movingTarget[ $key ] = [];
+            if ( ! $isset || ! is_array( $movingTarget[ $key ] ) ) {

+                $movingTarget[ $key ] = [];

+            }

 
             $movingTarget = &$movingTarget[ $key ];
         }
@@ -182,7 +186,9 @@ 
 
         foreach ( $this->parseDotNotation( $offset ) as $i )
         {
-            if ( ! isset( $movingTarget[ $i ] ) ) return FALSE;
+            if ( ! isset( $movingTarget[ $i ] ) ) {

+                return FALSE;

+            }

             $movingTarget = $movingTarget[ $i ];
         }
 
@@ -246,8 +252,7 @@ 
             if ( $i === $length - 1 )
             {
                 unset( $movingTarget[ $key ] );
-            }
-            else
+            } else
             {
                 $movingTarget = &$movingTarget[ $key ];
             }

src/resta/Support/FileSystem.php

Spacing +22 added lines, -22 removed lines

@@ -130,7 +130,7 @@ 
         $path = realpath($path) ?: $path;
         $tempPath = tempnam(dirname($path), basename($path));
         // Fix permissions of tempPath because `tempnam()` creates it with permissions set to 0600...
-        chmod($tempPath, 0777 - umask());
+        chmod($tempPath, 0777-umask());
         file_put_contents($tempPath, $content);
         rename($tempPath, $path);
     }
@@ -189,7 +189,7 @@ 
         $success = true;
         foreach ($paths as $path) {
             try {
-                if (! @unlink($path)) {
+                if (!@unlink($path)) {
                     $success = false;
                 }
             } catch (ErrorException $e) {
@@ -232,7 +232,7 @@ 
      */
     public function link($target, $link)
     {
-        if (! windows_os()) {
+        if (!windows_os()) {
             return symlink($target, $link);
         }
         $mode = $this->isDirectory($target) ? 'J' : 'H';
@@ -393,7 +393,7 @@ 
     public function files($directory, $hidden = false)
     {
         return iterator_to_array(
-            Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory)->depth(0)->sortByName(),
+            Finder::create()->files()->ignoreDotFiles(!$hidden)->in($directory)->depth(0)->sortByName(),
             false
         );
     }
@@ -408,7 +408,7 @@ 
     public function allFiles($directory, $hidden = false)
     {
         return iterator_to_array(
-            Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory)->sortByName(),
+            Finder::create()->files()->ignoreDotFiles(!$hidden)->in($directory)->sortByName(),
             false
         );
     }
@@ -455,10 +455,10 @@ 
      */
     public function moveDirectory($from, $to, $overwrite = false)
     {
-        if ($overwrite && $this->isDirectory($to) && ! $this->deleteDirectory($to)) {
+        if ($overwrite && $this->isDirectory($to) && !$this->deleteDirectory($to)) {
             return false;
         }
-        return @rename($from, $to) === true;
+        return @rename($from, $to)===true;
     }
 
     /**
@@ -471,14 +471,14 @@ 
      */
     public function copyDirectory($directory, $destination, $options = null)
     {
-        if (! $this->isDirectory($directory)) {
+        if (!$this->isDirectory($directory)) {
             return false;
         }
         $options = $options ?: FilesystemIterator::SKIP_DOTS;
         // If the destination directory does not actually exist, we will go ahead and
         // create it recursively, which just gets the destination prepared to copy
         // the files over. Once we make the directory we'll proceed the copying.
-        if (! $this->isDirectory($destination)) {
+        if (!$this->isDirectory($destination)) {
             $this->makeDirectory($destination, 0777, true);
         }
         $items = new FilesystemIterator($directory, $options);
@@ -489,7 +489,7 @@ 
             $target = $destination.'/'.$item->getBasename();
             if ($item->isDir()) {
                 $path = $item->getPathname();
-                if (! $this->copyDirectory($path, $target, $options)) {
+                if (!$this->copyDirectory($path, $target, $options)) {
                     return false;
                 }
             }
@@ -497,7 +497,7 @@ 
             // location and keep looping. If for some reason the copy fails we'll bail out
             // and return false, so the developer is aware that the copy process failed.
             else {
-                if (! $this->copy($item->getPathname(), $target)) {
+                if (!$this->copy($item->getPathname(), $target)) {
                     return false;
                 }
             }
@@ -516,7 +516,7 @@ 
      */
     public function deleteDirectory($directory, $preserve = false)
     {
-        if (! $this->isDirectory($directory)) {
+        if (!$this->isDirectory($directory)) {
             return false;
         }
         $items = new FilesystemIterator($directory);
@@ -524,7 +524,7 @@ 
             // If the item is a directory, we can just recurse into the function and
             // delete that sub-directory otherwise we'll just delete the file and
             // keep iterating through each file until the directory is cleaned.
-            if ($item->isDir() && ! $item->isLink()) {
+            if ($item->isDir() && !$item->isLink()) {
                 $this->deleteDirectory($item->getPathname());
             }
             // If the item is just a file, we can go ahead and delete it since we're
@@ -534,7 +534,7 @@ 
                 $this->delete($item->getPathname());
             }
         }
-        if (! $preserve) {
+        if (!$preserve) {
             @rmdir($directory);
         }
         return true;
@@ -549,7 +549,7 @@ 
     public function deleteDirectories($directory)
     {
         $allDirectories = $this->directories($directory);
-        if (! empty($allDirectories)) {
+        if (!empty($allDirectories)) {
             foreach ($allDirectories as $directoryName) {
                 $this->deleteDirectory($directoryName);
             }
@@ -580,17 +580,17 @@ 
      */
     public function getAllFilesInDirectory($dir, $recursive = true, $basedir = '', $include_dirs = false)
     {
-        if ($dir == '') {return array();} else {$results = array(); $subresults = array();}
-        if (!is_dir($dir)) {$dir = dirname($dir);} // so a files path can be sent
-        if ($basedir == '') {$basedir = realpath($dir).DIRECTORY_SEPARATOR;}
+        if ($dir=='') {return array(); } else {$results = array(); $subresults = array(); }
+        if (!is_dir($dir)) {$dir = dirname($dir); } // so a files path can be sent
+        if ($basedir=='') {$basedir = realpath($dir).DIRECTORY_SEPARATOR; }
 
         $files = scandir($dir);
-        foreach ($files as $key => $value){
-            if ( ($value != '.') && ($value != '..') ) {
+        foreach ($files as $key => $value) {
+            if (($value!='.') && ($value!='..')) {
                 $path = realpath($dir.DIRECTORY_SEPARATOR.$value);
                 if (is_dir($path)) {
                     // optionally include directories in file list
-                    if ($include_dirs) {$subresults[] = str_replace($basedir, '', $path);}
+                    if ($include_dirs) {$subresults[] = str_replace($basedir, '', $path); }
                     // optionally get file list for all subdirectories
                     if ($recursive) {
                         $subdirresults = $this->getAllFilesInDirectory($path, $recursive, $basedir, $include_dirs);
@@ -603,7 +603,7 @@ 
             }
         }
         // merge the subarray to give the list of files then subdirectory files
-        if (count($subresults) > 0) {$results = array_merge($subresults, $results);}
+        if (count($subresults)>0) {$results = array_merge($subresults, $results); }
         return $results;
     }
 

src/resta/Support/JsonHandler.php

Spacing +27 added lines, -27 removed lines

@@ -18,11 +18,11 @@ 
      */
     private static function checkFile()
     {
-        $filePortions = explode(DIRECTORY_SEPARATOR,self::$file);
+        $filePortions = explode(DIRECTORY_SEPARATOR, self::$file);
         $pop = array_pop($filePortions);
 
-        if(file_exists(implode(DIRECTORY_SEPARATOR,$filePortions))
-            && preg_match('@[a-zA-Z0-9]+\.json@',$pop)){
+        if (file_exists(implode(DIRECTORY_SEPARATOR, $filePortions))
+            && preg_match('@[a-zA-Z0-9]+\.json@', $pop)) {
             return self::$file;
         }
 
@@ -38,8 +38,8 @@ 
     {
         $file = self::checkFile();
 
-        if(!file_exists($file)){
-            files()->put($file,self::encode([]));
+        if (!file_exists($file)) {
+            files()->put($file, self::encode([]));
         }
     }
 
@@ -51,7 +51,7 @@ 
      */
     public static function decode($data)
     {
-        return json_decode($data,1);
+        return json_decode($data, 1);
     }
 
     /**
@@ -63,26 +63,26 @@ 
      *
      * @throws FileNotFoundException
      */
-    public static function delete($key,$arrayKey=null)
+    public static function delete($key, $arrayKey = null)
     {
         $data = self::get();
 
-        if(is_null($arrayKey)){
+        if (is_null($arrayKey)) {
 
-            if(isset($data[$key])){
+            if (isset($data[$key])) {
                 unset($data[$key]);
-                files()->put(self::checkFile(),self::encode($data),true);
+                files()->put(self::checkFile(), self::encode($data), true);
                 return true;
             }
         }
 
         // if the data to be deleted
         // in json data contains a nested array data.
-        if(!is_null($arrayKey) && is_string($arrayKey)){
+        if (!is_null($arrayKey) && is_string($arrayKey)) {
 
-            if(isset($data[$key][$arrayKey])){
+            if (isset($data[$key][$arrayKey])) {
                 unset($data[$key][$arrayKey]);
-                files()->put(self::checkFile(),self::encode($data),true);
+                files()->put(self::checkFile(), self::encode($data), true);
                 return true;
             }
         }
@@ -98,7 +98,7 @@ 
      */
     public static function encode($data)
     {
-        return json_encode($data,JSON_PRETTY_PRINT);
+        return json_encode($data, JSON_PRETTY_PRINT);
     }
 
     /**
@@ -109,13 +109,13 @@ 
      *
      * @throws FileNotFoundException
      */
-    public static function get($key=null)
+    public static function get($key = null)
     {
         self::createIfNotFileExist();
 
         $data = self::decode(files()->get(self::checkFile()));
 
-        if(is_null($key)){
+        if (is_null($key)) {
             return $data;
         }
 
@@ -132,27 +132,27 @@ 
      *
      * @throws FileNotFoundException
      */
-    public static function set($key,$value)
+    public static function set($key, $value)
     {
         self::createIfNotFileExist();
 
         $file = self::get();
 
-        $dotted = explode('.',$key);
+        $dotted = explode('.', $key);
 
-        if(count($dotted)>1){
+        if (count($dotted)>1) {
             $arrayInstance = new ArraySafe(self::get());
-            $nestedArray = $arrayInstance->set($key,$value)->toArray();
-            files()->put(self::checkFile(),self::encode($nestedArray));
+            $nestedArray = $arrayInstance->set($key, $value)->toArray();
+            files()->put(self::checkFile(), self::encode($nestedArray));
         }
-        else{
+        else {
 
-            if(isset($file[$key]) && is_array($value)){
-                $file[$key] = array_merge($file[$key],$value);
-                files()->put(self::checkFile(),self::encode($file));
+            if (isset($file[$key]) && is_array($value)) {
+                $file[$key] = array_merge($file[$key], $value);
+                files()->put(self::checkFile(), self::encode($file));
             }
-            else{
-                files()->put(self::checkFile(),self::encode(array_merge($file,[$key=>$value])));
+            else {
+                files()->put(self::checkFile(), self::encode(array_merge($file, [$key=>$value])));
             }
         }
 

Braces +2 added lines, -4 removed lines

@@ -144,14 +144,12 @@
             $arrayInstance = new ArraySafe(self::get());
             $nestedArray = $arrayInstance->set($key,$value)->toArray();
             files()->put(self::checkFile(),self::encode($nestedArray));
-        }
-        else{
+        } else{
 
             if(isset($file[$key]) && is_array($value)){
                 $file[$key] = array_merge($file[$key],$value);
                 files()->put(self::checkFile(),self::encode($file));
-            }
-            else{
+            } else{
                 files()->put(self::checkFile(),self::encode(array_merge($file,[$key=>$value])));
             }
         }

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

@@ -56,25 +56,25 @@ 
 

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

 

-        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';

             

         }

 

-        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';

         }

 

@@ -88,13 +88,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)

@@ -125,11 +125,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/Console/Source/Model/Model.php

Spacing +18 added lines, -18 removed lines

@@ -15,7 +15,7 @@ 
     /**

      * @var $type

      */

-    public $type='model';

+    public $type = 'model';

 

     /**

      * @var array

@@ -32,17 +32,17 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=['model','?table'];

+    public $commandRule = ['model', '?table'];

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

         $this->argument['file'] = $this->argument['model'];

 

-        if(!isset($this->argument['table'])){

+        if (!isset($this->argument['table'])) {

             $this->argument['table'] = $this->argument['file'].'s';

         }

 

@@ -51,7 +51,7 @@ 
 

         $this->directory['modelDir']    = app()->path()->model();

         $this->directory['builderDir']  = $this->directory['modelDir'].'/Builder';

-        $this->directory['builderAssistantDir']  = $this->directory['modelDir'].'/Builder/Assistant';

+        $this->directory['builderAssistantDir'] = $this->directory['modelDir'].'/Builder/Assistant';

         $this->directory['contract']    = $this->directory['modelDir'].'/Contract';

         $this->directory['helper']      = $this->directory['modelDir'].'/Helper';

 

@@ -66,14 +66,14 @@ 
         //model set

         $this->touch['model/model']     = $this->directory['modelDir'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].'.php';

         $this->touch['model/builder']   = $this->directory['builderDir'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].'Builder.php';

-        $this->touch['model/builderasistant']   = $this->directory['builderAssistantDir'].''.DIRECTORY_SEPARATOR.'Builder.php';

+        $this->touch['model/builderasistant'] = $this->directory['builderAssistantDir'].''.DIRECTORY_SEPARATOR.'Builder.php';

         $this->touch['model/contract']  = $this->directory['contract'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].'Contract.php';

 

-        if(!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Scope.php')){

+        if (!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Scope.php')) {

             $this->touch['model/scope'] = $this->directory['helper'].''.DIRECTORY_SEPARATOR.'Scope.php';

         }

 

-        if(!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Event.php')){

+        if (!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Event.php')) {

             $this->touch['model/event'] = $this->directory['helper'].''.DIRECTORY_SEPARATOR.'Event.php';

         }

 

@@ -81,7 +81,7 @@ 
 

         $entityDir = $this->directory['modelDir'].''.DIRECTORY_SEPARATOR.'Entity';

 

-        if(!file_exists($entityDir)){

+        if (!file_exists($entityDir)) {

             files()->makeDirectory($entityDir);

         }

 

@@ -90,9 +90,9 @@ 
         $entityClass = $entityDir.''.DIRECTORY_SEPARATOR.''.$entityTableName.''.DIRECTORY_SEPARATOR.''.$entityTableName;

 

 

-        $generator = new Generator($entityDir,'EntityMap');

+        $generator = new Generator($entityDir, 'EntityMap');

 

-        if(!file_exists($entityDir.''.DIRECTORY_SEPARATOR.'EntityMap.php')){

+        if (!file_exists($entityDir.''.DIRECTORY_SEPARATOR.'EntityMap.php')) {

 

             //$this->setAnnotations();

             $generator->createClass();

@@ -102,7 +102,7 @@ 
 

         $entityMapNamespaceResolve = new $entityMapNamespace;

 

-        if(!method_exists($entityMapNamespaceResolve,strtolower($this->argument['table']))){

+        if (!method_exists($entityMapNamespaceResolve, strtolower($this->argument['table']))) {

 

             $generator->createClassUse([

                 Utils::getNamespace($entityClass)

@@ -132,15 +132,15 @@ 
 

 

         //set builder map

-        $generator = new Generator($this->directory['builderDir'],'BuilderMap');

+        $generator = new Generator($this->directory['builderDir'], 'BuilderMap');

 

-        if(!file_exists($this->directory['builderDir'].''.DIRECTORY_SEPARATOR.'BuilderMap.php')){

+        if (!file_exists($this->directory['builderDir'].''.DIRECTORY_SEPARATOR.'BuilderMap.php')) {

 

             $this->setAnnotations();

             $generator->createClass();

         }

 

-        if(!file_exists($this->touch['model/model'])){

+        if (!file_exists($this->touch['model/model'])) {

 

             $generator->createMethod([

                 strtolower($this->argument['file'])

@@ -161,7 +161,7 @@ 
         }

 

         //set project touch

-        $this->file->touch($this,[

+        $this->file->touch($this, [

             'stub'=>'Model_Create'

         ]);

 

@@ -172,11 +172,11 @@ 
     /**

      * @return bool

      */

-    private function setAnnotations(){

+    private function setAnnotations() {

 

         $entityMap = app()->path()->model().''.DIRECTORY_SEPARATOR.'Entity'.DIRECTORY_SEPARATOR.'EntityMap.php';

 

-        if(file_exists($entityMap)){

+        if (file_exists($entityMap)) {

 

             Utils::changeClass(path()->serviceAnnotations().'.php',

                 [

src/resta/Support/FileProcess.php

Spacing +40 added lines, -40 removed lines

@@ -25,7 +25,7 @@ 
     /**

      * @var array

      */

-    protected $stubList=array();

+    protected $stubList = array();

 

     /**

      * FileProcess constructor.

@@ -41,10 +41,10 @@ 
      * @param $data

      * @return bool

      */

-    public function dumpFile($file,$data)

+    public function dumpFile($file, $data)

     {

         try {

-            $this->fs->dumpFile($file,$data);

+            $this->fs->dumpFile($file, $data);

             return true;

         } catch (IOExceptionInterface $exception) {

             return false;

@@ -56,21 +56,21 @@ 
      * @param bool $status

      * @return mixed

      */

-    public function makeDirectory($data,$status=false)

+    public function makeDirectory($data, $status = false)

     {

-        if($data->type=="project" && file_exists($data->project)){

+        if ($data->type=="project" && file_exists($data->project)) {

             throw new \LogicException('This Project Is Already Available');

         }

-        if(false===$status){

+        if (false===$status) {

 

-            if($data->type!=="project" && !file_exists($data->project)){

+            if ($data->type!=="project" && !file_exists($data->project)) {

                 throw new \LogicException('Project No');

             }

         }

-        foreach ($data->directory as $directory){

+        foreach ($data->directory as $directory) {

             try {

-                $this->fs->mkdir($directory,'0777');

-                chmod($directory,0777);

+                $this->fs->mkdir($directory, '0777');

+                chmod($directory, 0777);

             } catch (IOExceptionInterface $e) {

                 return "An error occurred while creating your directory at ".$e->getPath();

             }

@@ -102,25 +102,25 @@ 
      * @param $data

      * @param array $complex

      */

-    public function touch($data,$complex=array())

+    public function touch($data, $complex = array())

     {

-        $this->data=$data;

+        $this->data = $data;

 

-        if(isset($complex['stub']) && isset($this->data->argument['stub'])){

+        if (isset($complex['stub']) && isset($this->data->argument['stub'])) {

 

             $this->stubManager($complex);

         }

 

-        $execArray=(count($this->stubList)) ? $this->stubList : $this->data->touch;

+        $execArray = (count($this->stubList)) ? $this->stubList : $this->data->touch;

 

-        foreach ($execArray as $execution=>$touch){

+        foreach ($execArray as $execution=>$touch) {

 

-            if(!file_exists($touch) && $touch!==null){

+            if (!file_exists($touch) && $touch!==null) {

                 touch($touch);

 

-                $executionPath=$this->stubPath.'/'.$execution.'.stub';

-                if(file_exists($executionPath)){

-                    $this->fopenprocess($executionPath,$touch,$data);

+                $executionPath = $this->stubPath.'/'.$execution.'.stub';

+                if (file_exists($executionPath)) {

+                    $this->fopenprocess($executionPath, $touch, $data);

                 }

             }

         }

@@ -129,37 +129,37 @@ 
     /**

      * @param array $complex

      */

-    private function stubManager($complex=array())

+    private function stubManager($complex = array())

     {

-        $stubStructure      = explode("_",$complex['stub']);

+        $stubStructure      = explode("_", $complex['stub']);

         $stubStructure[]    = $this->data->argument['stub'];

 

-        $stubberDirectoryList=path()->stubs();

+        $stubberDirectoryList = path()->stubs();

 

-        foreach ($stubStructure as $stubberDirectory){

+        foreach ($stubStructure as $stubberDirectory) {

 

             $stubberDirectoryList = $stubberDirectoryList.'/'.$stubberDirectory;

 

             $this->setDirectory($stubberDirectoryList);

         }

 

-        foreach ($this->data->touch as $execution=>$executionFile){

+        foreach ($this->data->touch as $execution=>$executionFile) {

 

-            $executionArray=explode("/",$execution);

+            $executionArray = explode("/", $execution);

 

             $executionStub                      = end($executionArray).'';

             $this->stubList[$executionStub]     = $executionFile;

             $stubberFile                        = $stubberDirectoryList.'/'.$executionStub.'.stub';

 

-            $originalPath=$this->stubPath.'/'.$execution.'.stub';

+            $originalPath = $this->stubPath.'/'.$execution.'.stub';

 

-            if(!file_exists($stubberFile)){

+            if (!file_exists($stubberFile)) {

 

-                $this->fs->copy($originalPath,$stubberFile);

+                $this->fs->copy($originalPath, $stubberFile);

             }

         }

 

-        $this->stubPath=$stubberDirectoryList;

+        $this->stubPath = $stubberDirectoryList;

     }

 

 

@@ -169,16 +169,16 @@ 
      * @param $param

      * @return bool

      */

-    public function fopenprocess($executionPath,$path,$param)

+    public function fopenprocess($executionPath, $path, $param)

     {

         $dt = fopen($executionPath, "r");

         $content = fread($dt, filesize($executionPath));

         fclose($dt);

 

-        foreach ($param->argument as $key=>$value){

+        foreach ($param->argument as $key=>$value) {

 

-            $content=str_replace("__".$key."__",$value,$content);

-            $content=str_replace("__".$key."-low__",strtolower($value),$content);

+            $content = str_replace("__".$key."__", $value, $content);

+            $content = str_replace("__".$key."-low__", strtolower($value), $content);

         }

 

         $dt = fopen($path, "w");

@@ -194,14 +194,14 @@ 
      * @param $param

      * @return bool

      */

-    public function stubCopy($executionPath,$path,$param)

+    public function stubCopy($executionPath, $path, $param)

     {

         $dt = fopen($executionPath, "r");

         $content = fread($dt, filesize($executionPath));

         fclose($dt);

 

-        foreach ($param->argument as $key=>$value){

-            $content=str_replace("__".$key."__",$value,$content);

+        foreach ($param->argument as $key=>$value) {

+            $content = str_replace("__".$key."__", $value, $content);

         }

 

         $dt = fopen($path, "w");

@@ -215,9 +215,9 @@ 
      * @param null $file

      * @return mixed|null

      */

-    public function callFile($file=null)

+    public function callFile($file = null)

     {

-        if(file_exists($file)){

+        if (file_exists($file)) {

             return require_once($file);

         }

         return null;

@@ -229,9 +229,9 @@ 
      * @param null|string $file

      * @param null|string $data

      */

-    public function writeFile($file=null,$data=null)

+    public function writeFile($file = null, $data = null)

     {

-        if(!is_null($file) && !is_null($data)){

+        if (!is_null($file) && !is_null($data)) {

 

             $dt = fopen($file, "r");

             $content = fread($dt, filesize($file));