php-resta / resta-core

src/resta/Container/RepositoryContainer.php

Spacing +6 added lines, -6 removed lines

@@ -9,23 +9,23 @@
      * @param $param

      * @return mixed

      */

-    public function handle($parameter,$param)

+    public function handle($parameter, $param)

     {

         // We will use a custom bind for the repository classes

         // and bind the repository contract with the repository adapter class.

         $parameterName = $parameter->getType()->getName();

         $repository = app()->namespace()->repository();

 

-        $parameterNameWord  = str_replace('\\','',$parameterName);

-        $repositoryWord     = str_replace('\\','',$repository);

+        $parameterNameWord  = str_replace('\\', '', $parameterName);

+        $repositoryWord     = str_replace('\\', '', $repository);

 

 

         // if the submitted contract matches the repository class.

-        if(preg_match('@'.$repositoryWord.'@is',$parameterNameWord)){

+        if (preg_match('@'.$repositoryWord.'@is', $parameterNameWord)) {

 

             //we bind the contract as an adapter

-            $repositoryName = str_replace('Contract','',$parameter->getName());

-            $getRepositoryAdapter = \application::repository($repositoryName,true);

+            $repositoryName = str_replace('Contract', '', $parameter->getName());

+            $getRepositoryAdapter = \application::repository($repositoryName, true);

 

             $param[$parameter->getName()] = app()->resolve($getRepositoryAdapter)->adapter();

         }

src/resta/Container/Container.php

Spacing +58 added lines, -58 removed lines

@@ -7,12 +7,12 @@ 
 use Resta\Contracts\ContainerContracts;

 use Resta\Container\ContainerKernelAssigner;

 

-class Container implements ContainerContracts,\ArrayAccess

+class Container implements ContainerContracts, \ArrayAccess

 {

     /**

      * @var $singleton

      */

-    public $singleton=false;

+    public $singleton = false;

 

     /**

      * @var $kernel

@@ -22,7 +22,7 @@ 
     /**

      * @var array  $instance

      */

-    private static $instance=[];

+    private static $instance = [];

 

     /**

      * @var array $instances

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

      * @var array $bindParams

      */

-    private static $bindParams=[];

+    private static $bindParams = [];

 

     /**

      * @var $unregister

@@ -42,19 +42,19 @@ 
     /**

      * @var array

      */

-    protected $values=[];

+    protected $values = [];

 

     /**

      * @param $make

      * @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]);

     }

 

     /**

@@ -65,12 +65,12 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\NotFoundException

      */

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

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

     {

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

     }

 

     /**

@@ -82,16 +82,16 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\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();

@@ -106,11 +106,11 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\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();

@@ -125,7 +125,7 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\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);

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

     }

 

     /**

@@ -146,11 +146,11 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\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);

     }

 

     /**

@@ -162,12 +162,12 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\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.

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

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

         }

@@ -208,11 +208,11 @@ 
 

         // 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 {

                 return null;

             }

         }

@@ -235,11 +235,11 @@ 
 

         // 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.

@@ -247,7 +247,7 @@ 
                 $container = $container[$item];

                 $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.

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

     }

 

     /**

@@ -307,7 +307,7 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\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

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

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

     }

 

     /**

@@ -343,7 +343,7 @@ 
      */

     public function offsetGet($offset) {

 

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

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

             'instances' => $this->instances

         ])->{$offset}();

     }

@@ -367,7 +367,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.

@@ -377,7 +377,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.

@@ -396,19 +396,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'];

     }

 

     /**

@@ -419,22 +419,22 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\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;

+            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

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

         }

 

@@ -469,7 +469,7 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\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

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

 

     }

 

@@ -502,7 +502,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.

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

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

     }

 

     /**

@@ -545,11 +545,11 @@ 
      * @param null $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});

             return false;

         }

Braces +11 added lines, -7 removed lines

@@ -87,7 +87,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.

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

@@ -167,7 +171,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.

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

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

                 $container = $container[$item];

-            }

-            else{

+            } else{

                 return null;

             }

         }

@@ -246,8 +251,7 @@ 
                 // the control result is transferred to the bools array.

                 $container = $container[$item];

                 $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.

src/resta/Container/NameContainers/SpecialNameContainer.php

Spacing +8 added lines, -8 removed lines

@@ -9,28 +9,28 @@ 
      * @param $param

      * @return mixed

      */

-    public function resolveContainer($parameter,$param)

