php-resta / resta-core

src/resta/Client/Client.php

Spacing +62 added lines, -62 removed lines

@@ -56,7 +56,7 @@ 
      *

      * @throws ReflectionExceptionAlias

      */

-    public function __construct($clientData=null)

+    public function __construct($clientData = null)

     {

         //reflection process

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

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

                             }

                         }

@@ -116,15 +116,15 @@ 
     {

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

 

             $caret = $this->capsuleCaret();

 

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

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

 

-                if(isset($caret[$input]) || (

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

-                    )){

+                if (isset($caret[$input]) || (

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

+                    )) {

                     exception('capsuleRequestException')

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

                 }

@@ -141,15 +141,15 @@ 
     {

         $caret = [];

 

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

-            if(in_array('@'.$input,$this->capsule)){

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

+            if (in_array('@'.$input, $this->capsule)) {

                 $caret[$input] = $item;

             }

         }

 

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

-            if(preg_match('#@.*#is',$item)){

-                $this->capsule = array_diff($this->capsule,[$item]);

+            if (preg_match('#@.*#is', $item)) {

+                $this->capsule = array_diff($this->capsule, [$item]);

             }

         }

 

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

             }

         }

     }

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

     }

 

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

     }

 

     /**

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

     }

@@ -238,27 +238,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)){

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

                 }

             }

         }

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

         }

     }

@@ -298,21 +298,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->requestData[$generator] = $this->inputs[$generator];

@@ -321,14 +321,14 @@ 
                 }

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

                     }

@@ -350,11 +350,11 @@ 
         $list = [];

 

         foreach ($this->requestData as $key=>$item) {

-            if(property_exists($this,'requestExcept') && !in_array($key,$this->requestExcept)){

+            if (property_exists($this, 'requestExcept') && !in_array($key, $this->requestExcept)) {

                 $list[$key] = $item;

             }

 

-            if(!property_exists($this,'requestExcept')){

+            if (!property_exists($this, 'requestExcept')) {

                 $list[$key] = $item;

             }

         }

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

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

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

     }

 

     /**

@@ -488,20 +488,20 @@ 
      *

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

@@ -509,8 +509,8 @@ 
                     $this->requestData[$key][]  = $keyMethod;

                 }

             }

-            else{

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

+            else {

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

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

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

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

@@ -529,8 +529,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/Support/App.php

Spacing +43 added lines, -43 removed lines

@@ -24,29 +24,29 @@ 
      * @param $arg

      * @return mixed

      */

-    public static function annotationsLoaders($service,$arg)

