php-resta / resta-core

src/resta/Foundation/ApplicationAutoLoadRegister.php

Spacing +16 added lines, -16 removed lines

@@ -30,7 +30,7 @@ 
     {

         // Use default autoload implementation

         // Register given function as __autoload() implementation

-        spl_autoload_register(function($class){

+        spl_autoload_register(function($class) {

             $this->getRegisterCallBackVar($class);

             $this->registerCallBackFormatter();

         });

@@ -44,11 +44,11 @@ 
      */

     private function getRegisterCallBackVar($class) :void

     {

-        if(defined('root')){

+        if (defined('root')) {

 

             $this->class = $class;

             $this->classPath = root.''.DIRECTORY_SEPARATOR.''.$this->class.''.self::FileExtension;

-            $this->classPath = str_replace("\\","/",$this->classPath);

+            $this->classPath = str_replace("\\", "/", $this->classPath);

         }

     }

 

@@ -57,9 +57,9 @@ 
      *

      * return mixed

      */

-    private function registerCallBackFormatter ()

+    private function registerCallBackFormatter()

     {

-        $this->checkAliasClassFormatter($this->classPath,function() {

+        $this->checkAliasClassFormatter($this->classPath, function() {

             require($this->classPath);

         });

     }

@@ -71,16 +71,16 @@ 
      * @param $callback

      * @return mixed

      */

-    private function checkAliasClassFormatter($class,$callback)

+    private function checkAliasClassFormatter($class, $callback)

     {

         $systemApp = [];

 

-        if(defined('app')){

+        if (defined('app')) {

             $systemApp = (new ClassAliasGroup())->handle();

         }

 

-        if(!file_exists($class)){

-            $this->getAliasClassFormatter($class,$systemApp);

+        if (!file_exists($class)) {

+            $this->getAliasClassFormatter($class, $systemApp);

             return false;

         }

 

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

      * @param $systemApp

      */

-    private function getAliasClassFormatter($class,$systemApp)

+    private function getAliasClassFormatter($class, $systemApp)

     {

-        $this->setAliasClassGroup($class,$systemApp);

+        $this->setAliasClassGroup($class, $systemApp);

     }

 

     /**

@@ -104,14 +104,14 @@ 
      * @param $class

      * @param $systemApp

      */

-    private function setAliasClassGroup($class,$systemApp)

+    private function setAliasClassGroup($class, $systemApp)

     {

-        $alias = str_replace(root.''.DIRECTORY_SEPARATOR.'','',$class);

-        $alias = str_replace(self::FileExtension,'',$alias);

+        $alias = str_replace(root.''.DIRECTORY_SEPARATOR.'', '', $class);

+        $alias = str_replace(self::FileExtension, '', $alias);

 

         //set class_alias groups

-        if(array_key_exists($alias,$systemApp)){

-            class_alias($systemApp[$alias],$alias);

+        if (array_key_exists($alias, $systemApp)) {

+            class_alias($systemApp[$alias], $alias);

         }

     }

 }

src/resta/Foundation/Application.php

Braces +1 added lines, -2 removed lines

@@ -247,8 +247,7 @@
             tap($this['config'],function(ConfigProviderContracts $config) use($callback) {

                 $config->setConfig(call_user_func($callback));

             });

-        }

-        else{

+        } else{

             //set config instance exception for application

             exception()->unexpectedValue('config instance is not loaded for application container');

         }

Spacing +27 added lines, -27 removed lines

@@ -39,7 +39,7 @@ 
      *

      * @param bool $console

      */

-    public function __construct($console=false)

+    public function __construct($console = false)

     {

         // get console status for cli

         $this->console = $console;

@@ -59,7 +59,7 @@ 
     {

         // the booted objects are saved to the kernel.

         // this method checks whether these objects are registered.

-        return (isset($this['bindings'],$this['bindings'][$object]));

+        return (isset($this['bindings'], $this['bindings'][$object]));

     }

 

     /**

@@ -78,7 +78,7 @@ 
         // taking care of the differences between operating system

         // and escaping arguments to prevent security issues.

         // It replaces PHP functions like exec, passthru, shell_exec and system

-        return $this->resolve(Command::class,['command'=>$command,'args'=>$arguments])->handle();

+        return $this->resolve(Command::class, ['command'=>$command, 'args'=>$arguments])->handle();

     }

 

     /**

@@ -103,7 +103,7 @@ 
      */

     public function config($config)

     {

-        if($this->checkBindings(__FUNCTION__)){

+        if ($this->checkBindings(__FUNCTION__)) {

 

             /** @var Macro $macro */

             $macro = $this['macro'];

@@ -111,7 +111,7 @@ 
             // this includes the configuration macro class.

             // therefore, you can expand your configuration settings from

             // the application kernel identifier to the desired class.

-            return $macro->withStatic(Config::macro(),function() use($config){

+            return $macro->withStatic(Config::macro(), function() use($config){

                 return Config::make($config);

             })->get();

 

@@ -154,9 +154,9 @@ 
      * @param array $environment

      * @return mixed|string

      */

-    public function environment($environment=array())

+    public function environment($environment = array())

     {

-        if($this->checkBindings(__FUNCTION__)){

+        if ($this->checkBindings(__FUNCTION__)) {

 

             $arguments = (isset(func_get_args()[0]))

                 ? func_get_args()[0] : func_get_args();

@@ -165,7 +165,7 @@ 
             $environmentContainer = $this['environment'];

 

             return $environmentContainer->environment(

-                $arguments,$this['environmentVariables']

+                $arguments, $this['environmentVariables']

             );

         }

 

@@ -197,7 +197,7 @@ 
     public function isLocale() : bool

     {

         //check environment for local

-        return $this->environment() === 'local';

+        return $this->environment()==='local';

     }

 

     /**

@@ -211,14 +211,14 @@ 
 

         // with the help of reflection instance,

         // we get the kernel properties extended with the application object.

-        foreach ($this['reflection']($this)->getProperties() as $property){

+        foreach ($this['reflection']($this)->getProperties() as $property) {

             $properties[] = $property->getName();

         }

 

         // we get the names of

         // the kernel properties ended with groups through the Collection class.

-        [$groups] = Collection::make($properties)->partition(function($properties){

-            return Str::endsWith($properties,'Groups');

+        [$groups] = Collection::make($properties)->partition(function($properties) {

+            return Str::endsWith($properties, 'Groups');

         });

 

         //as a result, kernel groups are being returned.

@@ -235,8 +235,8 @@ 
         $list = [];

 

         //get kernel group names with manifest method

-        foreach ($this->kernelGroupKeys() as $groupKey){

-            $list = array_merge($list,$this->manifest($groupKey));

+        foreach ($this->kernelGroupKeys() as $groupKey) {

+            $list = array_merge($list, $this->manifest($groupKey));

         }

 

         return $list;

@@ -252,14 +252,14 @@ 
     {

         // it adds the values in path data specified

         // by callback to the configuration values.

-        if($this['config'] instanceof ConfigProviderContracts){

+        if ($this['config'] instanceof ConfigProviderContracts) {

 

             //set your path for config loader

-            tap($this['config'],function(ConfigProviderContracts $config) use($callback) {

+            tap($this['config'], function(ConfigProviderContracts $config) use($callback) {

                 $config->setConfig(call_user_func($callback));

             });

         }

-        else{

+        else {

             //set config instance exception for application

             exception()->unexpectedValue('config instance is not loaded for application container');

         }

@@ -271,7 +271,7 @@ 
      * @param array $loaders

      * @return mixed|void

      */

-    public function loadIfNotExistBoot($loaders=array())

+    public function loadIfNotExistBoot($loaders = array())

     {

         //get kernel group list from application

         $kernelGroupList = $this->kernelGroupList();

@@ -279,14 +279,14 @@ 
         /** @var ClosureDispatcherContracts $closureBootLoader */

         $closureBootLoader = $this['closureBootLoader'];

 

-        foreach ($loaders as $loader){

+        foreach ($loaders as $loader) {

 

             // if a service needs another boot service,

             // the service is directly installed here and the service needs are resolved.

-            if(isset($kernelGroupList[$loader]) && $this->checkBindings($loader)===false){

+            if (isset($kernelGroupList[$loader]) && $this->checkBindings($loader)===false) {

 

                 //with the boot loader kernel,we get the boot loader method.

-                $closureBootLoader->call(function() use($loader,$kernelGroupList) {

+                $closureBootLoader->call(function() use($loader, $kernelGroupList) {

 

                     /** @var BootLoader $bootLoader */

                     $bootLoader = $this;

@@ -309,7 +309,7 @@ 
         $bootstrapper = $this['bootstrapper'];

 

         //kernel manifest bootstrapper

-        return $bootstrapper->bootFire(null,$maker);

+        return $bootstrapper->bootFire(null, $maker);

     }

 

     /**

@@ -320,7 +320,7 @@ 
     public function runningInConsole() : bool

     {

         //Determine if the application is running in the console.

-        return php_sapi_name() === 'cli' || php_sapi_name() === 'phpdbg';

+        return php_sapi_name()==='cli' || php_sapi_name()==='phpdbg';

     }

 

     /**

@@ -336,7 +336,7 @@ 
             : [];

 

         //core kernel providers and project providers have been merged

-        return array_merge($this->manifest('providers'),$providers);

+        return array_merge($this->manifest('providers'), $providers);

     }

 

     /**

@@ -346,12 +346,12 @@ 
      * @param string $path

      * @return mixed|void

      */

-    public function setPaths($name,$path)

+    public function setPaths($name, $path)

     {

         // save the globally identified paths to

         // the global container object of the resta.

-        if(file_exists($path)){

-            $this->register('paths',$name,$path);

+        if (file_exists($path)) {

+            $this->register('paths', $name, $path);

         }

     }

 

src/resta/Foundation/Bootstrapper/Bootstrappers.php

Spacing +13 added lines, -13 removed lines

@@ -41,7 +41,7 @@ 
         (new BaseRegister($this->app))->handle();

 

         //we save the bootstrapper class in container.

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

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

 

         //call bootstrapper process

         $this->callBootstrapperProcess();

@@ -59,11 +59,11 @@ 
     {

         //The boot method to be executed can be specified by the user.

         //We use this method to know how to customize it.

-        BootFireCallback::setBootFire([$this->app,$bootstrapper],function($boot){

+        BootFireCallback::setBootFire([$this->app, $bootstrapper], function($boot) {

 

             //kernel boots run and service container

             //makeBuild for service Container

-            $this->bootFire($boot,null);

+            $this->bootFire($boot, null);

         });

     }

 

@@ -74,11 +74,11 @@ 
      * @param string $maker

      * @return mixed

      */

-    public function bootFire($boot,$maker)

+    public function bootFire($boot, $maker)

     {

         // we can refer to this method

         // because we can boot classes in the middleware or bootstrapper array.

-        if(is_null($boot) && !is_null($maker)){

+        if (is_null($boot) && !is_null($maker)) {

 

             /** @var KernelManifestManager $kernelManifestBind */

             $kernelManifestBind = $this->app->resolve(KernelManifestManager::class);

@@ -90,7 +90,7 @@ 
 

         // the boot method to be executed can be specified by the user.

         // we use this method to know how to customize it.

-        return forward_static_call_array([array_pop($boot),self::LOADBOOTSTRAPPERS],[$boot]);

+        return forward_static_call_array([array_pop($boot), self::LOADBOOTSTRAPPERS], [$boot]);

     }

 

     /**

@@ -101,14 +101,14 @@ 
      */

     private function bootstrapper(...$params)

     {

-        [$group,$booting,$onion] = $params;

+        [$group, $booting, $onion] = $params;

 

-        if($onion){

+        if ($onion) {

 

             // we will implement a special onion method here and

             // pass our bootstraper classes through this method.

             // Our goal here is to implement the middleware layer correctly.

-            $this->app->resolve(MiddlewareKernelProvider::class)->onionBoot([$group,$booting],function() use($group){

+            $this->app->resolve(MiddlewareKernelProvider::class)->onionBoot([$group, $booting], function() use($group){

                 $this->boot($group);

             });

 

@@ -125,18 +125,18 @@ 
      *

      * @param array $customBootstrapers

      */

-    public function callBootstrapperProcess($customBootstrapers=[])

+    public function callBootstrapperProcess($customBootstrapers = [])

     {

         // here we check that a special bootstrappers list will work and we identify the onion identifier.

         // we are peeling onion class by classifying onion class.

         $this->getBootstrappersStack($customBootstrapers);

 

         //We run the bootstrap list by callback with the object specified for the content respectively.

-        foreach($this->stack['getBootstrappers'] as $bootstrapper){

+        foreach ($this->stack['getBootstrappers'] as $bootstrapper) {

 

             // if the callback data is different from the application kernel,

             // we will pass it to the pusher control for a special use.

-            call_user_func_array([$this,'bootstrapper'],[$bootstrapper,$this,$this->stack['onionIdentifier']]);

+            call_user_func_array([$this, 'bootstrapper'], [$bootstrapper, $this, $this->stack['onionIdentifier']]);

         }

     }

 

@@ -162,7 +162,7 @@ 
     private function peelings()

     {

         //if there are peelings

-        if(isset($this->app['peelings'])){

+        if (isset($this->app['peelings'])) {

 

             // We send the peelings property to

             // the bootstrapperPeelOnion class.

src/resta/Foundation/Bootstrapper/FinalBooting.php

Spacing +11 added lines, -11 removed lines

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

      * @param array $boot

      */

-    public function __construct($app,$boot=array())

+    public function __construct($app, $boot = array())

     {

         parent::__construct($app);

 

@@ -35,21 +35,21 @@ 
      * @param array $boots

      * @param bool $defaultBoot

      */

-    private function bootstrapper($boots=array(),$defaultBoot=true)

+    private function bootstrapper($boots = array(), $defaultBoot = true)

     {

         //boot loop make bind calling

-        foreach ($boots as $bootstrapper){

+        foreach ($boots as $bootstrapper) {

 

             // for the default boot, we overwrite the bootstrapper class's bootstrapper property

             // and load it with the boot method.

-            if($defaultBoot){

+            if ($defaultBoot) {

                 $this->app->loadIfNotExistBoot([$bootstrapper]);

             }

             // we will use the classical method for classes

             // that will not boot from the kernel.

-            else{

-                if(Utils::isNamespaceExists($bootstrapper)

-                    && false===isset($this->app['resolve'][$bootstrapper])){

+            else {

+                if (Utils::isNamespaceExists($bootstrapper)

+                    && false===isset($this->app['resolve'][$bootstrapper])) {

                     $this->app->resolve($bootstrapper)->boot();

                 }

             }

@@ -65,8 +65,8 @@ 
     private function customBootManifest(callable $callback)

     {

         //we make custom boot

-        if(isset($this->boot['custom'])){

-            return call_user_func_array($callback,[$this->boot['custom']]);

+        if (isset($this->boot['custom'])) {

+            return call_user_func_array($callback, [$this->boot['custom']]);

         }

     }

 

@@ -81,8 +81,8 @@ 
         $defaultBoot = Collection::make($this->boot)->except('custom')->all();

 

         //custom boot according to manifest bootManager

-        $this->customBootManifest(function($boot){

-            $this->bootstrapper((array)$boot,false);

+        $this->customBootManifest(function($boot) {

+            $this->bootstrapper((array)$boot, false);

         });

 

         // and as a result we now use

src/resta/Foundation/Bootstrapper/KernelManifestManager.php

Spacing +11 added lines, -11 removed lines

@@ -34,7 +34,7 @@ 
 

         // if there is manifest propery in the resta

         // in this case,manifest property is manifest class

-        if($app['isAvailableStore']){

+        if ($app['isAvailableStore']) {

             $this->manifest = $this->manifest->resolve("Src\Manifest");

         }

 

@@ -61,11 +61,11 @@ 
     {

         $app = clone $this;

 

-        return $this->manifest->call(function() use ($maker,$app){

+        return $this->manifest->call(function() use ($maker, $app){

 

             // As a parameter, the maker variable comes as

             // the name of the list to be booted.

-            if(isset($this->{$maker})){

+            if (isset($this->{$maker})) {

 

                 //get default maker list

                 $app->setMakerList($this->{$maker});

@@ -73,13 +73,13 @@ 
                 // we set this condition for users to boot the classes they want in the kernel groups.

                 // in the manifesto, if the kernel groups method returns an class of arrays

                 // then these classes will automatically join the kernel groups installation.

-                if(isset($this->run) && isset($this->run[$maker]) && is_array($this->run[$maker])){

+                if (isset($this->run) && isset($this->run[$maker]) && is_array($this->run[$maker])) {

 

                     $appMaker = $this->run[$maker];

 

                     // if the makerExtend value in the manifest is a method,

                     // in this case, the method is executed instead of the object

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

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

                         $this->{$maker}(app());

                     }

 

@@ -90,7 +90,7 @@ 
                     // if the maker is present on a method basis, then the maker list values ​​must be true or false.

                     // if one of the maker classes is false will not load this maker class.

                     foreach ($kernelMakers as $kernelMakerAbstract=>$kernelMaker) {

-                        if($kernelMaker){

+                        if ($kernelMaker) {

                             $kernelMakers[$kernelMakerAbstract] = $appMaker[$kernelMakerAbstract];

                         }

                     }

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

             // revision maker

             // group name to boot

-            if(isset($this->revision)){

+            if (isset($this->revision)) {

                 $app->revisionMaker($this->revision);

             }

 

@@ -118,19 +118,19 @@ 
      */

     public function revisionMaker($revision)

     {

-        if(is_array($revision) && count($this->makerList)){

+        if (is_array($revision) && count($this->makerList)) {

 

             //We return to the boot list and perform a revision check.

-            foreach ($this->makerList as $makerKey=>$makerValue){

+            foreach ($this->makerList as $makerKey=>$makerValue) {

 

                 // the revision list is presented as a helper method to prevent

                 // the listener application being booted from taking the entire listener individually.

-                if(count($revision) && isset($revision[$makerKey]) && Utils::isNamespaceExists($revision[$makerKey])){

+                if (count($revision) && isset($revision[$makerKey]) && Utils::isNamespaceExists($revision[$makerKey])) {

                     $this->makerList[$makerKey] = $revision[$makerKey];

 

                     // if a kernel group key that is changed to revision is an actual class,

                     // we will save this class to the container object.

-                    $this->app->register('revision',$makerValue,$revision[$makerKey]);

+                    $this->app->register('revision', $makerValue, $revision[$makerKey]);

                 }

             }

         }

src/resta/Request/RequestAnnotationAbstract.php

Spacing +2 added lines, -2 removed lines

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

      * @return mixed

      */

-    abstract function annotation($method,$key);

+    abstract function annotation($method, $key);

 

     /**

      * get input values from request object

@@ -52,7 +52,7 @@ 
      *

      * @param $reflection

      */

-    public function setReflection($reflection){

+    public function setReflection($reflection) {

 

         $this->request = ClosureDispatcher::bind($reflection);

     }

src/resta/Request/RequestAnnotationManager.php

Braces +2 added lines, -4 removed lines

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

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

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

-        }

-        else{

+        } else{

             //catch exception

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

         }

@@ -128,8 +127,7 @@ 
                             $this->catchException($key,$regex[1]);

                         }

                     }

-                }

-                else{

+                } else{

 

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

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

Spacing +34 added lines, -34 removed lines

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

      * @param $request

      */

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

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

     {

         parent::__construct($app);

 

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

      * @return mixed|void

      */

-    public function annotation($method,$key)

+    public function annotation($method, $key)

     {

         //set annotation value with getting reflection

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

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

      * @param null|string $data

      */

-    private function catchException($key,$data)

+    private function catchException($key, $data)

     {

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

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

 

             //get key params for exception params

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

 

             //catch exception

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

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

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

         }

-        else{

+        else {

             //catch exception

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

         }

@@ -86,23 +86,23 @@ 
      */

     private function getException($key)

     {

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

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

 

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

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

 

-            foreach ($exceptionSpaceExplode as $exceptions){

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

+            foreach ($exceptionSpaceExplode as $exceptions) {

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

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

             }

 

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

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

 

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

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

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

 

-                foreach ($paramsCommaExplode as $params){

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

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

+                foreach ($paramsCommaExplode as $params) {

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

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

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

                     }

                 }

@@ -119,24 +119,24 @@ 
     {

         // with the method based regex annotation,

         // we check the rule definition for our requests.

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

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

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

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

 

                 // for the definition of rules,

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

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

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

 

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

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

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

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

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

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

                         }

                     }

                 }

-                else{

+                else {

 

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

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

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

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

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

                     }

                 }

             }

@@ -151,9 +151,9 @@ 
      */

     private function getRemove($key)

     {

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

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

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

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

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

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

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

                 }

             }

@@ -167,16 +167,16 @@ 
      */

     private function getRules($key)

     {

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

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

 

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

 

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

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

-                foreach($rules as $rule){

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

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

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

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

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

+                foreach ($rules as $rule) {

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

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

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

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

                         }

                     }

src/resta/Request/Request.php

Braces +2 added lines, -4 removed lines

@@ -237,8 +237,7 @@ 
                 if(!isset($this->inputs[$generator])){

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

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

-                }

-                else {

+                } else {

 

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

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

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

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

                 }

-            }

-            else{

+            } else{

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

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

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

Spacing +49 added lines, -49 removed lines

@@ -46,7 +46,7 @@ 
      *

      * @throws ReflectionExceptionAlias

      */

-    public function __construct($clientData=null)

+    public function __construct($clientData = null)

     {

         //reflection process

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

@@ -69,25 +69,25 @@ 
     private function autoValidate($validate)

     {

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

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

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

 

             // the auto-validate value must necessarily represent a class.

             // otherwise auto-validate is not used.

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

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

                 $getObjectInstance = app()->resolve($object);

 

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

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

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

+                    if (is_numeric($dataKey) && method_exists($getObjectInstance, $data)) {

+                        if (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);

                             }

                         }

@@ -109,15 +109,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 '.class_basename($this).'.That is accepted http methods ['.implode(",",$this->http).'] ');

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

             }

         }

     }

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

     }

 

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

     }

 

     /**

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

     }

@@ -179,27 +179,27 @@ 
     {

         // expected method is executed.

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

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

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

 

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

             // the exception will be thrown.

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

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

 

                 $expectedValues = [];

 

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

                 // this is evaluated as "or".

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

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

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

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

                         $expectedValues[] = $inputs;

                     }

                 }

 

                 // if the expectedData and expectedValues ​​

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

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

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

                     exception($expected)

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

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

                 }

             }

         }

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

         }

     }

@@ -239,30 +239,30 @@ 
     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])) {

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

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

                 }

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

                     }

 

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

                     }

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

@@ -353,9 +353,9 @@ 
 

         // we update the input values ​​after

         // we receive and check the saved objects.

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

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

 

-            if(isset($clientObjects['origin'][$key])){

+            if (isset($clientObjects['origin'][$key])) {

 

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

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

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

     }

 

     /**

@@ -397,28 +397,28 @@ 
      *

      * @throws ReflectionExceptionAlias

      */

-    private function setRequestInputs($method,$key)

+    private function setRequestInputs($method, $key)

     {

-        if(method_exists($this,$method) && $this->reflection->reflectionMethodParams($method)->isProtected){

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

 

             //check annotations for method

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

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

+            $annotation = app()->resolve(RequestAnnotationManager::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;

                 }

@@ -436,8 +436,8 @@ 
     {

         // the auto object validate property is the property

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

-        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/Request/RequestAbstract.php

Spacing +5 added lines, -5 removed lines

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

     protected function getAutoGenerators()

     {

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

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

             return $this->auto_generators;

         }

         return [];

@@ -45,7 +45,7 @@ 
      */

     protected function getAutoGeneratorsDontOverwrite()

     {

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

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

             return $this->auto_generators_dont_overwrite;

         }

         return [];

@@ -59,7 +59,7 @@ 
      */

     protected function getClientObjects()

     {

-        return array_diff_key($this->getObjects(),['inputs'=>[]]);

+        return array_diff_key($this->getObjects(), ['inputs'=>[]]);

     }

 

     /**

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

     protected function getGenerators()

     {

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

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

             return $this->generators;

         }

         return [];

@@ -83,7 +83,7 @@ 
      */

     protected function getGeneratorsDontOverwrite()

     {

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

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

             return $this->generators_dont_overwrite;

         }

         return [];