php-resta / resta-core

src/resta/Console/Source/Project/Project.php

Spacing +11 added lines, -11 removed lines

@@ -14,7 +14,7 @@ 
     /**

      * @var $type

      */

-    public $type='project';

+    public $type = 'project';

 

     /**

      * @var array

@@ -31,7 +31,7 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=[];

+    public $commandRule = [];

 

     /**

      * @method create

@@ -46,17 +46,17 @@ 
         $this->directory['projectDir']          = $this->projectPath();

         $this->argument['exceptionNamespace']   = app()->namespace()->exception();

         $this->argument['resourcePath']         = app()->path()->appResourche();

-        $this->argument['testNamespace']             = app()->namespace()->tests();

+        $this->argument['testNamespace'] = app()->namespace()->tests();

 

-        $recursiveDefaultDirectory = explode("\\",$this->argument['project']);

+        $recursiveDefaultDirectory = explode("\\", $this->argument['project']);

         $this->argument['applicationName'] = pos($recursiveDefaultDirectory);

         $recursiveDefaultDirectory[] = 'V1';

         $recursiveDefaultDirectoryList = [];

 

-        foreach (array_slice($recursiveDefaultDirectory,1) as $defaultDirectory){

+        foreach (array_slice($recursiveDefaultDirectory, 1) as $defaultDirectory) {

 

-            $recursiveDefaultDirectoryList[]=$defaultDirectory;

-            $this->directory[$defaultDirectory.'Path'] = $this->projectPath().''.implode("/",$recursiveDefaultDirectoryList);

+            $recursiveDefaultDirectoryList[] = $defaultDirectory;

+            $this->directory[$defaultDirectory.'Path'] = $this->projectPath().''.implode("/", $recursiveDefaultDirectoryList);

         }

 

         //$this->directory['optionalDir'] = $this->optional();

@@ -82,7 +82,7 @@ 
         //$this->directory['sourceDir']               = $this->sourceDir();

         //$this->directory['sourceSupportDir']        = $this->sourceSupportDir();

         //$this->directory['sourceSupportTraitDir']   = $this->sourceSupportDir().'/Traits';

-        $this->directory['exceptionDir']            = app()->path()->exception();

+        $this->directory['exceptionDir'] = app()->path()->exception();

 

         //set project directory

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

@@ -97,11 +97,11 @@ 
         $this->touch['kernel/app']                  = $this->provider().'/AppServiceProvider.php';

         $this->touch['kernel/worker']               = $this->provider().'/WorkerServiceProvider.php';

         $this->touch['kernel/exception']            = $this->provider().'/ExceptionServiceProvider.php';

-        $this->touch['kernel/cache']               = $this->provider().'/CacheServiceProvider.php';

+        $this->touch['kernel/cache'] = $this->provider().'/CacheServiceProvider.php';

         $this->touch['kernel/authenticate']         = $this->provider().'/AuthenticateServiceProvider.php';

         $this->touch['kernel/role']                 = $this->provider().'/RoleServiceProvider.php';

         $this->touch['kernel/track']                = $this->provider().'/TrackServiceProvider.php';

-        $this->touch['test/testcase']              = $this->test().'/TestCase.php';

+        $this->touch['test/testcase'] = $this->test().'/TestCase.php';

         $this->touch['kernel/consoleevent']         = $this->provider().'/ConsoleEventServiceProvider.php';

         $this->touch['middleware/authenticate']     = $this->middleware().'/Authenticate.php';

         $this->touch['middleware/ratelimit']        = $this->middleware().'/RateLimit.php';

@@ -142,7 +142,7 @@ 
         $this->touch['app/gitignore']               = $this->projectPath().'/.gitignore';

         $this->touch['app/composer']                = $this->projectPath().'/composer.json';

         $this->touch['test/index']                  = $this->storage().'/index.html';

-        $this->touch['exception/authenticate']      = $this->directory['exceptionDir'] .'/AuthenticateException.php';

+        $this->touch['exception/authenticate']      = $this->directory['exceptionDir'].'/AuthenticateException.php';

 

         //set project touch

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

src/resta/Client/ClientAnnotationManager.php

Braces +5 added lines, -10 removed lines

@@ -76,8 +76,7 @@ 
             //catch exception

             exception($this->exceptionParams[$key]['name'],$keyParams)

                 ->unexpectedValue($this->exceptionParams[$key]['name'].' input value is not valid as format ('.$data.')');

-        }

-        else{

+        } else{

             //catch exception

             exception()->unexpectedValue($key.' input value is not valid as format ('.$data.')');

         }

@@ -140,16 +139,14 @@ 
                                 }

                             }

 

-                        }

-                        else{

+                        } else{

                             if(!preg_match('@'.$regex[1].'@is',$this->inputsValue)){

                                 $this->catchException($key,$regex[1]);

                             }

                         }

 

                     }

-                }

-                else{

+                } else{

 

                     // we control the regex rule that evaluates when only string arrives.

                     if(!preg_match('@'.$regex[1].'@is',$this->inputs[$key])){

@@ -198,8 +195,7 @@ 
                         }

                     }

                 }

-            }

-            else{

+            } else{

 

                 foreach ($this->inputs[$key] as $ikey=>$input){

 

@@ -212,8 +208,7 @@ 
                                 }

                             }

                         }

-                    }

-                    else{

+                    } else{

 

                         foreach ($input as $ikey=>$item){

                             foreach($rules as $rule){

Spacing +52 added lines, -52 removed lines

@@ -25,7 +25,7 @@ 
      * @param ApplicationContracts $app

      * @param $request

      */