+    public static function annotationsLoaders($service, $arg)

     {

         //factory runner

-        if($service=="factory"){

+        if ($service=="factory") {

             return self::factory();

         }

         //if $name starts with $needles for repository

-        if(Str::endsWith($service,'Repository')){

+        if (Str::endsWith($service, 'Repository')) {

             return self::repository($service);

         }

 

         //if $name starts with $needles for source

-        if(Str::endsWith($service,'Source')){

-            return self::source($service,$arg);

+        if (Str::endsWith($service, 'Source')) {

+            return self::source($service, $arg);

         }

 

         //if $name starts with $needles for model

-        if(Str::endsWith($service,'Builder')){

+        if (Str::endsWith($service, 'Builder')) {

             return self::Builder(ucfirst($service));

         }

 

 

-        if(method_exists(new self,$service)){

+        if (method_exists(new self, $service)) {

             return self::$service($arg);

         }

 

@@ -99,7 +99,7 @@ 
     private static function builder($service)

     {

         //we are making a namespace assignment for the builder.

-        $builder=app()->namespace()->builder().'\BuilderMap';

+        $builder = app()->namespace()->builder().'\BuilderMap';

 

         //we are getting builder instance.

         return app()->resolve($builder);

@@ -127,16 +127,16 @@ 
      * @param array $bind

      * @return mixed

      */

-    public function container($instance,$class,$bind=array())

+    public function container($instance, $class, $bind = array())

     {

-        if(!property_exists($instance->container(),$class)){

+        if (!property_exists($instance->container(), $class)) {

             throw new \InvalidArgumentException('container object false for ('.$class.') object');

         }

 

-        $container=$instance->container()->{$class};

+        $container = $instance->container()->{$class};

 

-        if(!is_array($instance->container()->{$class}) AND Utils::isNamespaceExists($container)){

-            return $instance->resolve($container,$bind);

+        if (!is_array($instance->container()->{$class}) AND Utils::isNamespaceExists($container)) {

+            return $instance->resolve($container, $bind);

         }

         return $instance->container()->{$class};

     }

@@ -146,8 +146,8 @@ 
      */

     public function createAppInstance($object)

     {

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

-            define('appInstance',(base64_encode(serialize($object))));

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

+            define('appInstance', (base64_encode(serialize($object))));

         }

     }

 

@@ -155,9 +155,9 @@ 
      * @param array $arg

      * @return mixed

      */

-    private static function date($arg=array())

+    private static function date($arg = array())

     {

-        $locale = (count($arg)=="0") ? config('app.locale','en') : current($arg);

+        $locale = (count($arg)=="0") ? config('app.locale', 'en') : current($arg);

 

         return app()->resolve(Date::class)->setLocale($locale);

     }

@@ -177,8 +177,8 @@ 
     {

         //we save an instance for the entire application

         //and add it to the helper file to be accessed from anywhere in the application.

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

-            self::$instance['appInstance']=unserialize(base64_decode(appInstance));

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

+            self::$instance['appInstance'] = unserialize(base64_decode(appInstance));

             return self::$instance['appInstance'];

         }

         return self::$instance['appInstance'];

@@ -205,9 +205,9 @@ 
      */

     private static function queue()

     {

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

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

 

-            self::$instance['queue']=(new Queue());

+            self::$instance['queue'] = (new Queue());

             return self::$instance['queue'];

 

         }

@@ -219,18 +219,18 @@ 
      * @param bool $namespace

      * @return string

      */

-    public static function repository($service,$namespace=false)

+    public static function repository($service, $namespace = false)

     {

         //I can get the repository name from the magic method as a salt repository,

         //after which we will edit it as an adapter namespace.

-        $repositoryName=ucfirst(preg_replace('@Repository@is','',$service));

+        $repositoryName = ucfirst(preg_replace('@Repository@is', '', $service));

 

         //If we then configure the name of the simple repository to be an adapter

         //then we will give the user an example of the adapter class in each repository call.

         $repositoryAdapterName  = $repositoryName.'Adapter';

         $repositoryNamespace    = app()->namespace()->repository().'\\'.$repositoryName.'\\'.$repositoryAdapterName;

 

-        if($namespace) return $repositoryNamespace;

+        if ($namespace) return $repositoryNamespace;

 

         //and eventually we conclude the adapter class of the repository package as an instance.

         return app()->resolve($repositoryNamespace)->adapter();

@@ -241,17 +241,17 @@ 
      * @param $arg

      * @return mixed

      */

-    private static function source($service,$arg)

+    private static function source($service, $arg)

     {

         //get Source path

-        $service=ucfirst($service);

-        $getCalledClass=str_replace('\\'.class_basename($arg[0]),'',get_class($arg[0]));

-        $getCalledClass=class_basename($getCalledClass);

+        $service = ucfirst($service);

+        $getCalledClass = str_replace('\\'.class_basename($arg[0]), '', get_class($arg[0]));

+        $getCalledClass = class_basename($getCalledClass);

 

-        $service=str_replace($getCalledClass,'',$service);

+        $service = str_replace($getCalledClass, '', $service);

 

         //run service for endpoint

-        $serviceSource=StaticPathModel::appSourceEndpoint().'\\'.$getCalledClass.'\\'.$service.'\Main';

+        $serviceSource = StaticPathModel::appSourceEndpoint().'\\'.$getCalledClass.'\\'.$service.'\Main';

         return app()->resolve($serviceSource);

     }

 

@@ -260,9 +260,9 @@ 
      */

     public static function redis()

     {

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

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

 

-            self::$instance['redis']=(new Redis())->client();

+            self::$instance['redis'] = (new Redis())->client();

             return self::$instance['redis'];

 

         }

@@ -273,13 +273,13 @@ 
      * @param null $param

      * @return array|null|string

      */

-    public function route($param=null)

+    public function route($param = null)

     {

-        $kernel=self::getAppInstance()->kernel;

+        $kernel = self::getAppInstance()->kernel;

 

-        $saltRouteParameters=$kernel->routeParameters;

+        $saltRouteParameters = $kernel->routeParameters;

 

-        if($param===null){

+        if ($param===null) {

             return $saltRouteParameters;

         }

 

@@ -295,25 +295,25 @@ 
      * @param array $select

      * @return mixed|string

      */

-    public function translator($data,$select=array())

+    public function translator($data, $select = array())

     {

         $languageDir = path()->appLanguage();

 

-        $lang=(new Lingua($languageDir));

+        $lang = (new Lingua($languageDir));

 

-        if(self::app()->has('locale')){

+        if (self::app()->has('locale')) {

             $defaultLocale = self::app()->get('locale');

         }

-        else{

+        else {

             $defaultLocale = config('app.locale');

         }

 

-        if(!file_exists($languageDir.''.DIRECTORY_SEPARATOR.''.$defaultLocale)){

+        if (!file_exists($languageDir.''.DIRECTORY_SEPARATOR.''.$defaultLocale)) {

             $defaultLocale = config('app.fallback_locale');

         }

 

-        if(count($select)){

-            return $lang->include(['default'])->locale($defaultLocale)->get($data,$select);

+        if (count($select)) {

+            return $lang->include(['default'])->locale($defaultLocale)->get($data, $select);

         }

 

         return $lang->include(['default'])->locale($defaultLocale)->get($data);