php-resta / resta-core

src/resta/Client/ClientAnnotationManager.php

Spacing +52 added lines, -52 removed lines

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

      * @param $request

      */

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

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

     {

         parent::__construct($app);

 

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

@@ -66,18 +66,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($this->exceptionParams[$key]['name'].' input value is not valid as format ('.$data.')');

         }

-        else{

+        else {

             //catch exception

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

         }

@@ -90,23 +90,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];

                     }

                 }

@@ -123,37 +123,37 @@ 
     {

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

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

 

-                        if(is_array($this->inputsValue)){

+                        if (is_array($this->inputsValue)) {

 

-                            foreach ($this->inputsValue as $inputsValueKey => $inputsValueItem){

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

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

+                            foreach ($this->inputsValue as $inputsValueKey => $inputsValueItem) {

+                                if (!preg_match('@'.$regex[1].'@is', $inputsValueItem)) {

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

                                 }

                             }

 

                         }

-                        else{

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

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

+                        else {

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

                     }

                 }

             }

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

                 }

             }

@@ -184,42 +184,42 @@ 
      */

     private function getRules($key)

     {

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

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

 

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

 

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

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

-                foreach($rules as $rule){

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

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

-                            exception($rule,['key'=>$key.':'.$this->inputs[$key]])

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

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

+                foreach ($rules as $rule) {

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

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

+                            exception($rule, ['key'=>$key.':'.$this->inputs[$key]])

                                 ->invalidArgument($key.':'.$this->inputs[$key].' input value is not valid for '.$rule.' request rule');

                         }

                     }

                 }

             }

-            else{

+            else {

 

-                foreach ($this->inputs[$key] as $ikey=>$input){

+                foreach ($this->inputs[$key] as $ikey=>$input) {

 

-                    if(!is_array($input)){

-                        foreach($rules as $rule){

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

-                                if(!preg_match('@'.$requestRules[$rule].'@',$input)){

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

+                    if (!is_array($input)) {

+                        foreach ($rules as $rule) {

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

+                                if (!preg_match('@'.$requestRules[$rule].'@', $input)) {

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

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

                                 }

                             }

                         }

                     }

-                    else{

+                    else {

 

-                        foreach ($input as $ikey=>$item){

-                            foreach($rules as $rule){

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

-                                    if(!preg_match('@'.$requestRules[$rule].'@',$item)){

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

+                        foreach ($input as $ikey=>$item) {

+                            foreach ($rules as $rule) {

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

+                                    if (!preg_match('@'.$requestRules[$rule].'@', $item)) {

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

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

                                     }

                                 }

src/resta/Client/Client.php

Spacing +69 added lines, -69 removed lines

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

      * @throws ReflectionExceptionAlias

      */

-    public function __construct($clientData=null)

+    public function __construct($clientData = null)

     {

         //reflection process

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

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

 

         //get http method via request http manager class

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

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

 

         //get request client data

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

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

     {

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

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

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

 

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

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

                 return;

             }

 

@@ -107,15 +107,15 @@ 
 

             // we get the index values,

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

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

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

 

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

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

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

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

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

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

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

                     }

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

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

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

                     }

                 }

@@ -131,22 +131,22 @@ 
     private function capsule()

     {

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

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

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

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

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

         }

 

         // expected method is executed.

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

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

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

 

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

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

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

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

             }

 

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

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

 

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

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

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

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

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

                 }

             }

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

         // Determines which HTTP method

         // the request object will be exposed to.

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

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

 

             // if the current http method does not exist

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

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

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

 

                 //exception batMethodCall

                 exception()->badMethodCall(

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

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

             }

         }

     }

@@ -188,7 +188,7 @@ 
     {

         // from the properties of the object properties to

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

-        return (property_exists($this,$properties)

+        return (property_exists($this, $properties)

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

     }

 

@@ -201,7 +201,7 @@ 
     {

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

         // this record can be returned in exception information.

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

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

     }

 

     /**

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

     {

         // the except parameter is a callable value.

-        if(is_callable($except)){

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

+        if (is_callable($except)) {

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

             $except = $call;

         }

 

         // except with the except exceptions property

         // and then assigning them to the inputs property.

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

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

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

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

 

         return $this;

     }

@@ -235,27 +235,27 @@ 
     {

         // expected method is executed.

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

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

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

 

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

             // the exception will be thrown.

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

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

 

                 $expectedValues = [];

 

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

                 // this is evaluated as "or".

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

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

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

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

                         $expectedValues[$inputs] = $inputs;

                     }

                 }

 

                 // if the expectedData and expectedValues ​​

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

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

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

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

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

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

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

                 }

             }

         }

@@ -270,17 +270,17 @@ 
     {

         // check the presence of the generator object

         // and operate the generator over this object.

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

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

             $generators = $this->getAutoGenerators();

         }

 

         // check the presence of the generator object

         // and operate the generator over this object.

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

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

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

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

         }

 

-        if(isset($generators)){

+        if (isset($generators)) {

             $this->generatorMethod($generators);

         }

     }

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

     {

         //generator array object

-        foreach ($generators as $generator){

+        foreach ($generators as $generator) {

 

             //generator method name

             $generatorMethodName = $generator.'Generator';

 

             // if the generator method is present,

             // the fake value is assigned.

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

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

 

                 //fake registration

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

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

 

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

 

-                    if(!is_null($generatorMethodNameResult)){

+                    if (!is_null($generatorMethodNameResult)) {

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

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

                         $this->generatorList[] = $generator;

@@ -317,15 +317,15 @@ 
                 }

                 else {

 

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

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

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

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

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

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

                         $this->generatorList[] = $generator;

                     }

 

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

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

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

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

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

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

                         $this->generatorList[] = $generator;

@@ -402,7 +402,7 @@ 
     {

         // we use the http method to write

         // the values to the inputs and origin properties.

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

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

 

             //inputs and origin properties

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

@@ -418,9 +418,9 @@ 
      */

     private function requestExcept()

     {

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

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

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

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

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

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

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

                 }

             }

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

      * @return void|mixed

      */

-    public function setClientName($clientName=null)

+    public function setClientName($clientName = null)

     {

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

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

             return $this->clientName = $clientName;

         }

 

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

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

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

 

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

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

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

             }

         }

@@ -459,12 +459,12 @@ 
 

         // we update the input values ​​after

         // we receive and check the saved objects.

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

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

 

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

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

 

-                foreach ($this->groups as $group){

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

+                foreach ($this->groups as $group) {

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

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

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

 

@@ -476,7 +476,7 @@ 
                 }

             }

 

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

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

 

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

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

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

     }

 

     /**

@@ -519,28 +519,28 @@ 
      *

      * @throws ReflectionExceptionAlias

      */

-    private function setRequestInputs($method,$key)

+    private function setRequestInputs($method, $key)

     {

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

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

 

             //check annotations for method

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

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

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

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

 

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

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

 

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

 

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

-                foreach ($inputKeys as $input){

+                foreach ($inputKeys as $input) {

 

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

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

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

                 }

             }

-            else{

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

+            else {

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

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

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

                 }

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

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

         /** @noinspection PhpParamsInspection */

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

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

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

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

             $this->autoValidate('autoObjectValidate');

         }

     }