php-resta / resta-core

src/resta/Authenticate/Resource/AuthLoginCredentialsManager.php

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
      * @param $credentials

      * @param null|AuthLoginManager $manager

      */

-    public function __construct($credentials,$manager)

+    public function __construct($credentials, $manager)

     {

         //get credentials as default

         $this->credentials = $credentials;

@@ -42,7 +42,7 @@ 
         //get credential hash

         $this->setCredentialHash();

 

-        if($this->manager->getUsing()===false){

+        if ($this->manager->getUsing()===false) {

 

             // the request object will help you process

             // the credentials and get them correctly.

@@ -92,13 +92,13 @@ 
      */

     public function getRequest()

     {

-        if(!is_null($clientProvider = $this->manager->getAuth()->provider('client'))){

+        if (!is_null($clientProvider = $this->manager->getAuth()->provider('client'))) {

             return $clientProvider();

         }

 

         $request = $this->manager->getAuth()->getRequest();

 

-        if($request=='Default'){

+        if ($request=='Default') {

             return new AuthenticateRequest($this);

         }

 

@@ -126,8 +126,8 @@ 
     private function setCredentialHash()

     {

         //set credential hash

-        if(count($this->credentials)){

-            $this->credentialHash = md5(sha1(implode("|",$this->credentials)));

+        if (count($this->credentials)) {

+            $this->credentialHash = md5(sha1(implode("|", $this->credentials)));

         }

     }

 }
\ No newline at end of file

src/resta/Authenticate/AuthenticateRequest.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
         $this->credentials = $credentials;

 

         //credentials loop for expected property

-        foreach ($this->credentials->get() as $credential){

+        foreach ($this->credentials->get() as $credential) {

             $this->capsule[] = $credential;

             $this->expected[] = $credential;

         }

src/resta/Client/Client.php

Braces +2 added lines, -4 removed lines

@@ -320,8 +320,7 @@ 
                         $this->inputs[$generator] = $this->{$generatorMethodName}();

                         $this->generatorList[] = $generator;

                     }

-                }

-                else {

+                } else {

 

                     if($this->checkProperties('auto_generators_dont_overwrite')

                         && in_array($generator,$this->getAutoGeneratorsDontOverwrite())){

@@ -511,8 +510,7 @@ 
                     $keyMethod                  = $this->{$method}();

                     $this->inputs[$key][]       = $keyMethod;

                 }

-            }

-            else{

+            } else{

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

                     $keyMethod = $this->{$method}();

                     $this->inputs[$key] = $keyMethod;

Spacing +72 added lines, -72 removed lines

@@ -68,7 +68,7 @@ 
      *

      * @throws ReflectionExceptionAlias

      */

-    public function __construct($clientData=null)

+    public function __construct($clientData = null)

     {

         //reflection process

         $this->reflection = app()['reflection']($this);

@@ -77,7 +77,7 @@ 
         $this->setClientName();

 

         //get http method via request http manager class

-        $this->requestHttp = app()->resolve(ClientHttpManager::class,['client'=>$this]);

+        $this->requestHttp = app()->resolve(ClientHttpManager::class, ['client'=>$this]);

 

         //get request client data

         $this->clientData = ($clientData===null) ? $this->requestHttp->resolve() : $clientData;

@@ -94,9 +94,9 @@ 
     private function autoValidate($validate)

     {

         //we get the values ​​to auto-validate.

-        foreach ($this->{$validate} as $object=>$datas){

+        foreach ($this->{$validate} as $object=>$datas) {

 

-            if(false===Utils::isNamespaceExists($object)){

+            if (false===Utils::isNamespaceExists($object)) {

                 return;

             }

 

@@ -106,15 +106,15 @@ 
 

             // we get the index values,

             // which are called methods of the auto-validate value that represents the class.

-            foreach ($datas as $dataKey=>$data){

+            foreach ($datas as $dataKey=>$data) {

 

                 // if the methods of the auto-validate class resolved by the container resolve method apply,

                 // the process of auto-validate automatic implementation will be completed.

-                if(is_numeric($dataKey) && method_exists($getObjectInstance,$data) && isset($this->origin[$data])){

-                    if(!is_array($this->origin[$data])){

+                if (is_numeric($dataKey) && method_exists($getObjectInstance, $data) && isset($this->origin[$data])) {

+                    if (!is_array($this->origin[$data])) {

                         $this->origin[$data] = array($this->origin[$data]);

                     }

-                    foreach ($this->origin[$data] as $originData){

+                    foreach ($this->origin[$data] as $originData) {

                         $getObjectInstance->{$data}($originData);

                     }

                 }

@@ -130,26 +130,26 @@ 
     private function capsule()

     {

         //a process can be added to the capsule array using the method.

-        if(method_exists($this,'capsuleMethod')){

-            $this->capsule = array_merge($this->capsule,$this->capsuleMethod());

+        if (method_exists($this, 'capsuleMethod')) {

+            $this->capsule = array_merge($this->capsule, $this->capsuleMethod());

         }

 

         // expected method is executed.

         // this method is a must for http method values to be found in this property.

-        if($this->checkProperties('capsule')){

+        if ($this->checkProperties('capsule')) {

 

-            if(property_exists($this,'auto_capsule') && is_array($this->auto_capsule)){

-                $this->capsule = array_merge($this->capsule,$this->auto_capsule);

+            if (property_exists($this, 'auto_capsule') && is_array($this->auto_capsule)) {

+                $this->capsule = array_merge($this->capsule, $this->auto_capsule);

             }

 

             $caret = $this->capsuleCaret();

 

-            foreach($this->inputs as $input=>$value){

+            foreach ($this->inputs as $input=>$value) {

 

-                if(isset($caret[$input]) || (

-                        $this->checkProperties('capsule') && !in_array($input,$this->capsule)

-                    )){

-                    exception('clientCapsule',['key'=>$input])

+                if (isset($caret[$input]) || (

+                        $this->checkProperties('capsule') && !in_array($input, $this->capsule)

+                    )) {

+                    exception('clientCapsule', ['key'=>$input])

                         ->overflow('The '.$input.' value cannot be sent.');

                 }

             }

@@ -165,15 +165,15 @@ 
     {

         $caret = [];

 

-        foreach($this->inputs as $input=>$item){

-            if(in_array('@'.$input,$this->capsule)){

+        foreach ($this->inputs as $input=>$item) {

+            if (in_array('@'.$input, $this->capsule)) {

                 $caret[$input] = $item;

             }

         }

 

         foreach ($this->capsule as $item) {

-            if(preg_match('#@.*#is',$item)){

-                $this->capsule = array_diff($this->capsule,[$item]);

+            if (preg_match('#@.*#is', $item)) {

+                $this->capsule = array_diff($this->capsule, [$item]);

             }

         }

 

@@ -192,15 +192,15 @@ 
 

         // Determines which HTTP method

         // the request object will be exposed to.

-        if($this->checkProperties('http')){

+        if ($this->checkProperties('http')) {

 

             // if the current http method does not exist

             // in the http object, the exception will be thrown.

-            if(!in_array($method,$this->http)){

+            if (!in_array($method, $this->http)) {

 

                 //exception batMethodCall

                 exception()->badMethodCall(

-                    'Invalid http method process for '.basename($this).'.That is accepted http methods ['.implode(",",$this->http).'] ');

+                    'Invalid http method process for '.basename($this).'.That is accepted http methods ['.implode(",", $this->http).'] ');

             }

         }

     }

@@ -215,7 +215,7 @@ 
     {

         // from the properties of the object properties to

         // the existing variables, control the array and at least one element.

-        return (property_exists($this,$properties)

+        return (property_exists($this, $properties)

             && is_array($this->{$properties}) && count($this->{$properties})) ? true : false;

     }

 

@@ -228,7 +228,7 @@ 
     {

         // we are saving the expected values ​​for the request in container.

         // this record can be returned in exception information.

-        app()->register('requestExpected',$this->expected);

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

     }

 

     /**

@@ -240,15 +240,15 @@ 
     public function except($except)

     {

         // the except parameter is a callable value.

-        if(is_callable($except)){

-            $call = call_user_func_array($except,[$this]);

+        if (is_callable($except)) {

+            $call = call_user_func_array($except, [$this]);

             $except = $call;

         }

 

         // except with the except exceptions property

         // and then assigning them to the inputs property.

-        $this->except = array_merge($this->except,$except);

-        $this->inputs = array_diff_key($this->inputs,array_flip($this->except));

+        $this->except = array_merge($this->except, $except);

+        $this->inputs = array_diff_key($this->inputs, array_flip($this->except));

 

         return $this;

     }

@@ -262,27 +262,27 @@ 
     {

         // expected method is executed.

         // this method is a must for http method values to be found in this property.

-        if($this->checkProperties('expected')){

+        if ($this->checkProperties('expected')) {

 

             // if the expected values are not found in the inputs array,

             // the exception will be thrown.

-            foreach ($this->expected as $expected){

+            foreach ($this->expected as $expected) {

 

                 $expectedValues = [];

 

                 // mandatory expected data for each key can be separated by | operator.

                 // this is evaluated as "or".

-                foreach($expectedData = explode("|",$expected) as $inputs){

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

+                foreach ($expectedData = explode("|", $expected) as $inputs) {

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

                         $expectedValues[] = $inputs;

                     }

                 }

 

                 // if the expectedData and expectedValues ​​

                 // array are numerically equal to the expected key, the exception is thrown.

-                if(count($expectedData)===count($expectedValues)){

-                    exception('clientExpected',['key'=>$expected])

-                        ->unexpectedValue('You absolutely have to send the value '.implode(" or ",$expectedValues).' for request object');

+                if (count($expectedData)===count($expectedValues)) {

+                    exception('clientExpected', ['key'=>$expected])

+                        ->unexpectedValue('You absolutely have to send the value '.implode(" or ", $expectedValues).' for request object');

                 }

             }

         }

@@ -297,17 +297,17 @@ 
     {

         // check the presence of the generator object

         // and operate the generator over this object.

-        if($this->checkProperties('auto_generators')){

+        if ($this->checkProperties('auto_generators')) {

             $generators = $this->getAutoGenerators();

         }

 

         // check the presence of the generator object

         // and operate the generator over this object.

-        if($this->checkProperties('generators')){

-            $generators = array_merge(isset($generators) ? $generators: [],$this->getGenerators());

+        if ($this->checkProperties('generators')) {

+            $generators = array_merge(isset($generators) ? $generators : [], $this->getGenerators());

         }

 

-        if(isset($generators)){

+        if (isset($generators)) {

             $this->generatorMethod($generators);

         }

     }

@@ -322,21 +322,21 @@ 
     private function generatorMethod($generators)

     {

         //generator array object

-        foreach ($generators as $generator){

+        foreach ($generators as $generator) {

 

             //generator method name

             $generatorMethodName = $generator.'Generator';

 

             // if the generator method is present,

             // the fake value is assigned.

-            if(method_exists($this,$generatorMethodName)){

+            if (method_exists($this, $generatorMethodName)) {

 

                 //fake registration

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

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

 

                     $generatorMethodNameResult = $this->{$generatorMethodName}();

 

-                    if(!is_null($generatorMethodNameResult)){

+                    if (!is_null($generatorMethodNameResult)) {

                         $this->{$generator} = $this->{$generatorMethodName}();

                         $this->inputs[$generator] = $this->{$generatorMethodName}();

                         $this->generatorList[] = $generator;

@@ -344,15 +344,15 @@ 
                 }

                 else {

 

-                    if($this->checkProperties('auto_generators_dont_overwrite')

-                        && in_array($generator,$this->getAutoGeneratorsDontOverwrite())){

+                    if ($this->checkProperties('auto_generators_dont_overwrite')

+                        && in_array($generator, $this->getAutoGeneratorsDontOverwrite())) {

                         $this->{$generator} = $this->{$generatorMethodName}();

                         $this->inputs[$generator] = $this->{$generatorMethodName}();

                         $this->generatorList[] = $generator;

                     }

 

-                    if($this->checkProperties('generators_dont_overwrite')

-                        && in_array($generator,$this->getGeneratorsDontOverwrite())){

+                    if ($this->checkProperties('generators_dont_overwrite')

+                        && in_array($generator, $this->getGeneratorsDontOverwrite())) {

                         $this->{$generator} = $this->{$generatorMethodName}();

                         $this->inputs[$generator] = $this->{$generatorMethodName}();

                         $this->generatorList[] = $generator;

@@ -415,7 +415,7 @@ 
     {

         // we use the http method to write

         // the values to the inputs and origin properties.

-        foreach($this->clientData as $key=>$value){

+        foreach ($this->clientData as $key=>$value) {

 

             //inputs and origin properties

             $this->inputs[$key] = $value;

@@ -431,9 +431,9 @@ 
      */

     private function requestExcept()

     {

-        if(property_exists($this,'requestExcept') && is_array($this->requestExcept)){

-            foreach ($this->requestExcept as $item){

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

+        if (property_exists($this, 'requestExcept') && is_array($this->requestExcept)) {

+            foreach ($this->requestExcept as $item) {

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

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

                 }

             }

@@ -473,16 +473,16 @@ 
      * @param null|string $clientName

      * @return void|mixed

      */

-    public function setClientName($clientName=null)

+    public function setClientName($clientName = null)

     {

-        if(!is_null($clientName) && is_string($clientName)){

+        if (!is_null($clientName) && is_string($clientName)) {

             return $this->clientName = $clientName;

         }

 

-        if(!is_null(Utils::trace(0)) && isset(Utils::trace(0)['object'])){

+        if (!is_null(Utils::trace(0)) && isset(Utils::trace(0)['object'])) {

             $backTrace = Utils::trace(0)['object'];

 

-            if(property_exists($backTrace,'clientName')){

+            if (property_exists($backTrace, 'clientName')) {

                 $this->clientName = $backTrace->clientName;

             }

         }

@@ -499,9 +499,9 @@ 
 

         // we update the input values ​​after

         // we receive and check the saved objects.

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

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

 

-            if(!in_array($key,$this->generatorList) && isset($clientObjects['origin'][$key])){

+            if (!in_array($key, $this->generatorList) && isset($clientObjects['origin'][$key])) {

 

                 $this->{$key} = $clientObjects['origin'][$key];

                 $this->inputs[$key] = $this->{$key};

@@ -529,11 +529,11 @@ 
 

         // the request update to be performed using

         // the method name to be used with the http method.

-        $this->setRequestInputs($requestMethod,$key);

+        $this->setRequestInputs($requestMethod, $key);

 

         // the request update to be performed using

         // the method name to be used without the http method.

-        $this->setRequestInputs($key,$key);

+        $this->setRequestInputs($key, $key);

     }

 

     /**

@@ -544,28 +544,28 @@ 
      *

      * @throws ReflectionExceptionAlias

      */

-    private function setRequestInputs($method,$key)

+    private function setRequestInputs($method, $key)

     {

-        if(!in_array($key,$this->generatorList) && method_exists($this,$method) && $this->reflection->reflectionMethodParams($method)->isProtected){

+        if (!in_array($key, $this->generatorList) && method_exists($this, $method) && $this->reflection->reflectionMethodParams($method)->isProtected) {

 

             //check annotations for method

-            $annotation = app()->resolve(ClientAnnotationManager::class,['request'=>$this]);

-            $annotation->annotation($method,$key);

+            $annotation = app()->resolve(ClientAnnotationManager::class, ['request'=>$this]);

+            $annotation->annotation($method, $key);

 

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

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

 

                 $inputKeys = $this->inputs[$key];

 

                 $this->inputs[$key] = [];

-                foreach ($inputKeys as $input){

+                foreach ($inputKeys as $input) {

 

                     $this->{$key}               = $input;

                     $keyMethod                  = $this->{$method}();

                     $this->inputs[$key][]       = $keyMethod;

                 }

             }

-            else{

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

+            else {

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

                     $keyMethod = $this->{$method}();

                     $this->inputs[$key] = $keyMethod;

                 }

@@ -584,8 +584,8 @@ 
         // the auto object validate property is the property

         // where all of your request values ​​are automatically validated.

         /** @noinspection PhpParamsInspection */

-        if(property_exists($this,'autoObjectValidate')

-            && is_array($this->autoObjectValidate) && count($this->autoObjectValidate)){

+        if (property_exists($this, 'autoObjectValidate')

+            && is_array($this->autoObjectValidate) && count($this->autoObjectValidate)) {

             $this->autoValidate('autoObjectValidate');

         }

     }

src/resta/Client/ClientHttpManager.php

Braces +6 added lines, -3 removed lines

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

         /* Read the data 1 KB at a time

            and write to the file */

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

-            $raw_data .= $chunk;

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

+                    $raw_data .= $chunk;

+        }

 

         /* Close the streams */

         fclose($putdata);

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

         foreach ($parts as $part) {

             // If this is the last part, break

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

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

+                break;

+            }

 

             // Separate content from headers

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

Spacing +19 added lines, -19 removed lines

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

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

 

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

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

 

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

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

 

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

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

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

             }

             return $inputs;

         }

 

-        if(is_array($content)){

+        if (is_array($content)) {

 

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

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

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

             }

             return $content;

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

         $this->inputVars();

 

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

-            return $GLOBALS[ '_PUT' ];

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

+            return $GLOBALS['_PUT'];

         }

 

         return [];

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

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

 

-        if(empty($boundary)){

-            parse_str($raw_data,$data);

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

+        if (empty($boundary)) {

+            parse_str($raw_data, $data);

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

             return;

         }

 

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

         foreach ($parts as $part) {

             // If this is the last part, break

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

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

 

             // Separate content from headers

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

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

 

                 //Parse File

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

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

                 {

                     //if labeled the same as previous, skip

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

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

                     {

                         continue;

                     }

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

 

                     //get tmp name

-                    $filename_parts = pathinfo( $filename );

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

+                    $filename_parts = pathinfo($filename);

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

 

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

                     /** @noinspection PhpUndefinedVariableInspection */

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

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

                         'error'=>0,

                         'name'=>$filename,

                         'tmp_name'=>$tmp_name,

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

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

                         'type'=>$value

                     );

 

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

                 else

                 {

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

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

                 }

             }

 

         }

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

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

         return;

     }

 

src/resta/Exception/ErrorProvider.php

Spacing +64 added lines, -65 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,49 +163,48 @@ 
 

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

 

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

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

 

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

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

             $vendorDirectory = $vd[0];

         }

 

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

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

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

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

         {

 

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

-                'An unexpected external error has occurred' :

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

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

 

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

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

 

 

             //Get or Set the HTTP response code

             http_response_code(500);

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

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

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

 

 

         }

-        else{

+        else {

 

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

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

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

             }

-            else{

+            else {

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

             }

 

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

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

 

             //Get or Set the HTTP response code

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

         }

 

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

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

 

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

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

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

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

         }

 

         // exception extender The exception information

@@ -215,29 +214,29 @@ 
 

 

         //set json app exception

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

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

 

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

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

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

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

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

         }

 

         $restaOutHandle = null;

 

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

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

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

         }

 

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

 

-        if($restaOutHandle===null){

+        if ($restaOutHandle===null) {

 

             //header set and symfony response call

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

 

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

         }

-        else{

+        else {

             echo $restaOutHandle;

         }

 

@@ -248,7 +247,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'],

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

@@ -286,13 +285,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'];

             }

@@ -312,13 +311,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]);

                 }

             }

         }

@@ -331,33 +330,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);

                 }

             });

@@ -367,7 +366,7 @@ 
 

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

 

-        if($langMessage!==null){

+        if ($langMessage!==null) {

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

         }

     }

@@ -381,14 +380,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]);

         }

 

@@ -408,7 +407,7 @@ 
     /**

      * @param null|string $lang

      */

-    public function setLang($lang=null)

+    public function setLang($lang = null)

     {

         $this->lang = $lang;

     }

Braces +5 added lines, -10 removed lines

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

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

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

-        }

-        else {

+        } else {

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

         }

     }

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

             //set as the success object is false

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

-        }

-        else{

+        } else{

 

             //set as the success object is false

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

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

 

 

-        }

-        else{

+        } else{

 

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

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

-            }

-            else{

+            } else{

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

             }

 

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

 

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

-        }

-        else{

+        } else{

             echo $restaOutHandle;

         }