+    public function resolveContainer($parameter, $param)

     {

         //we get the custom name container value via serviceContainer.

-        $specialNameContainer=app()->singleton()->serviceContainer[$parameter->getName()];

+        $specialNameContainer = app()->singleton()->serviceContainer[$parameter->getName()];

 

         // we determine whether the value of

         // the private name container is class.

-        if(class_exists($specialNameContainer)){

+        if (class_exists($specialNameContainer)) {

 

             //we resolve the custom name container through the service container.

-            $resolveSpecialNameContainer=app()->resolve($specialNameContainer);

+            $resolveSpecialNameContainer = app()->resolve($specialNameContainer);

 

             // we need to find out whether we have

             // the specific name getNameContainer method solved

             // so we can use the special name container value with bind.

-            if(method_exists($resolveSpecialNameContainer,'getNameContainer')){

+            if (method_exists($resolveSpecialNameContainer, 'getNameContainer')) {

 

                 // when we bind the name container method,

                 // we check the existence of the default value so that we can use it directly for lean.

                 // and then save it in the parameter context by executing the getNameContainer method.

-                $getParams=($parameter->isDefaultValueAvailable()) ? $parameter->getDefaultValue() : null;

-                $param[$parameter->getName()]=$resolveSpecialNameContainer->getNameContainer($getParams);

+                $getParams = ($parameter->isDefaultValueAvailable()) ? $parameter->getDefaultValue() : null;

+                $param[$parameter->getName()] = $resolveSpecialNameContainer->getNameContainer($getParams);

 

                 //return $param

                 return $param;

@@ -38,7 +38,7 @@ 
         }

 

         //parameter context for special name container and return

-        $param[$parameter->getName()]=$parameter->getDefaultValue();

+        $param[$parameter->getName()] = $parameter->getDefaultValue();

         return $param;

     }

 

src/resta/Container/NameContainers/RouteContainer.php

Indentation +5 added lines, -5 removed lines

@@ -66,12 +66,12 @@
         $list = [];

 

         if(preg_match('@route\((.*?)\)\r\n@is',$doc,$route)){

-           $routeParams = explode (" ",$route[1]);

+            $routeParams = explode (" ",$route[1]);

 

-           foreach ($routeParams as $routeParam){

-               $routeParam = explode(":",$routeParam);

-               $list[$routeParam[0]] = $routeParam[1];

-           }

+            foreach ($routeParams as $routeParam){

+                $routeParam = explode(":",$routeParam);

+                $list[$routeParam[0]] = $routeParam[1];

+            }

         }

 

         return $list;

Spacing +22 added lines, -22 removed lines

@@ -10,7 +10,7 @@ 
     /**

      * @var array $parameters

      */

-    protected $parameters=array();

+    protected $parameters = array();

 

     /**

      * @var $reflection \ReflectionMethod

@@ -32,12 +32,12 @@ 
     private function checkRouteObligation($parameters)

     {

         //check $parameters value for obligation

-        foreach ($parameters as $parameterKey=>$parameter){

+        foreach ($parameters as $parameterKey=>$parameter) {

 

             // we use a question mark as a constant value which is not a necessity.

             // according to the presence of this sign,

             // we take this mark as a parameter to save the value as a real value.

-            $this->parameters[] = Str::replaceArray('?',[''],$parameter);

+            $this->parameters[] = Str::replaceArray('?', [''], $parameter);

 

             // we take all the route values

             // ​​into the allRoutes variable.

@@ -45,11 +45,11 @@ 
 

             // the values ​​that do not end with the question mark

             // as mandatory values ​​will be required as parameters.

-            if(!Str::endsWith($parameter,'?')){

+            if (!Str::endsWith($parameter, '?')) {

 

                 // if the requirement is not in the true route value,

                 // the exception will be thrown with the missing parameter message.

-                if(!isset($allRoutes[$parameterKey])){

+                if (!isset($allRoutes[$parameterKey])) {

                     exception()->invalidArgument('Route parameter is missing [ as '.$parameterKey.' key ]');

                 }

             }

@@ -65,11 +65,11 @@ 
 

         $list = [];

 

-        if(preg_match('@route\((.*?)\)\r\n@is',$doc,$route)){

-           $routeParams = explode (" ",$route[1]);

+        if (preg_match('@route\((.*?)\)\r\n@is', $doc, $route)) {

+           $routeParams = explode(" ", $route[1]);

 

-           foreach ($routeParams as $routeParam){

-               $routeParam = explode(":",$routeParam);

+           foreach ($routeParams as $routeParam) {

+               $routeParam = explode(":", $routeParam);

                $list[$routeParam[0]] = $routeParam[1];

            }

         }

@@ -82,7 +82,7 @@ 
      * @param $param

      * @return mixed

      */

-    public function resolveContainer($parameters,$param)

+    public function resolveContainer($parameters, $param)

     {

         // we apply this method to obtain reliable

         // route data by checking the route requirement.

@@ -102,7 +102,7 @@ 
         // the user will determine

         // if the route parameters are in

         // accordance with the regular expression rule as a pattern.

-        $this->routePatternProcess($serviceConf,$param['route']);

+        $this->routePatternProcess($serviceConf, $param['route']);

 

         // when the route nameContainer is defined,

         // these keys must be absolute string data.

@@ -116,34 +116,34 @@ 
      * @param $serviceConf

      * @param $params

      */

-    private function routePatternProcess($serviceConf,$params)

+    private function routePatternProcess($serviceConf, $params)

     {

-        if(isset($serviceConf['routeParameters'])){

+        if (isset($serviceConf['routeParameters'])) {

 

             $routeParameters = $serviceConf['routeParameters'];

 

             $pattern = [];

 

-            if(isset($routeParameters[strtolower(httpMethod)][methodName]['pattern'])){

+            if (isset($routeParameters[strtolower(httpMethod)][methodName]['pattern'])) {

                 $pattern = $routeParameters[strtolower(httpMethod)][methodName]['pattern'];

             }

 

-            foreach ($params as $key=>$param){

+            foreach ($params as $key=>$param) {

 

                 $routeFromDocComment = $this->getRouteFromDocComment();

 

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

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

 

-                    if(!preg_match('@^'.$routeFromDocComment[$key].'$@is',$param)){

+                    if (!preg_match('@^'.$routeFromDocComment[$key].'$@is', $param)) {

                         exception()

                             ->invalidArgument('route '.$key.' value is not valid for configuration as pattern');

                     }

                 }

-                else{

+                else {

 

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

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

 

-                        if(!preg_match('@'.$pattern[$key].'$@is',$param)){

+                        if (!preg_match('@'.$pattern[$key].'$@is', $param)) {

                             exception()

                                 ->invalidArgument('route id value is not valid for configuration as pattern');

                         }

@@ -163,9 +163,9 @@ 
     {

         // we pass all the key values ​​of

         // the route data through the string control.

-        foreach (route() as $routeKey=>$routeValue){

+        foreach (route() as $routeKey=>$routeValue) {

 

-            if(in_array($routeKey,$this->parameters) && preg_match('@[^a-z||\?]@',$routeKey)){

+            if (in_array($routeKey, $this->parameters) && preg_match('@[^a-z||\?]@', $routeKey)) {

                 exception()->invalidArgument('Route key should be only string value');

             }

         }

Braces +1 added lines, -2 removed lines

@@ -138,8 +138,7 @@
                         exception()

                             ->invalidArgument('route '.$key.' value is not valid for configuration as pattern');

                     }

-                }

-                else{

+                } else{

 

                     if(isset($pattern[$key])){

 

src/resta/Traits/ConsoleColor.php

Spacing +68 added lines, -68 removed lines

@@ -13,23 +13,23 @@ 
      */

     public function getColoredString($string, $foreground_color = null, $background_color = null)

     {

-        $this->consoleLogger($string,'info');

+        $this->consoleLogger($string, 'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

+        if (isset($this->argument['commandCall'])) return $string;

 

         $colored_string = "";

 

         // Check if given foreground color found

         if (isset($this->foreground_colors[$foreground_color])) {

-            $colored_string .= "\033[" . $this->foreground_colors[$foreground_color] . "m";

+            $colored_string .= "\033[".$this->foreground_colors[$foreground_color]."m";

         }

         // Check if given background color found

         if (isset($this->background_colors[$background_color])) {

-            $colored_string .= "\033[" . $this->background_colors[$background_color] . "m";

+            $colored_string .= "\033[".$this->background_colors[$background_color]."m";

         }

 

         // Add string and end coloring

-        $colored_string .=  $string . "\033[0m";

+        $colored_string .= $string."\033[0m";

 

         return $colored_string;

     }

@@ -43,25 +43,25 @@ 
      */

     public function info($string, $foreground_color = 'blue', $background_color = 'white')

     {

-        $this->consoleLogger($string,'info');

+        $this->consoleLogger($string, 'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

+        if (isset($this->argument['commandCall'])) return $string;

 

         $colored_string = "";

 

         // Check if given foreground color found

         if (isset($this->foreground_colors[$foreground_color])) {

-            $colored_string .= "\033[" . $this->foreground_colors[$foreground_color] . "m";

+            $colored_string .= "\033[".$this->foreground_colors[$foreground_color]."m";

         }

         // Check if given background color found

         if (isset($this->background_colors[$background_color])) {

-            $colored_string .= "\033[" . $this->background_colors[$background_color] . "m";

+            $colored_string .= "\033[".$this->background_colors[$background_color]."m";

         }

 

         // Add string and end coloring

-        $colored_string .=  $string . "\033[0m";

+        $colored_string .= $string."\033[0m";

 

-        return ''.$colored_string.'' . PHP_EOL;

+        return ''.$colored_string.''.PHP_EOL;

     }

 

     /**

@@ -71,19 +71,19 @@ 
      */

     public function red($string, $foreground_color = 'red')

     {

-        $this->consoleLogger($string,'info');

+        $this->consoleLogger($string, 'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

+        if (isset($this->argument['commandCall'])) return $string;

 

         $colored_string = "";

 

         // Check if given foreground color found

         if (isset($this->foreground_colors[$foreground_color])) {

-            $colored_string .= "\033[" . $this->foreground_colors[$foreground_color] . "m";

+            $colored_string .= "\033[".$this->foreground_colors[$foreground_color]."m";

         }

 

         // Add string and end coloring

-        $colored_string .=  $string . "\033[0m";

+        $colored_string .= $string."\033[0m";

 

         return $colored_string;

     }

@@ -97,25 +97,25 @@ 
      */

     public function success($string, $foreground_color = 'white', $background_color = 'yellow')

     {

-        $this->consoleLogger($string,'info');

+        $this->consoleLogger($string, 'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

+        if (isset($this->argument['commandCall'])) return $string;

 

         $colored_string = "";

 

         // Check if given foreground color found

         if (isset($this->foreground_colors[$foreground_color])) {

-            $colored_string .= "\033[" . $this->foreground_colors[$foreground_color] . "m";

+            $colored_string .= "\033[".$this->foreground_colors[$foreground_color]."m";

         }

         // Check if given background color found

         if (isset($this->background_colors[$background_color])) {

-            $colored_string .= "\033[" . $this->background_colors[$background_color] . "m";

+            $colored_string .= "\033[".$this->background_colors[$background_color]."m";

         }

 

         // Add string and end coloring

-        $colored_string .=  $string . "\033[0m";

+        $colored_string .= $string."\033[0m";

 

-        return ''.$colored_string.'' . PHP_EOL;

+        return ''.$colored_string.''.PHP_EOL;

     }

 

     /**

@@ -126,25 +126,25 @@ 
      */

     public function classical($string, $foreground_color = 'red', $background_color = 'white')

     {

-        $this->consoleLogger($string,'info');

+        $this->consoleLogger($string, 'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

+        if (isset($this->argument['commandCall'])) return $string;

 

         $colored_string = "";

 

         // Check if given foreground color found

         if (isset($this->foreground_colors[$foreground_color])) {

-            $colored_string .= "\033[" . $this->foreground_colors[$foreground_color] . "m";

+            $colored_string .= "\033[".$this->foreground_colors[$foreground_color]."m";

         }

         // Check if given background color found

         if (isset($this->background_colors[$background_color])) {

-            $colored_string .= "\033[" . $this->background_colors[$background_color] . "m";

+            $colored_string .= "\033[".$this->background_colors[$background_color]."m";

         }

 

         // Add string and end coloring

-        $colored_string .=  $string . "\033[0m";

+        $colored_string .= $string."\033[0m";

 

-        return ''.$colored_string.'' . PHP_EOL;

+        return ''.$colored_string.''.PHP_EOL;

     }

 

     /**

@@ -155,25 +155,25 @@ 
      */

     public function bluePrint($string, $foreground_color = 'blue', $background_color = 'white')

     {

-        $this->consoleLogger($string,'info');

+        $this->consoleLogger($string, 'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

+        if (isset($this->argument['commandCall'])) return $string;

 

         $colored_string = "";

 

         // Check if given foreground color found

         if (isset($this->foreground_colors[$foreground_color])) {

-            $colored_string .= "\033[" . $this->foreground_colors[$foreground_color] . "m";

+            $colored_string .= "\033[".$this->foreground_colors[$foreground_color]."m";

         }

         // Check if given background color found

         if (isset($this->background_colors[$background_color])) {

-            $colored_string .= "\033[" . $this->background_colors[$background_color] . "m";

+            $colored_string .= "\033[".$this->background_colors[$background_color]."m";

         }

 

         // Add string and end coloring

-        $colored_string .=  $string . "\033[0m";

+        $colored_string .= $string."\033[0m";

 

-        return ''.$colored_string.'' . PHP_EOL;

+        return ''.$colored_string.''.PHP_EOL;

     }

 

     /**

@@ -184,25 +184,25 @@ 
      */

     public function yellowPrint($string, $foreground_color = 'black', $background_color = 'yellow')

     {

-        $this->consoleLogger($string,'info');

+        $this->consoleLogger($string, 'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

+        if (isset($this->argument['commandCall'])) return $string;

 

         $colored_string = "";

 

         // Check if given foreground color found

         if (isset($this->foreground_colors[$foreground_color])) {

-            $colored_string .= "\033[" . $this->foreground_colors[$foreground_color] . "m";

+            $colored_string .= "\033[".$this->foreground_colors[$foreground_color]."m";

         }

         // Check if given background color found

         if (isset($this->background_colors[$background_color])) {

-            $colored_string .= "\033[" . $this->background_colors[$background_color] . "m";

+            $colored_string .= "\033[".$this->background_colors[$background_color]."m";

         }

 

         // Add string and end coloring

-        $colored_string .=  $string . "\033[0m";

+        $colored_string .= $string."\033[0m";

 

-        return ''.$colored_string.'' . PHP_EOL;

+        return ''.$colored_string.''.PHP_EOL;

     }

 

     /**

@@ -213,25 +213,25 @@ 
      */

     public function blue($string, $foreground_color = 'white', $background_color = 'blue')

     {

-        $this->consoleLogger($string,'info');

+        $this->consoleLogger($string, 'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

+        if (isset($this->argument['commandCall'])) return $string;

 

         $colored_string = "";

 

         // Check if given foreground color found

         if (isset($this->foreground_colors[$foreground_color])) {

-            $colored_string .= "\033[" . $this->foreground_colors[$foreground_color] . "m";

+            $colored_string .= "\033[".$this->foreground_colors[$foreground_color]."m";

         }

         // Check if given background color found

         if (isset($this->background_colors[$background_color])) {

-            $colored_string .= "\033[" . $this->background_colors[$background_color] . "m";

+            $colored_string .= "\033[".$this->background_colors[$background_color]."m";

         }

 

         // Add string and end coloring

-        $colored_string .=  $string . "\033[0m";

+        $colored_string .= $string."\033[0m";

 

-        return ''.$colored_string.'' . PHP_EOL;

+        return ''.$colored_string.''.PHP_EOL;

     }

 

     /**

@@ -242,25 +242,25 @@ 
      */

     public function yellow($string, $foreground_color = 'blue', $background_color = 'yellow')

     {

-        $this->consoleLogger($string,'info');

+        $this->consoleLogger($string, 'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

+        if (isset($this->argument['commandCall'])) return $string;

 

         $colored_string = "";

 

         // Check if given foreground color found

         if (isset($this->foreground_colors[$foreground_color])) {

-            $colored_string .= "\033[" . $this->foreground_colors[$foreground_color] . "m";

+            $colored_string .= "\033[".$this->foreground_colors[$foreground_color]."m";

         }

         // Check if given background color found

         if (isset($this->background_colors[$background_color])) {

-            $colored_string .= "\033[" . $this->background_colors[$background_color] . "m";

+            $colored_string .= "\033[".$this->background_colors[$background_color]."m";

         }

 

         // Add string and end coloring

-        $colored_string .=  $string . "\033[0m";

+        $colored_string .= $string."\033[0m";

 

-        return ''.$colored_string.'' . PHP_EOL;

+        return ''.$colored_string.''.PHP_EOL;

     }

 

     /**

@@ -271,25 +271,25 @@ 
      */

     public function cyan($string, $foreground_color = 'magenta', $background_color = 'cyan')

     {

-        $this->consoleLogger($string,'info');

+        $this->consoleLogger($string, 'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

+        if (isset($this->argument['commandCall'])) return $string;

 

         $colored_string = "";

 

         // Check if given foreground color found

         if (isset($this->foreground_colors[$foreground_color])) {

-            $colored_string .= "\033[" . $this->foreground_colors[$foreground_color] . "m";

+            $colored_string .= "\033[".$this->foreground_colors[$foreground_color]."m";

         }

         // Check if given background color found

         if (isset($this->background_colors[$background_color])) {

-            $colored_string .= "\033[" . $this->background_colors[$background_color] . "m";

+            $colored_string .= "\033[".$this->background_colors[$background_color]."m";

         }

 

         // Add string and end coloring

-        $colored_string .=  $string . "\033[0m";

+        $colored_string .= $string."\033[0m";

 

-        return ''.$colored_string.'' . PHP_EOL;

+        return ''.$colored_string.''.PHP_EOL;

     }

 

     /**

@@ -300,23 +300,23 @@ 
      */

     public function input($string, $foreground_color = 'blue', $background_color = 'light_gray')

     {

-        $this->consoleLogger($string,'info');

+        $this->consoleLogger($string, 'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

+        if (isset($this->argument['commandCall'])) return $string;

 

         $colored_string = "";

 

         // Check if given foreground color found

         if (isset($this->foreground_colors[$foreground_color])) {

-            $colored_string .= "\033[" . $this->foreground_colors[$foreground_color] . "m";

+            $colored_string .= "\033[".$this->foreground_colors[$foreground_color]."m";

         }

         // Check if given background color found

         if (isset($this->background_colors[$background_color])) {

-            $colored_string .= "\033[" . $this->background_colors[$background_color] . "m";

+            $colored_string .= "\033[".$this->background_colors[$background_color]."m";

         }

 

         // Add string and end coloring

-        $colored_string .=  $string . "\033[0m";

+        $colored_string .= $string."\033[0m";

 

         return ''.$colored_string.'';

     }

@@ -329,24 +329,24 @@ 
      */

     public function error($string, $foreground_color = 'white', $background_color = 'red')

     {

-        $this->consoleLogger($string,'error');

+        $this->consoleLogger($string, 'error');

 

-        if(isset($this->argument['commandCall'])) return $string;

+        if (isset($this->argument['commandCall'])) return $string;

 

         $colored_string = "";

 

         // Check if given foreground color found

         if (isset($this->foreground_colors[$foreground_color])) {

-            $colored_string .= "\033[" . $this->foreground_colors[$foreground_color] . "m";

+            $colored_string .= "\033[".$this->foreground_colors[$foreground_color]."m";

         }

         // Check if given background color found

         if (isset($this->background_colors[$background_color])) {

-            $colored_string .= "\033[" . $this->background_colors[$background_color] . "m";

+            $colored_string .= "\033[".$this->background_colors[$background_color]."m";

         }

 

         // Add string and end coloring

-        $colored_string .=  "!!!! Error : ".$string . "              \033[0m";

+        $colored_string .= "!!!! Error : ".$string."              \033[0m";

 

-        return ''.$colored_string.'' . PHP_EOL;

+        return ''.$colored_string.''.PHP_EOL;

     }

 }
\ No newline at end of file

Braces +36 added lines, -12 removed lines

@@ -15,7 +15,9 @@ 
     {

         $this->consoleLogger($string,'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

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

+            return $string;

+        }

 

         $colored_string = "";

 

@@ -45,7 +47,9 @@ 
     {

         $this->consoleLogger($string,'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

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

+            return $string;

+        }

 

         $colored_string = "";

 

@@ -73,7 +77,9 @@ 
     {

         $this->consoleLogger($string,'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

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

+            return $string;

+        }

 

         $colored_string = "";

 

@@ -99,7 +105,9 @@ 
     {

         $this->consoleLogger($string,'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

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

+            return $string;

+        }

 

         $colored_string = "";

 

@@ -128,7 +136,9 @@ 
     {

         $this->consoleLogger($string,'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

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

+            return $string;

+        }

 

         $colored_string = "";

 

@@ -157,7 +167,9 @@ 
     {

         $this->consoleLogger($string,'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

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

+            return $string;

+        }

 

         $colored_string = "";

 

@@ -186,7 +198,9 @@ 
     {

         $this->consoleLogger($string,'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

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

+            return $string;

+        }

 

         $colored_string = "";

 

@@ -215,7 +229,9 @@ 
     {

         $this->consoleLogger($string,'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

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

+            return $string;

+        }

 

         $colored_string = "";

 

@@ -244,7 +260,9 @@ 
     {

         $this->consoleLogger($string,'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

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

+            return $string;

+        }

 

         $colored_string = "";

 

@@ -273,7 +291,9 @@ 
     {

         $this->consoleLogger($string,'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

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

+            return $string;

+        }

 

         $colored_string = "";

 

@@ -302,7 +322,9 @@ 
     {

         $this->consoleLogger($string,'info');

 

-        if(isset($this->argument['commandCall'])) return $string;

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

+            return $string;

+        }

 

         $colored_string = "";

 

@@ -331,7 +353,9 @@ 
     {

         $this->consoleLogger($string,'error');

 

-        if(isset($this->argument['commandCall'])) return $string;

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

+            return $string;

+        }

 

         $colored_string = "";

 

src/resta/Traits/PropertyAccessibility.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
      * @param $offset

      * @param $value

      */

-    final public function offsetSet($offset,$value)

+    final public function offsetSet($offset, $value)

     {

         $this->{$offset} = $value;

     }

src/resta/Traits/NamespaceForRoute.php

Spacing +19 added lines, -19 removed lines

@@ -56,8 +56,8 @@ 
      */

     public function resolveMethod($method)

     {

-        $method=str_replace(httpMethod(),'',$method);

-        $method=str_replace(StaticPathModel::$methodPrefix,'',$method);

+        $method = str_replace(httpMethod(), '', $method);

+        $method = str_replace(StaticPathModel::$methodPrefix, '', $method);

         return $method;

     }

 

@@ -105,16 +105,16 @@ 
         //If controller does not have a method after checking whether the method specified in the controller class exists,

         //then by default we assign a default method value of indexAction.

         //This value must match the class strictly, otherwise the controller can not be called

-        if(method_exists($this->app['instanceController'],$this->getPrefixMethod())){

+        if (method_exists($this->app['instanceController'], $this->getPrefixMethod())) {

 

             //method value as normal

-            return $this->setViaDefine($this->getPrefixMethod(),$globalInstance);

+            return $this->setViaDefine($this->getPrefixMethod(), $globalInstance);

         }

 

         //by default we assign a default method value of indexAction

         //this value must be a method value automatically named indexAction

         //if it does not come from the url discovery value

-        return $this->setViaDefine($this->getPrefixIndexMethod(),$globalInstance);

+        return $this->setViaDefine($this->getPrefixIndexMethod(), $globalInstance);

     }

 

     /**

@@ -125,7 +125,7 @@ 
     {

         //If the path variables give values ​​in the methods do we have a method name,

         //we subtract this value from the route variables.

-        return array_values(array_diff(core()->routeParameters,[$method]));

+        return array_values(array_diff(core()->routeParameters, [$method]));

     }

 

     /**

@@ -133,12 +133,12 @@ 
      * @param $globalInstance Router

      * @return mixed

      */

-    private function setViaDefine($method,$globalInstance)

+    private function setViaDefine($method, $globalInstance)

     {

         // we are extracting httpMethod and prefix from

         // the method variable so that we can extract the salt method name.

-        $deleteHttp         = str_replace(httpMethod(),'',$method);

-        $methodName         = str_replace(StaticPathModel::$methodPrefix,'',$deleteHttp);

+        $deleteHttp         = str_replace(httpMethod(), '', $method);

+        $methodName         = str_replace(StaticPathModel::$methodPrefix, '', $deleteHttp);

 

         //set as global method name

         $globalInstance->setMethodNameViaDefine($methodName);

@@ -156,19 +156,19 @@ 
         $fromRoutes         = Route::getRouteResolve();

         $namespace          = null;

 

-        if(count($fromRoutes)){

-            $fromRoutesClass    = (isset($fromRoutes['class'])) ? $fromRoutes['class'] : null;

+        if (count($fromRoutes)) {

+            $fromRoutesClass = (isset($fromRoutes['class'])) ? $fromRoutes['class'] : null;

 

-            if($fromRoutes['namespace']===null){

+            if ($fromRoutes['namespace']===null) {

                 $namespace = Utils::getNamespace($fromRoutes['controller']).'\\'.$fromRoutesClass;

             }

-            else{

+            else {

                 $namespace = Utils::getNamespace($fromRoutes['controller']).'\\'.$fromRoutes['namespace'].'\\'.$fromRoutesClass;

             }

         }

 

         //check namespace exists

-        if(file_exists(Utils::getPathFromNamespace($namespace)) && Utils::isNamespaceExists($namespace)){

+        if (file_exists(Utils::getPathFromNamespace($namespace)) && Utils::isNamespaceExists($namespace)) {

 

             // the controller classes are registered in the config controller.

             // the controller class is not executed if it is not available here.

@@ -188,7 +188,7 @@ 
     public function checkAutoService($instance)

     {

         //If auto service is present, this auto service will be accepted as endpoint namespace.

-        return $this->checkEndpointForAutoService()->getNamespaceForAutoService($instance,function(){

+        return $this->checkEndpointForAutoService()->getNamespaceForAutoService($instance, function() {

             throw new \UnexpectedValueException('Any endpoint is not available');

         });

     }

@@ -200,19 +200,19 @@ 
     {

         $configController = config('controller');

 

-        if($configController===null

+        if ($configController===null

             OR !isset($configController[$this->endpoint()])

-            or !isset($configController[$this->endpoint()][$namespace])){

+            or !isset($configController[$this->endpoint()][$namespace])) {

             exception()->badFunctionCall('The request has not been saved in your configuration settings.');

         }

 

         $configController = $configController[$this->endpoint()][$namespace];

 

-        if(isset($configController[environment()]) and $configController[environment()]===false){

+        if (isset($configController[environment()]) and $configController[environment()]===false) {

             exception()->domain('Sorry, this endpoint is not allowed to run for this environment.');

         }

 

-        if(isset($configController['all']) AND $configController['all']===false){

+        if (isset($configController['all']) AND $configController['all']===false) {

             exception()->domain('Sorry, this endpoint is never allowed to run.');

         }

     }

Braces +1 added lines, -2 removed lines

@@ -161,8 +161,7 @@
 

             if($fromRoutes['namespace']===null){

                 $namespace = Utils::getNamespace($fromRoutes['controller']).'\\'.$fromRoutesClass;

-            }

-            else{

+            } else{

                 $namespace = Utils::getNamespace($fromRoutes['controller']).'\\'.$fromRoutes['namespace'].'\\'.$fromRoutesClass;

             }

         }

src/resta/Exception/ErrorProvider.php

Braces +6 added lines, -12 removed lines

@@ -46,8 +46,7 @@ 
         if(isset(core()->exceptiontrace))

         {

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

-        }

-        else {

+        } else {

 

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

         }

@@ -139,8 +138,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']];

@@ -176,8 +174,7 @@ 
             $this->app->register('responseStatus',500);

 

 

-        }

-        else{

+        } else{

 

             $appException=$this->getAppException($environment,$this->data['errStrReal']);

 

@@ -210,8 +207,7 @@ 
 

             echo json_encode(core()->out->outputFormatter($appException));

             exit();

-        }

-        else{

+        } else{

             echo $restaOutHandle;

             exit();

         }

@@ -321,8 +317,7 @@ 
 

         if($lang!==null){

             $langMessage=trans('exception.'.$lang);

-        }

-        else{

+        } else{

             $langMessage=null;

         }

 

@@ -352,8 +347,7 @@ 
 

         if($this->data['errType']==="Undefined"){

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

-        }

-        else{

+        } else{

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

         }

     }

Spacing +89 added lines, -90 removed lines

@@ -24,12 +24,12 @@ 
     /**

      * @var $data array

      */

-    protected $data=array();

+    protected $data = array();

 

     /**

      * @return mixed|string

      */

-    private function getEnvironmentStatus(){

+    private function getEnvironmentStatus() {

 

         // application key, but if it has a null value

         // then we move the environment value to the production environment.

@@ -39,41 +39,41 @@ 
     /**

      * @return void|mixed

      */

-    private function getStatusFromContext(){

+    private function getStatusFromContext() {

 

-        $exception=$this->exception;

+        $exception = $this->exception;

 

-        if(isset(core()->exceptiontrace))

+        if (isset(core()->exceptiontrace))

         {

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

         }

         else {

 

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

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

         }

 

         $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'])) {

 

             //linux test

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

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

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

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

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

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

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

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

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

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

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

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

                 }

             }

 

 

-            $this->data['errType']=class_basename($this->data['errType']);

+            $this->data['errType'] = class_basename($this->data['errType']);

         }

     }

 

@@ -89,18 +89,18 @@ 
         // in general we will use the exception class

         // in the store/config directory to make it possible

         // to change the user-based exceptions.

-        $this->exception=StaticPathModel::$store.'\Config\Exception';

+        $this->exception = StaticPathModel::$store.'\Config\Exception';

 

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

     }

 

     /**

@@ -110,7 +110,7 @@ 
      * @param null $errLine

      * @param null $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.

@@ -135,79 +135,78 @@ 
 

         $this->getStatusFromContext();

 

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

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

 

             //set as the success object is false

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

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

         }

 

         //get lang message for exception

         $this->getLangMessageForException();

 

-        if(property_exists(core(),'exceptiontrace')){

+        if (property_exists(core(), 'exceptiontrace')) {

 

-            $customExceptionTrace=core()->exceptiontrace;

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

-            $this->data['errLine']=$customExceptionTrace['line'];

+            $customExceptionTrace = core()->exceptiontrace;

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

+            $this->data['errLine'] = $customExceptionTrace['line'];

         }

 

         $environment = $this->getEnvironmentStatus();

 

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

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

 

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

 

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

+            $appException = $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 {

 

-            $appException=$this->getAppException($environment,$this->data['errStrReal']);

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

 

             //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',core()->out->outputFormatter($productionLogMessage));

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

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

         }

 

-        if(app()->has('requestExpected') && config('app.requestWithError')===true){

+        if (app()->has('requestExpected') && config('app.requestWithError')===true) {

             $appException['request']['expected'] = app()->get('requestExpected');

         }

 

 

         //set json app exception

-        core()->routerResult=$appException;

+        core()->routerResult = $appException;

 

         $restaOutHandle = null;

 

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

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

 

-            $restaOutHandle=core()->out->handle();

+            $restaOutHandle = core()->out->handle();

         }

 

-        if($restaOutHandle===null){

+        if ($restaOutHandle===null) {

 

             //header set and symfony response call

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

@@ -215,7 +214,7 @@ 
             echo json_encode(core()->out->outputFormatter($appException));

             exit();

         }

-        else{

+        else {

             echo $restaOutHandle;

             exit();

         }

@@ -226,7 +225,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'],

@@ -244,18 +243,18 @@ 
     public function fatalErrorShutdownHandler()

     {

         //get fatal error

-        $last_error =error_get_last();

+        $last_error = error_get_last();

 

         $this->inStactTrace($last_error);

 

-        if($last_error!==null){

+        if ($last_error!==null) {

 

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

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

 

-                define('methodName',null);

+                define('methodName', null);

             }

 

-            if(isset(core()->exceptionFile)){

+            if (isset(core()->exceptionFile)) {

                 $last_error['file'] = core()->exceptionFile;

                 $last_error['line'] = core()->exceptionLine;

             }

@@ -275,12 +274,12 @@ 
      */

     public function inStactTrace($error)

     {

-        if(isset(core()->urlComponent)){

-            if(!preg_match('@'.core()->urlComponent['project'].'@',$error['file']) && !isset(core()->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 (isset(core()->urlComponent)) {

+            if (!preg_match('@'.core()->urlComponent['project'].'@', $error['file']) && !isset(core()->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]);

                 }

             }

         }

@@ -289,76 +288,76 @@ 
     /**

      * @return void|mixed

      */

-    private function getLangMessageForException(){

+    private function getLangMessageForException() {

 

         $clone = clone $this;

 

-        if(property_exists(core(),'exceptionTranslate')){

+        if (property_exists(core(), 'exceptionTranslate')) {

 

-            $langMessage=trans('exception.'.core()->exceptionTranslate);

+            $langMessage = trans('exception.'.core()->exceptionTranslate);

 

-            if(!is_null($langMessage) && property_exists(core(),'exceptionTranslateParams')){

+            if (!is_null($langMessage) && property_exists(core(), 'exceptionTranslateParams')) {

 

-                if(count(core()->exceptionTranslateParams[core()->exceptionTranslate])){

-                    foreach (core()->exceptionTranslateParams[core()->exceptionTranslate] as $key=>$value){

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

+                if (count(core()->exceptionTranslateParams[core()->exceptionTranslate])) {

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

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

                     }

                 }

             }

 

-            if($langMessage!==null){

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

+            if ($langMessage!==null) {

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

             }

         }

 

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

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

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

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

 

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

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

-                    $clone->lang=$this->lang;

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

+                    $clone->lang = $this->lang;

                 }

             });

         }

 

-        $this->data['lang']=$lang=$clone->lang;

+        $this->data['lang'] = $lang = $clone->lang;

 

-        if($lang!==null){

-            $langMessage=trans('exception.'.$lang);

+        if ($lang!==null) {

+            $langMessage = trans('exception.'.$lang);

         }

-        else{

-            $langMessage=null;

+        else {

+            $langMessage = null;

         }

 

 

-        if($langMessage!==null){

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

+        if ($langMessage!==null) {

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

         }

     }

 

     /**

      * @return void|mixed

      */

-    private function getUncaughtProcess(){

+    private function getUncaughtProcess() {

 

         // 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['errorClassNamespace']=$this->data['errType'];

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

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

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

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

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

         }

 

-        if($this->data['errType']==="Undefined"){

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

+        if ($this->data['errType']==="Undefined") {

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

         }

-        else{

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

+        else {

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

         }

     }

 

src/resta/Exception/ExceptionManager.php

Spacing +13 added lines, -13 removed lines

@@ -9,89 +9,89 @@
     /**

      * @var array

      */

-    protected $data=[];

+    protected $data = [];

 

     /**

      * @param null $msg

      */

-    public function invalidArgument($msg=null){

+    public function invalidArgument($msg = null) {

         throw new \InvalidArgumentException($msg);

     }

 

     /**

      * @param null $msg

      */

-    public function badFunctionCall($msg=null){

+    public function badFunctionCall($msg = null) {

         throw new \BadFunctionCallException($msg);

     }

 

     /**

      * @param null $msg

      */

-    public function badMethodCall($msg=null){

+    public function badMethodCall($msg = null) {

         throw new \BadMethodCallException($msg);

     }

 

     /**

      * @param null $msg

      */

-    public function domain($msg=null){

+    public function domain($msg = null) {

         throw new \DomainException($msg);

     }

 

     /**

      * @param null $msg

      */

-    public function length($msg=null){

+    public function length($msg = null) {

         throw new \LengthException($msg);

     }

 

     /**

      * @param null $msg

      */

-    public function logic($msg=null){

+    public function logic($msg = null) {

         throw new \LogicException($msg);

     }

 

     /**

      * @param null $msg

      */

-    public function outOfRange($msg=null){

+    public function outOfRange($msg = null) {

         throw new \OutOfRangeException($msg);

     }

 

     /**

      * @param null $msg

      */

-    public function overflow($msg=null){

+    public function overflow($msg = null) {

         throw new \OverflowException($msg);

     }

 

     /**

      * @param null $msg

      */

-    public function range($msg=null){

+    public function range($msg = null) {

         throw new \RangeException($msg);

     }

 

     /**

      * @param null $msg

      */

-    public function runtime($msg=null){

+    public function runtime($msg = null) {

         throw new \RuntimeException($msg);

     }

 

     /**

      * @param null $msg

      */

-    public function underflow($msg=null){

+    public function underflow($msg = null) {

         throw new \UnderflowException($msg);

     }

 

     /**

      * @param null $msg

      */

-    public function unexpectedValue($msg=null){

+    public function unexpectedValue($msg = null) {

         throw new \UnexpectedValueException($msg);

     }

 }
\ No newline at end of file