php-resta / resta-core

src/resta/Console/Source/Track/Track.php

Spacing +8 added lines, -8 removed lines

@@ -29,15 +29,15 @@ 
      */

     public function log()

     {

-        if(app()->has('track.path')){

+        if (app()->has('track.path')) {

             $trackPath = app()->get('track.path');

             $logger = $trackPath($this->argument);

         }

-        else{

+        else {

             $logger = app()->path()->appLog().''.DIRECTORY_SEPARATOR.''.date('Y').''.DIRECTORY_SEPARATOR.''.date('m').''.DIRECTORY_SEPARATOR.''.date('d').'-access.log';

         }

 

-        if(!file_exists($logger)){

+        if (!file_exists($logger)) {

             echo 'No requests for a log tracker have been detected yet.';

             echo PHP_EOL;

             exit();

@@ -53,18 +53,18 @@ 
         while (!feof($proc))

         {

             $result = fread($proc, 4096);

-            if(preg_match('@\{(.*)\}@',$result,$output)){

-                $outputArray = json_decode($output[0],1);

+            if (preg_match('@\{(.*)\}@', $result, $output)) {

+                $outputArray = json_decode($output[0], 1);

 

                 $outputArray['trackNumber'] = ++$number;

 

-                if(app()->has('track.log')){

+                if (app()->has('track.log')) {

 

                     $track = app()->get('track.log');

-                    echo $track($outputArray,$this->argument);

+                    echo $track($outputArray, $this->argument);

                 }

             }

-            else{

+            else {

                 echo $result;

             }

             @ flush();

Braces +2 added lines, -4 removed lines

@@ -32,8 +32,7 @@ 
         if(app()->has('track.path')){

             $trackPath = app()->get('track.path');

             $logger = $trackPath($this->argument);

-        }

-        else{

+        } else{

             $logger = app()->path()->appLog().''.DIRECTORY_SEPARATOR.''.date('Y').''.DIRECTORY_SEPARATOR.''.date('m').''.DIRECTORY_SEPARATOR.''.date('d').'-access.log';

         }

 

@@ -63,8 +62,7 @@ 
                     $track = app()->get('track.log');

                     echo $track($outputArray,$this->argument);

                 }

-            }

-            else{

+            } else{

                 echo $result;

             }

             @ flush();

src/resta/Support/JsonHandler.php

Spacing +21 added lines, -21 removed lines

@@ -23,13 +23,13 @@ 
      */
     private static function checkFile()
     {
-        if(!is_null(self::$singleton)) return self::$singleton;
+        if (!is_null(self::$singleton)) return self::$singleton;
 
-        $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)) {
             self::$singleton = self::$file;
             return self::$singleton;
         }
@@ -46,8 +46,8 @@ 
     {
         $file = self::checkFile();
 
-        if(!file_exists($file)){
-            files()->put($file,self::encode([]));
+        if (!file_exists($file)) {
+            files()->put($file, self::encode([]));
         }
     }
 
@@ -59,7 +59,7 @@ 
      */
     public static function decode($data)
     {
-        return json_decode($data,1);
+        return json_decode($data, 1);
     }
 
     /**
@@ -71,26 +71,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;
             }
         }
@@ -106,7 +106,7 @@ 
      */
     public static function encode($data)
     {
-        return json_encode($data,JSON_PRETTY_PRINT);
+        return json_encode($data, JSON_PRETTY_PRINT);
     }
 
     /**
@@ -132,18 +132,18 @@ 
      *
      * @throws FileNotFoundException
      */
-    public static function set($key,$value)
+    public static function set($key, $value)
     {
         self::createIfNotFileExist();
         
         $file = self::get();
         
-        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])));
         }
 
         return self::get();

Braces +4 added lines, -3 removed lines

@@ -23,7 +23,9 @@ 
      */
     private static function checkFile()
     {
-        if(!is_null(self::$singleton)) return self::$singleton;
+        if(!is_null(self::$singleton)) {

+            return self::$singleton;

+        }

 
         $filePortions = explode(DIRECTORY_SEPARATOR,self::$file);
         $pop = array_pop($filePortions);
@@ -141,8 +143,7 @@ 
         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/Support/SuperClosure.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
      */
     public static function getInstance()
     {
-        if(is_null(self::$singleton)){
+        if (is_null(self::$singleton)) {
             self::$singleton = new Serializer();
         }
 
@@ -30,7 +30,7 @@ 
 
     public static function set($data)
     {
-        if(is_callable($data)){
+        if (is_callable($data)) {
             return self::getInstance()->serialize($data);
         }
         return self::getInstance()->serialize(function() use ($data){

src/resta/Container/Container.php

Spacing +58 added lines, -58 removed lines

@@ -9,7 +9,7 @@ 
 use Resta\Contracts\ApplicationContracts;

 use Resta\Exception\FileNotFoundException;

 

-class Container implements ContainerContracts,\ArrayAccess

+class Container implements ContainerContracts, \ArrayAccess

 {

     /**

      * @var bool

@@ -51,12 +51,12 @@ 
      * @param array $bind

      * @return array

      */

-    public function applicationProviderBinding($make,$bind=array())

+    public function applicationProviderBinding($make, $bind = array())

     {

         //service container is an automatic application provider

         //that we can bind to the special class di in the dependency condition.

         //This method is automatically added to the classes resolved by the entire make bind method.

-        return array_merge($bind,['app'=>$make]);

+        return array_merge($bind, ['app'=>$make]);

     }

 

     /**

@@ -68,16 +68,16 @@ 
      * @throws DependencyException

      * @throws NotFoundException

      */

-    public function bind($object=null,$callback=null,$alias=null)

+    public function bind($object = null, $callback = null, $alias = null)

     {

-        if(!is_null($alias)){

+        if (!is_null($alias)) {

             $object = $alias;

         }

 

         //If the bind method does not have parameters object and callback, the value is directly assigned to the kernel object.

         //Otherwise, when the bind object and callback are sent, the closure class inherits

         //the applicationProvider object and the resolve method is called

-        return $this->make($object,$callback,'container');

+        return $this->make($object, $callback, 'container');

     }

 

     /**

@@ -89,16 +89,16 @@ 
      * @throws DependencyException

      * @throws NotFoundException

      */

-    private function build($object,$callback,$sync=false)

+    private function build($object, $callback, $sync = false)

     {

         //If the console object returns true,

         //we do not cancel binding operations

         //We are getting what applies to console with consoleKernelObject.

-        if($sync===false) return $this->consoleKernelObjectChecker($object,$callback);

+        if ($sync===false) return $this->consoleKernelObjectChecker($object, $callback);

 

         //the value corresponding to the bind value for the global object is assigned and

         //the resolve method is called for the dependency injection.

-        $this->kernelAssigner()->setKernelObject($object,$callback);

+        $this->kernelAssigner()->setKernelObject($object, $callback);

 

         //return kernel object

         return $this->kernel();

@@ -113,11 +113,11 @@ 
      * @throws DependencyException

      * @throws NotFoundException

      */

-    private function consoleKernelObject($object,$callback,$container=false)

+    private function consoleKernelObject($object, $callback, $container = false)

     {

         //we use the console bindings class to specify the classes to be preloaded in the console application.

         //Thus, classes that can not be bound with http are called without closure in global loaders directory.

-        $this->resolve(ConsoleBindings::class)->console($object,$callback,$container);

+        $this->resolve(ConsoleBindings::class)->console($object, $callback, $container);

 

         //The console application must always return the kernel method.

         return $this->kernel();

@@ -132,7 +132,7 @@ 
      * @throws DependencyException

      * @throws NotFoundException

      */

-    private function consoleKernelObjectChecker($object,$callback,$container=false)

+    private function consoleKernelObjectChecker($object, $callback, $container = false)

     {

         //we check whether the callback value is a callable function.

         $isCallableForCallback = is_callable($callback);

@@ -140,10 +140,10 @@ 
         //If the console object returns true,

         //we do not cancel binding operations

         //We are getting what applies to console with consoleKernelObject.

-        if($this->console() AND $isCallableForCallback) return $this->consoleKernelObject($object,$callback,$container);

+        if ($this->console() AND $isCallableForCallback) return $this->consoleKernelObject($object, $callback, $container);

 

         //If the application is not a console operation, we re-bind to existing methods synchronously.

-        return ($container) ? $this->containerBuild($object,$callback,true) : $this->build($object,$callback,true);

+        return ($container) ? $this->containerBuild($object, $callback, true) : $this->build($object, $callback, true);

     }

 

     /**

@@ -153,11 +153,11 @@ 
      * @throws DependencyException

      * @throws NotFoundException

      */

-    private function consoleShared($object,$callback)

+    private function consoleShared($object, $callback)

     {

         //The console share is evaluated as a true variable to be assigned as the 3rd parameter in the classes to be bound.

         //The work to be done here is to bind the classes to be included in the console share privately.

-        $this->kernelAssigner()->consoleShared($object,$callback);

+        $this->kernelAssigner()->consoleShared($object, $callback);

     }

 

     /**

@@ -169,12 +169,12 @@ 
      * @throws DependencyException

      * @throws NotFoundException

      */

-    public function containerBuild($object,$callback,$sync=false)

+    public function containerBuild($object, $callback, $sync = false)

     {

         //If the console object returns true,

         //we do not cancel binding operations

         //We are getting what applies to console with consoleKernelObject.

-        if($sync===false) return $this->consoleKernelObjectChecker($object,$callback,true);

+        if ($sync===false) return $this->consoleKernelObjectChecker($object, $callback, true);

 

         //Since the objects that come to the build method are objects from the container method,

         //we need to automatically create a kernel object named serviceContainer in this method.

@@ -182,7 +182,7 @@ 
 

         //the value corresponding to the bind value for the global object is assigned and

         //the resolve method is called for the dependency method.

-        $this->kernelAssigner()->setKernelObject($object,$callback,'serviceContainer');

+        $this->kernelAssigner()->setKernelObject($object, $callback, 'serviceContainer');

 

         //return kernel object

         return $this->kernel();

@@ -192,11 +192,11 @@ 
      * @param $class

      * @param $bind

      */

-    private function contextualBindCleaner($class,$bind)

+    private function contextualBindCleaner($class, $bind)

     {

         //the context bind objects are checked again and the bind sequence submitted by

         //the user is checked and forced to re-instantiate the object.

-        if(isset(self::$instance[$class]) && self::$bindParams[$class]!==$bind){

+        if (isset(self::$instance[$class]) && self::$bindParams[$class]!==$bind) {

             unset(self::$instance[$class]);

             unset(self::$bindParams[$class]);

         }

@@ -219,13 +219,13 @@ 
 

         // the has method can have a dotted string value so

         // we need to be able to control the string or array within the container.

-        foreach (explode(".",$abstract) as $item){

-            if(isset($container[$item])){

+        foreach (explode(".", $abstract) as $item) {

+            if (isset($container[$item])) {

                 $container = $container[$item];

             }

-            else{

+            else {

                 $containerClosureResolver[] = $item;

-                $container = ContainerClosureResolver::get(implode('.',$containerClosureResolver));

+                $container = ContainerClosureResolver::get(implode('.', $containerClosureResolver));

             }

         }

 

@@ -251,22 +251,22 @@ 
 

         // the has method can have a dotted string value so

         // we need to be able to control the string or array within the container.

-        foreach (explode(".",$abstract) as $item){

+        foreach (explode(".", $abstract) as $item) {

 

             // this blog will work

             // if the data in the container loop points to an array.

-            if(!is_array($container)){

+            if (!is_array($container)) {

 

                 // we are querying the value of

                 // the items corresponding to the dotted value in the container.

                 // the control result is transferred to the bools array.

                 $container = $container[$item];

 

-                if(is_null($container)){

+                if (is_null($container)) {

                     $containerClosureResolver[] = $item;

-                    $container = ContainerClosureResolver::get(implode('.',$containerClosureResolver));

+                    $container = ContainerClosureResolver::get(implode('.', $containerClosureResolver));

 

-                    if(is_callable($container)){

+                    if (is_callable($container)) {

                         $bools = [];

                         $container = true;

                     }

@@ -274,7 +274,7 @@ 
 

                 $bools[] = is_null($container) ? false : true;

             }

-            else{

+            else {

                 // if the container array corresponds to a string,

                 // the bools array is filled with the isset control directly.

                 $bools[] = isset($container[$item]) ? true : false;

@@ -283,7 +283,7 @@ 
 

         // the method returns false if the bools sequence is false,

         // otherwise it will return true.

-        return in_array(false,$bools) ? false : true;

+        return in_array(false, $bools) ? false : true;

     }

 

     /**

@@ -333,7 +333,7 @@ 
      * @throws DependencyException

      * @throws NotFoundException

      */

-    public function make($object=null,$callback=null,$container=false)

+    public function make($object = null, $callback = null, $container = false)

     {

         //we check whether the boolean value of the singleton variable used

         //for booting does not reset every time the object variable to be assigned to the kernel variable is true

@@ -341,8 +341,8 @@ 
 

         //The console share is evaluated as a true variable to be assigned as the 3rd parameter in the classes to be bound.

         //The work to be done here is to bind the classes to be included in the console share privately.

-        if($container){

-            $this->consoleShared($object,$callback);

+        if ($container) {

+            $this->consoleShared($object, $callback);

         }

 

         //If the third parameter passed to the bind method carries a container value,

@@ -352,7 +352,7 @@ 
         //If the bind method does not have parameters object and callback, the value is directly assigned to the kernel object.

         //Otherwise, when the bind object and callback are sent, the closure class inherits

         //the applicationProvider object and the resolve method is called

-        return ($object===null) ? $this->kernel() : $this->{$makeBuild}($object,$callback);

+        return ($object===null) ? $this->kernel() : $this->{$makeBuild}($object, $callback);

     }

 

     /**

@@ -372,7 +372,7 @@ 
      */

     public function offsetGet($offset) {

 

-        return $this->resolve($this->instances['containerInstanceResolve'],[

+        return $this->resolve($this->instances['containerInstanceResolve'], [

             'instances' => $this->instances

         ])->{$offset}();

     }

@@ -396,7 +396,7 @@ 
      * @param null $concrete

      * @return bool|mixed

      */

-    public function register($key,$object,$concrete=null)

+    public function register($key, $object, $concrete = null)

     {

         // we assign the values ​​required

         // for register to the global value variable.

@@ -406,7 +406,7 @@ 
 

         // If there is an instance of the application class,

         // the register method is saved both in this example and in the global.

-        if(defined('appInstance')){

+        if (defined('appInstance')) {

 

             // where we will assign both the global instance

             // and the registered application object.

@@ -425,19 +425,19 @@ 
      * @param bool $withConcrete

      * @return bool

      */

-    private function registerProcess($instance,$withConcrete=false)

+    private function registerProcess($instance, $withConcrete = false)

     {

         // values recorded without concrete.

         // or values deleted

-        if(false===$withConcrete){

+        if (false===$withConcrete) {

 

             //values registered without concrete

-            $instance->{$this->values['key']}=$this->values['object'];

+            $instance->{$this->values['key']} = $this->values['object'];

             return false;

         }

 

         //values registered with concrete

-        $instance->{$this->values['key']}[$this->values['object']]=$this->values['concrete'];

+        $instance->{$this->values['key']}[$this->values['object']] = $this->values['concrete'];

     }

 

     /**

@@ -448,22 +448,22 @@ 
      * @throws DependencyException

      * @throws NotFoundException

      */

-    public function resolve($class,$bind=array())

+    public function resolve($class, $bind = array())

     {

         //the context bind objects are checked again and the bind sequence submitted by

         //the user is checked and forced to re-instantiate the object.

-        $this->contextualBindCleaner($class,$bind);

+        $this->contextualBindCleaner($class, $bind);

 

         //We do an instance check to get the static instance values of

         //the classes to be resolved with the make bind method.

-        if(!isset(self::$instance[$class])){

+        if (!isset(self::$instance[$class])) {

 

             //bind params object

             self::$bindParams[$class] = $bind;

 

             //By singleton checking, we solve the dependency injection of the given class.

             //Thus, each class can be called together with its dependency.

-            self::$instance[$class] = DIContainerManager::make($class,$this->applicationProviderBinding($this,self::$bindParams[$class]));

+            self::$instance[$class] = DIContainerManager::make($class, $this->applicationProviderBinding($this, self::$bindParams[$class]));

             $this->singleton()->resolved[$class] = self::$instance[$class];

 

             //return resolve class

@@ -481,9 +481,9 @@ 
      * @param $class

      * @return mixed

      */

-    public function resolved($class){

+    public function resolved($class) {

 

-        if(isset($this['resolved'][$class])){

+        if (isset($this['resolved'][$class])) {

             return $this['resolved'][$class];

         }

 

@@ -498,7 +498,7 @@ 
      * @throws DependencyException

      * @throws NotFoundException

      */

-    public function share($object=null,$callback=null)

+    public function share($object = null, $callback = null)

     {

         //we check whether the boolean value of the singleton variable used

         //for booting does not reset every time the object variable to be assigned to the kernel variable is true

@@ -506,12 +506,12 @@ 
 

         //The console share is evaluated as a true variable to be assigned as the 3rd parameter in the classes to be bound.

         //The work to be done here is to bind the classes to be included in the console share privately.

-        $this->consoleShared($object,$callback);

+        $this->consoleShared($object, $callback);

 

         //If the bind method does not have parameters object and callback, the value is directly assigned to the kernel object.

         //Otherwise, when the bind object and callback are sent, the closure class inherits

         //the applicationProvider object and the resolve method is called

-        return ($object===null) ? $this->kernel() : $this->build($object,$callback);

+        return ($object===null) ? $this->kernel() : $this->build($object, $callback);

 

     }

 

@@ -531,7 +531,7 @@ 
      */

     public function singleton()

     {

-        if($this->singleton===false){

+        if ($this->singleton===false) {

 

             //after first initializing, the singleton variable is set to true,

             //and subsequent incoming classes can inherit the loaded object.

@@ -552,12 +552,12 @@ 
         // for application instance

         // if the values ​​to be saved are to be saved without the concrete,

         // if it is an array.

-        if($this->values['concrete']===null) {

+        if ($this->values['concrete']===null) {

 

             // Without concrete,

             // the saved value will be saved

             // if the it does not exist in application instance.

-            if(!isset($instance->{$this->values['key']})) {

+            if (!isset($instance->{$this->values['key']})) {

                 $this->registerProcess($instance);

             }

             return false;

@@ -565,7 +565,7 @@ 
 

         // We send concrete values to be recorded with concrete as true.

         // these values will be recorded as a array.

-        $this->registerProcess($instance,true);

+        $this->registerProcess($instance, true);

     }

 

     /**

@@ -573,11 +573,11 @@ 
      * @param null|string $object

      * @return mixed

      */

-    public function terminate($key,$object=null)

+    public function terminate($key, $object = null)

     {

         // object null is

         // sent to just terminate a key.

-        if($object===null){

+        if ($object===null) {

             unset(core()->{$key});

             unset($this->singleton()->{$key});

             return false;

Braces +11 added lines, -7 removed lines

@@ -94,7 +94,9 @@ 
         //If the console object returns true,

         //we do not cancel binding operations

         //We are getting what applies to console with consoleKernelObject.

-        if($sync===false) return $this->consoleKernelObjectChecker($object,$callback);

+        if($sync===false) {

+            return $this->consoleKernelObjectChecker($object,$callback);

+        }

 

         //the value corresponding to the bind value for the global object is assigned and

         //the resolve method is called for the dependency injection.

@@ -140,7 +142,9 @@ 
         //If the console object returns true,

         //we do not cancel binding operations

         //We are getting what applies to console with consoleKernelObject.

-        if($this->console() AND $isCallableForCallback) return $this->consoleKernelObject($object,$callback,$container);

+        if($this->console() AND $isCallableForCallback) {

+            return $this->consoleKernelObject($object,$callback,$container);

+        }

 

         //If the application is not a console operation, we re-bind to existing methods synchronously.

         return ($container) ? $this->containerBuild($object,$callback,true) : $this->build($object,$callback,true);

@@ -174,7 +178,9 @@ 
         //If the console object returns true,

         //we do not cancel binding operations

         //We are getting what applies to console with consoleKernelObject.

-        if($sync===false) return $this->consoleKernelObjectChecker($object,$callback,true);

+        if($sync===false) {

+            return $this->consoleKernelObjectChecker($object,$callback,true);

+        }

 

         //Since the objects that come to the build method are objects from the container method,

         //we need to automatically create a kernel object named serviceContainer in this method.

@@ -222,8 +228,7 @@ 
         foreach (explode(".",$abstract) as $item){

             if(isset($container[$item])){

                 $container = $container[$item];

-            }

-            else{

+            } else{

                 $containerClosureResolver[] = $item;

                 $container = ContainerClosureResolver::get(implode('.',$containerClosureResolver));

             }

@@ -273,8 +278,7 @@ 
                 }

 

                 $bools[] = is_null($container) ? false : true;

-            }

-            else{

+            } else{

                 // if the container array corresponds to a string,

                 // the bools array is filled with the isset control directly.

                 $bools[] = isset($container[$item]) ? true : false;

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 +68 added lines, -68 removed lines

@@ -69,7 +69,7 @@ 
      *

      * @throws ReflectionExceptionAlias

      */

-    public function __construct($clientData=null)

+    public function __construct($clientData = null)

     {

         //reflection process

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

@@ -78,7 +78,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;

@@ -95,9 +95,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;

             }

 

@@ -107,15 +107,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);

                     }

                 }

@@ -131,22 +131,22 @@ 
     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);

             }

 

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

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

 

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

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

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

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

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

                 }

             }

@@ -165,15 +165,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).'] ');

             }

         }

     }

@@ -188,7 +188,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;

     }

 

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

     }

 

     /**

@@ -213,15 +213,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;

     }

@@ -235,27 +235,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] = $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');

                 }

             }

         }

@@ -270,17 +270,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);

         }

     }

@@ -295,21 +295,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;

@@ -317,15 +317,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;

@@ -402,7 +402,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;

@@ -418,9 +418,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]);

                 }

             }

@@ -433,16 +433,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;

             }

         }

@@ -459,11 +459,11 @@ 
 

         // we update the input values ​​after

         // we receive and check the saved objects.

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

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

 

-            if(property_exists($this,'groups') && is_array($this->groups) && in_array($key,$this->groups)){

+            if (property_exists($this, 'groups') && is_array($this->groups) && in_array($key, $this->groups)) {

 

-                $this->{$key} = $clientObjects['origin'][array_search($key,$this->groups)][$key];

+                $this->{$key} = $clientObjects['origin'][array_search($key, $this->groups)][$key];

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

 

                 // the request update to be performed using

@@ -472,7 +472,7 @@ 
                 unset($this->inputs[$key]);

             }

 

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

@@ -500,11 +500,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);

     }

 

     /**

@@ -515,28 +515,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;

                 }

@@ -555,8 +555,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

Braces +5 added lines, -10 removed lines

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

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

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

-        }

-        else {

+        } else {

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

         }

     }

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

             //set as the success object is false

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

-        }

-        else{

+        } else{

 

             //set as the success object is false

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

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

 

 

-        }

-        else{

+        } else{

 

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

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

-            }

-            else{

+            } else{

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

             }

 

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

 

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

-        }

-        else{

+        } else{

             echo $restaOutHandle;

         }

 

Spacing +65 added lines, -66 removed lines

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

     private function getStatusAccordingToExceptionTrace()

     {

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

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

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

         }

         else {

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

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

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

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

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

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

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

 

 

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

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

 

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

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

 

             //trace pattern

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

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

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

 

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

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

 

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

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

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

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

                 }

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

         }

 

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

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

 

             //set as the success object is false

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

         }

-        else{

+        else {

 

             //set as the success object is false

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

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

         }

     }

 

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

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

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

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

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

 

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

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

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

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

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

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

 

     }

 

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

      * @param null|string $errContext

      */

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

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

     {

         // in case of a deficiency,

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

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

         $this->getLangMessageForException();

 

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

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

 

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

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

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

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

 

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

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

 

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

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

             $vendorDirectory = $vd[0];

         }

 

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

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

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

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

         {

 

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

-                'An unexpected external error has occurred' :

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

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

 

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

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

 

 

             //Get or Set the HTTP response code

             http_response_code(500);

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

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

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

 

 

         }

-        else{

+        else {

 

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

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

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

             }

-            else{

+            else {

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

             }

 

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

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

 

             //Get or Set the HTTP response code

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

@@ -206,36 +205,36 @@ 
         // 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($productionLogMessage,$this->result);

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

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

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

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

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

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

+            $this->result = $exceptionResponse($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;

         }

 

@@ -246,7 +245,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'],

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

@@ -284,13 +283,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'];

             }

@@ -310,13 +309,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]);

                 }

             }

         }

@@ -329,33 +328,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);

                 }

             });

@@ -365,7 +364,7 @@ 
 

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

 

-        if($langMessage!==null){

+        if ($langMessage!==null) {

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

         }

     }

@@ -379,14 +378,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]);

         }

 

@@ -406,7 +405,7 @@ 
     /**

      * @param null|string $lang

      */

-    public function setLang($lang=null)

+    public function setLang($lang = null)

     {

         $this->lang = $lang;

     }