-    public function __construct(ApplicationContracts $app,$request)

+    public function __construct(ApplicationContracts $app, $request)

     {

         parent::__construct($app);

 

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

      * @return mixed|void

      */

-    public function annotation($method,$key)

+    public function annotation($method, $key)

     {

         //set annotation value with getting reflection

         $reflection = $this->getReflection('reflection')->reflectionMethodParams($method);

@@ -66,18 +66,18 @@ 
      * @param string $key

      * @param null|string $data

      */

-    private function catchException($key,$data)

+    private function catchException($key, $data)

     {

-        if(isset($this->exceptionParams[$key])){

+        if (isset($this->exceptionParams[$key])) {

 

             //get key params for exception params

             $keyParams = ($this->exceptionParams[$key]['params']) ?? [];

 

             //catch exception

-            exception($this->exceptionParams[$key]['name'],$keyParams)

+            exception($this->exceptionParams[$key]['name'], $keyParams)

                 ->unexpectedValue($this->exceptionParams[$key]['name'].' input value is not valid as format ('.$data.')');

         }

-        else{

+        else {

             //catch exception

             exception()->unexpectedValue($key.' input value is not valid as format ('.$data.')');

         }

@@ -90,23 +90,23 @@ 
      */

     private function getException($key)

     {

-        if(preg_match('@exception\((.*?)\)\r\n@is',$this->annotation,$exception)){

+        if (preg_match('@exception\((.*?)\)\r\n@is', $this->annotation, $exception)) {

 

-            $exceptionSpaceExplode = explode(" ",$exception[1]);

+            $exceptionSpaceExplode = explode(" ", $exception[1]);

 

-            foreach ($exceptionSpaceExplode as $exceptions){

-                $exceptionsDotExplode = explode(":",$exceptions);

+            foreach ($exceptionSpaceExplode as $exceptions) {

+                $exceptionsDotExplode = explode(":", $exceptions);

                 $this->exceptionParams[$key][$exceptionsDotExplode[0]] = $exceptionsDotExplode[1];

             }

 

-            if(isset($this->exceptionParams[$key]['params'])){

+            if (isset($this->exceptionParams[$key]['params'])) {

 

-                $paramsCommaExplode = explode(",",$this->exceptionParams[$key]['params']);

+                $paramsCommaExplode = explode(",", $this->exceptionParams[$key]['params']);

                 unset($this->exceptionParams[$key]['params']);

 

-                foreach ($paramsCommaExplode as $params){

-                    $paramsEqualExplode = explode("=",$params);

-                    if(isset($paramsEqualExplode[0]) && isset($paramsEqualExplode[1])){

+                foreach ($paramsCommaExplode as $params) {

+                    $paramsEqualExplode = explode("=", $params);

+                    if (isset($paramsEqualExplode[0]) && isset($paramsEqualExplode[1])) {

                         $this->exceptionParams[$key]['params'][$paramsEqualExplode[0]] = $paramsEqualExplode[1];

                     }

                 }

@@ -123,37 +123,37 @@ 
     {

         // with the method based regex annotation,

         // we check the rule definition for our requests.

-        if(preg_match('@regex\((.*?)\)\r\n@is',$this->annotation,$regex)){

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

+        if (preg_match('@regex\((.*?)\)\r\n@is', $this->annotation, $regex)) {

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

 

                 // for the definition of rules,

                 // our inputs can be array and in this case we offer array option for user comfort.

-                if(is_array($this->inputs[$key])){

+                if (is_array($this->inputs[$key])) {

 

-                    foreach ($this->inputs[$key] as $this->inputsKey => $this->inputsValue){

+                    foreach ($this->inputs[$key] as $this->inputsKey => $this->inputsValue) {

 

-                        if(is_array($this->inputsValue)){

+                        if (is_array($this->inputsValue)) {

 

-                            foreach ($this->inputsValue as $inputsValueKey => $inputsValueItem){

-                                if(!preg_match('@'.$regex[1].'@is',$inputsValueItem)){

-                                    $this->catchException($key,$regex[1]);

+                            foreach ($this->inputsValue as $inputsValueKey => $inputsValueItem) {

+                                if (!preg_match('@'.$regex[1].'@is', $inputsValueItem)) {

+                                    $this->catchException($key, $regex[1]);

                                 }

                             }

 

                         }

-                        else{

-                            if(!preg_match('@'.$regex[1].'@is',$this->inputsValue)){

-                                $this->catchException($key,$regex[1]);

+                        else {

+                            if (!preg_match('@'.$regex[1].'@is', $this->inputsValue)) {

+                                $this->catchException($key, $regex[1]);

                             }

                         }

 

                     }

                 }

-                else{

+                else {

 

                     // we control the regex rule that evaluates when only string arrives.

-                    if(!preg_match('@'.$regex[1].'@is',$this->inputs[$key])){

-                        $this->catchException($key,$regex[1]);

+                    if (!preg_match('@'.$regex[1].'@is', $this->inputs[$key])) {

+                        $this->catchException($key, $regex[1]);

                     }

                 }

             }

@@ -168,9 +168,9 @@ 
      */

     private function getRemove($key)

     {

-        if(preg_match('@remove\((.*?)\)\r\n@is',$this->annotation,$remove)){

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

-                if(preg_match('@'.$remove[1].'@is',$this->inputs[$key])){

+        if (preg_match('@remove\((.*?)\)\r\n@is', $this->annotation, $remove)) {

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

+                if (preg_match('@'.$remove[1].'@is', $this->inputs[$key])) {

                     unset($this->inputs[$key]);

                 }

             }

@@ -184,42 +184,42 @@ 
      */

     private function getRules($key)

     {

-        if(preg_match('@rule\((.*?)\)|rule\((.*?)\)\r\n@is',$this->annotation,$rule)){

+        if (preg_match('@rule\((.*?)\)|rule\((.*?)\)\r\n@is', $this->annotation, $rule)) {

 

             $requestRules = $this->getReflection('rules');

 

-            $rules = explode(":",$rule[1]);

-            if(isset($this->inputs[$key]) && !is_array($this->inputs[$key])){

-                foreach($rules as $rule){

-                    if(isset($requestRules[$rule])){

-                        if(!preg_match('@'.$requestRules[$rule].'@',$this->inputs[$key])){

-                            exception($rule,['key'=>$key.':'.$this->inputs[$key]])

+            $rules = explode(":", $rule[1]);

+            if (isset($this->inputs[$key]) && !is_array($this->inputs[$key])) {

+                foreach ($rules as $rule) {

+                    if (isset($requestRules[$rule])) {

+                        if (!preg_match('@'.$requestRules[$rule].'@', $this->inputs[$key])) {

+                            exception($rule, ['key'=>$key.':'.$this->inputs[$key]])

                                 ->invalidArgument($key.':'.$this->inputs[$key].' input value is not valid for '.$rule.' request rule');

                         }

                     }

                 }

             }

-            else{

+            else {

 

-                foreach ($this->inputs[$key] as $ikey=>$input){

+                foreach ($this->inputs[$key] as $ikey=>$input) {

 

-                    if(!is_array($input)){

-                        foreach($rules as $rule){

-                            if(isset($requestRules[$rule])){

-                                if(!preg_match('@'.$requestRules[$rule].'@',$input)){

-                                    exception($rule,['key'=>''.$key.':'.$input])

+                    if (!is_array($input)) {

+                        foreach ($rules as $rule) {

+                            if (isset($requestRules[$rule])) {

+                                if (!preg_match('@'.$requestRules[$rule].'@', $input)) {

+                                    exception($rule, ['key'=>''.$key.':'.$input])

                                         ->invalidArgument($input.' input value is not valid for '.$rule.' request rule');

                                 }

                             }

                         }

                     }

-                    else{

+                    else {

 

-                        foreach ($input as $ikey=>$item){

-                            foreach($rules as $rule){

-                                if(isset($requestRules[$rule])){

-                                    if(!preg_match('@'.$requestRules[$rule].'@',$item)){

-                                        exception($rule,['key'=>''.$key.':'.$item])

+                        foreach ($input as $ikey=>$item) {

+                            foreach ($rules as $rule) {

+                                if (isset($requestRules[$rule])) {

+                                    if (!preg_match('@'.$requestRules[$rule].'@', $item)) {

+                                        exception($rule, ['key'=>''.$key.':'.$item])

                                             ->invalidArgument($item.' input value is not valid for '.$rule.' request rule');

                                     }

                                 }

src/resta/Support/Http.php

Spacing +21 added lines, -21 removed lines

@@ -28,9 +28,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;
         }
 
@@ -40,7 +40,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");
@@ -67,10 +67,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;
                     }
@@ -79,16 +79,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
                     );
 
@@ -98,12 +98,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 $data;
     }
 
@@ -111,34 +111,34 @@ 
      * @param string $method
      * @return array
      */
-    public function httpMethodData($method='get')
+    public function httpMethodData($method = 'get')
     {
         $body = [];
 
-        if(httpMethod()==$method){
-            $rawData = json_decode(request()->getContent(),1);
+        if (httpMethod()==$method) {
+            $rawData = json_decode(request()->getContent(), 1);
 
             $get = get();
-            if(is_array($get) && count($get)){
+            if (is_array($get) && count($get)) {
                 $body['params'] = get();
             }
 
-            if(is_null($rawData)){
+            if (is_null($rawData)) {
 
                 $containerMethod = app()->get(httpMethod());
 
-                if(is_array($containerMethod) && count($containerMethod)){
+                if (is_array($containerMethod) && count($containerMethod)) {
                     $inputData = $containerMethod;
                 }
-                else{
+                else {
                     $inputData = $this->getInputData();
                 }
 
-                if(!is_null($inputData)){
+                if (!is_null($inputData)) {
                     $body['body']['form-data'] = $inputData;
                 }
             }
-            else{
+            else {
                 $body['body']['raw-data'] = $rawData;
             }
         }

Braces +8 added lines, -7 removed lines

@@ -19,8 +19,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);
@@ -40,7 +41,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");
@@ -129,16 +132,14 @@ 
 
                 if(is_array($containerMethod) && count($containerMethod)){
                     $inputData = $containerMethod;
-                }
-                else{
+                } else{
                     $inputData = $this->getInputData();
                 }
 
                 if(!is_null($inputData)){
                     $body['body']['form-data'] = $inputData;
                 }
-            }
-            else{
+            } else{
                 $body['body']['raw-data'] = $rawData;
             }
         }

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

Spacing +24 added lines, -24 removed lines

@@ -17,7 +17,7 @@ 
     /**

      * @var $type

      */

-    public $type='controller';

+    public $type = 'controller';

 

     /**

      * @var array

@@ -36,9 +36,9 @@ 
     /**

      * @var array

      */

-    protected $commandRule=[

+    protected $commandRule = [

         'create'    => ['controller'],

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

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

         'all'       => [],

     ];

 

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

         }

 

@@ -72,15 +72,15 @@ 
 

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

 

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

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

 

         // with the directory operation,

         // 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);

 

@@ -88,9 +88,9 @@ 
             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'])) {

 

-            $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);

 

@@ -98,18 +98,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']           = $this->directory['routes'].''.DIRECTORY_SEPARATOR.''.$controller.'Route.php';

 

             }

-            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']           = $this->directory['routes'].''.DIRECTORY_SEPARATOR.''.$controller.'Route.php';

 

             }

@@ -121,9 +121,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'

             ]);

 

@@ -147,24 +147,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,

                     [

@@ -183,7 +183,7 @@ 
      */

     private function docUpdate()

     {

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

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

 

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

 

Braces +3 added lines, -6 removed lines

@@ -87,8 +87,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'])){

 

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

 

@@ -97,8 +96,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.

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

                 $this->touch['service/routecrud']           = $this->directory['routes'].''.DIRECTORY_SEPARATOR.''.$controller.'Route.php';

 

-            }

-            else{

+            } else{

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

                 $this->touch['service/route']           = $this->directory['routes'].''.DIRECTORY_SEPARATOR.''.$controller.'Route.php';

 

src/resta/Response/ResponseProvider.php

Spacing +7 added lines, -8 removed lines

@@ -27,13 +27,13 @@ 
         //the auto service to be called.

         return ClosureDispatcher::bind($controllerInstance)->call(function() use($controllerInstance){

 

-            if(property_exists($controllerInstance,'response')){

+            if (property_exists($controllerInstance, 'response')) {

                 return $controllerInstance->response;

             }

 

             // if the client wishes,

             // data can be returned in the supported format.

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

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

                 return app()->get('clientResponseType');

             }

 

@@ -73,8 +73,7 @@ 
     {

         //we get the response type by checking the instanceController object from the router.

         //Each type of response is in the base class in project directory.

-        return ($this->getControllerInstance()===null) ? core()->responseType :

-            $this->appResponseType();

+        return ($this->getControllerInstance()===null) ? core()->responseType : $this->appResponseType();

     }

 

     /**

@@ -85,19 +84,19 @@ 
     public function handle()

     {

         //definition for singleton instance

-        define ('responseApp',true);

+        define('responseApp', true);

 

         //get out putter for response

         $formatter = $this->formatter();

 

         //if out putter is not null

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

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

 

             //We resolve the response via the service container

             //and run the handle method.

             $result = app()->resolve($formatter)->{$this->getResponseKind()}($this->getOutPutter());

 

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

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

         }

     }

 

@@ -107,7 +106,7 @@ 
      * @param array $data

      * @return array

      */

-    public function outputFormatter($data=array(),$outputter='json')

+    public function outputFormatter($data = array(), $outputter = 'json')

     {

         $dataCapsule = config('response.data');

 

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;

         }