php-resta / resta-core

src/resta/Request/Request.php

Spacing +49 added lines, -49 removed lines

@@ -58,7 +58,7 @@ 
         // if we leave the request process to the application side,

         // then in this case we refer to the requestClient object in

         // the services section of the store directory.

-        (property_exists($this,'app') && $this->app) ? parent::handle() : $this->handle();

+        (property_exists($this, 'app') && $this->app) ? parent::handle() : $this->handle();

     }

 

     /**

@@ -68,16 +68,16 @@ 
      */

     private function autoValidate($validate)

     {

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

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

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

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

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

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

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

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

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

+                foreach ($datas as $dataKey=>$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);

                             }

                         }

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

             }

         }

     }

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

     }

 

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

     }

 

     /**

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

     }

@@ -169,12 +169,12 @@ 
     {

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

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

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

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

                     exception()->unexpectedValue('You absolutely have to send the value '.$expected.' for request object');

                 }

             }

@@ -190,17 +190,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->auto_generators;

         }

 

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

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

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

         }

 

-        if(isset($generators)){

+        if (isset($generators)) {

             $this->generatorMethod($generators);

         }

     }

@@ -213,30 +213,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->auto_generators_dont_overwrite)){

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

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

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

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

                     }

 

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

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

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

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

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

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

                     }

@@ -265,7 +265,7 @@ 
      */

     private function getClientObjects()

     {

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

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

     }

 

     /**

@@ -311,7 +311,7 @@ 
     {

         // we use the http method to write

         // the values to the inputs and origin properties.

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

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

 

             //inputs and origin properties

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

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

     }

 

     /**

@@ -395,28 +395,28 @@ 
      * @param $method

      * @param $key

      */

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

                 }

@@ -432,22 +432,22 @@ 
      */

     private function validation()

     {

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

         }

         // we need to find the rule method

         // because we can not validate it.

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

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

             $this->rule();

         }

 

         // if we only want to make a rule of

         // the specified request object, we will use

         // the rule method with the prefix of the request object.

-        $validName=strtolower(str_replace('Request','',class_basename($this))).'Rule';

+        $validName = strtolower(str_replace('Request', '', class_basename($this))).'Rule';

 

         //if the specified method exists;

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

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

             $this->{$validName}();

         }

     }

Braces +2 added lines, -4 removed lines

@@ -226,8 +226,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->auto_generators_dont_overwrite)){

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

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

                 }

-            }

-            else{

+            } else{

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

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

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

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

Spacing +29 added lines, -29 removed lines

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

      * @param $request

      */

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

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

     {

         parent::__construct($app);

 

@@ -40,7 +40,7 @@ 
      *

      * @throws \ReflectionException

      */

-    public function annotation($method,$key)

+    public function annotation($method, $key)

     {

         //set annotation value with getting reflection

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

@@ -53,7 +53,7 @@ 
         $this->getException();

 

         //get regex from request object

-        $this->getRegex($method,$key);

+        $this->getRegex($method, $key);

     }

 

     /**

@@ -62,13 +62,13 @@ 
      * @param $key

      * @param $data

      */

-    private function catchException($key,$data)

+    private function catchException($key, $data)

     {

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

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

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

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

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

         }

-        else{

+        else {

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

         }

     }

@@ -80,20 +80,20 @@ 
      */

     private function getException()

     {

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

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

 

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

-            foreach ($exceptionSpaceExplode as $exceptions){

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

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

+            foreach ($exceptionSpaceExplode as $exceptions) {

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

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

             }

 

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

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

+            if (isset($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];

                     }

                 }

@@ -107,23 +107,23 @@ 
      * @param $method

      * @param $key

      */

-    private function getRegex($method,$key)

+    private function getRegex($method, $key)

     {

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

 

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

 

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

                     }

                 }

             }

@@ -137,9 +137,9 @@ 
      */

     private function getRemove()

     {

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

                 }

             }

Braces +2 added lines, -4 removed lines

@@ -67,8 +67,7 @@ 
         if(isset($this->exceptionParams[$key])){

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

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

-        }

-        else{

+        } else{

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

         }

     }

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

                         }

                     }

-                }

-                else{

+                } else{

 

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

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