php-resta / resta-core

src/resta/Console/Source/Project/Project.php

Spacing +11 added lines, -11 removed lines

@@ -14,7 +14,7 @@ 
     /**

      * @var $type

      */

-    public $type='project';

+    public $type = 'project';

 

     /**

      * @var array

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

      * @var $commandRule

      */

-    public $commandRule=[];

+    public $commandRule = [];

 

     /**

      * @method create

@@ -46,17 +46,17 @@ 
         $this->directory['projectDir']          = $this->projectPath();

         $this->argument['exceptionNamespace']   = app()->namespace()->exception();

         $this->argument['resourcePath']         = app()->path()->appResourche();

-        $this->argument['testNamespace']             = app()->namespace()->tests();

+        $this->argument['testNamespace'] = app()->namespace()->tests();

 

-        $recursiveDefaultDirectory = explode("\\",$this->argument['project']);

+        $recursiveDefaultDirectory = explode("\\", $this->argument['project']);

         $this->argument['applicationName'] = pos($recursiveDefaultDirectory);

         $recursiveDefaultDirectory[] = 'V1';

         $recursiveDefaultDirectoryList = [];

 

-        foreach (array_slice($recursiveDefaultDirectory,1) as $defaultDirectory){

+        foreach (array_slice($recursiveDefaultDirectory, 1) as $defaultDirectory) {

 

-            $recursiveDefaultDirectoryList[]=$defaultDirectory;

-            $this->directory[$defaultDirectory.'Path'] = $this->projectPath().''.implode("/",$recursiveDefaultDirectoryList);

+            $recursiveDefaultDirectoryList[] = $defaultDirectory;

+            $this->directory[$defaultDirectory.'Path'] = $this->projectPath().''.implode("/", $recursiveDefaultDirectoryList);

         }

 

         //$this->directory['optionalDir'] = $this->optional();

@@ -82,7 +82,7 @@ 
         //$this->directory['sourceDir']               = $this->sourceDir();

         //$this->directory['sourceSupportDir']        = $this->sourceSupportDir();

         //$this->directory['sourceSupportTraitDir']   = $this->sourceSupportDir().'/Traits';

-        $this->directory['exceptionDir']            = app()->path()->exception();

+        $this->directory['exceptionDir'] = app()->path()->exception();

 

         //set project directory

         $this->file->makeDirectory($this);

@@ -99,11 +99,11 @@ 
         $this->touch['kernel/exception']            = $this->provider().'/ExceptionServiceProvider.php';

         $this->touch['kernel/response']             = $this->provider().'/ResponseServiceProvider.php';

         $this->touch['kernel/entity']               = $this->provider().'/EntityServiceProvider.php';

-        $this->touch['kernel/cache']               = $this->provider().'/CacheServiceProvider.php';

+        $this->touch['kernel/cache'] = $this->provider().'/CacheServiceProvider.php';

         $this->touch['kernel/authenticate']         = $this->provider().'/AuthenticateServiceProvider.php';

         $this->touch['kernel/role']                 = $this->provider().'/RoleServiceProvider.php';

         $this->touch['kernel/track']                = $this->provider().'/TrackServiceProvider.php';

-        $this->touch['test/testcase']              = $this->test().'/TestCase.php';

+        $this->touch['test/testcase'] = $this->test().'/TestCase.php';

         $this->touch['kernel/consoleevent']         = $this->provider().'/ConsoleEventServiceProvider.php';

         $this->touch['middleware/authenticate']     = $this->middleware().'/Authenticate.php';

         $this->touch['middleware/ratelimit']        = $this->middleware().'/RateLimit.php';

@@ -144,7 +144,7 @@ 
         $this->touch['app/gitignore']               = $this->projectPath().'/.gitignore';

         $this->touch['app/composer']                = $this->projectPath().'/composer.json';

         $this->touch['test/index']                  = $this->storage().'/index.html';

-        $this->touch['exception/authenticate']      = $this->directory['exceptionDir'] .'/AuthenticateException.php';

+        $this->touch['exception/authenticate']      = $this->directory['exceptionDir'].'/AuthenticateException.php';

 

         //set project touch

         $this->file->touch($this);

src/resta/Console/Source/Model/Model.php

Spacing +20 added lines, -20 removed lines

@@ -15,7 +15,7 @@ 
     /**

      * @var $type

      */

-    public $type='model';

+    public $type = 'model';

 

     /**

      * @var array

@@ -32,17 +32,17 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=['model','?table'];

+    public $commandRule = ['model', '?table'];

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

         $this->argument['file'] = $this->argument['model'];

 

-        if(!isset($this->argument['table'])){

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

             $this->argument['table'] = $this->argument['file'].'s';

         }

 

@@ -51,7 +51,7 @@ 
 

         $this->directory['modelDir']    = app()->path()->model();

         $this->directory['builderDir']  = $this->directory['modelDir'].'/Builder';

-        $this->directory['builderAssistantDir']  = $this->directory['modelDir'].'/Builder/Assistant';

+        $this->directory['builderAssistantDir'] = $this->directory['modelDir'].'/Builder/Assistant';

         $this->directory['contract']    = $this->directory['modelDir'].'/Contract';

         $this->directory['helper']      = $this->directory['modelDir'].'/Helper';

 

@@ -66,22 +66,22 @@ 
         //model set

         $this->touch['model/model']     = $this->directory['modelDir'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].'.php';

         $this->touch['model/builder']   = $this->directory['builderDir'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].'Builder.php';

-        $this->touch['model/builderasistant']   = $this->directory['builderAssistantDir'].''.DIRECTORY_SEPARATOR.'Builder.php';

+        $this->touch['model/builderasistant'] = $this->directory['builderAssistantDir'].''.DIRECTORY_SEPARATOR.'Builder.php';

         $this->touch['model/contract']  = $this->directory['contract'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].'Contract.php';

 

-        if(!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Scope.php')){

+        if (!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Scope.php')) {

             $this->touch['model/scope'] = $this->directory['helper'].''.DIRECTORY_SEPARATOR.'Scope.php';

         }

 

-        if(!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Event.php')){

+        if (!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Event.php')) {

             $this->touch['model/event'] = $this->directory['helper'].''.DIRECTORY_SEPARATOR.'Event.php';

         }

 

-        if(!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'TableChanges.php')){

+        if (!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'TableChanges.php')) {

             $this->touch['model/tablechanges'] = $this->directory['helper'].''.DIRECTORY_SEPARATOR.'TableChanges.php';

         }

 

-        if(!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Constructor.php')){

+        if (!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Constructor.php')) {

             $this->touch['model/constructor'] = $this->directory['helper'].''.DIRECTORY_SEPARATOR.'Constructor.php';

         }

 

@@ -89,7 +89,7 @@ 
 

         $entityDir = $this->directory['modelDir'].''.DIRECTORY_SEPARATOR.'Entity';

 

-        if(!file_exists($entityDir)){

+        if (!file_exists($entityDir)) {

             files()->makeDirectory($entityDir);

         }

 

@@ -98,9 +98,9 @@ 
         $entityClass = $entityDir.''.DIRECTORY_SEPARATOR.''.$entityTableName.''.DIRECTORY_SEPARATOR.''.$entityTableName;

 

 

-        $generator = new Generator($entityDir,'EntityMap');

+        $generator = new Generator($entityDir, 'EntityMap');

 

-        if(!file_exists($entityDir.''.DIRECTORY_SEPARATOR.'EntityMap.php')){

+        if (!file_exists($entityDir.''.DIRECTORY_SEPARATOR.'EntityMap.php')) {

 

             //$this->setAnnotations();

             $generator->createClass();

@@ -110,7 +110,7 @@ 
 

         $entityMapNamespaceResolve = new $entityMapNamespace;

 

-        if(!method_exists($entityMapNamespaceResolve,strtolower($this->argument['table']))){

+        if (!method_exists($entityMapNamespaceResolve, strtolower($this->argument['table']))) {

 

             $generator->createClassUse([

                 Utils::getNamespace($entityClass)

@@ -140,15 +140,15 @@ 
 

 

         //set builder map

-        $generator = new Generator($this->directory['builderDir'],'BuilderMap');

+        $generator = new Generator($this->directory['builderDir'], 'BuilderMap');

 

-        if(!file_exists($this->directory['builderDir'].''.DIRECTORY_SEPARATOR.'BuilderMap.php')){

+        if (!file_exists($this->directory['builderDir'].''.DIRECTORY_SEPARATOR.'BuilderMap.php')) {

 

             $this->setAnnotations();

             $generator->createClass();

         }

 

-        if(!file_exists($this->touch['model/model'])){

+        if (!file_exists($this->touch['model/model'])) {

 

             $generator->createMethod([

                 strtolower($this->argument['file'])

@@ -169,7 +169,7 @@ 
         }

 

         //set project touch

-        $this->file->touch($this,[

+        $this->file->touch($this, [

             'stub'=>'Model_Create'

         ]);

 

@@ -180,11 +180,11 @@ 
     /**

      * @return bool

      */

-    private function setAnnotations(){

+    private function setAnnotations() {

 

         $entityMap = app()->path()->model().''.DIRECTORY_SEPARATOR.'Entity'.DIRECTORY_SEPARATOR.'EntityMap.php';

 

-        if(file_exists($entityMap)){

+        if (file_exists($entityMap)) {

 

             Utils::changeClass(path()->serviceAnnotations().'.php',

                 [

src/resta/Authenticate/ConfigProvider.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
     {

         $this->config();

 

-        if($this->guard=="default"){

+        if ($this->guard=="default") {

             $this->setAuthenticateNeeds();

         }

 

@@ -57,7 +57,7 @@ 
      */

     public function getAddToWhere()

     {

-        if(isset($this->config['guard'][$this->guard]['addToWhere'])){

+        if (isset($this->config['guard'][$this->guard]['addToWhere'])) {

             return $this->config['guard'][$this->guard]['addToWhere'];

         }

         return null;

@@ -70,7 +70,7 @@ 
      */

     public function getConfigToken()

     {

-        if(isset($this->config['guard'][$this->guard]['token'])){

+        if (isset($this->config['guard'][$this->guard]['token'])) {

             return $this->config['guard'][$this->guard]['token'];

         }

         return null;

@@ -164,7 +164,7 @@ 
      */

     public function provider($key)

     {

-        if(app()->has('authenticate.'.$key) && is_callable($provider = app()->get('authenticate.'.$key))){

+        if (app()->has('authenticate.'.$key) && is_callable($provider = app()->get('authenticate.'.$key))) {

             return $provider;

         }

 

@@ -203,7 +203,7 @@ 
     {

         $table = $this->config['guard'][$this->guard]['table'];

 

-        app()->register('authenticateTable',$table);

+        app()->register('authenticateTable', $table);

     }

 

 }
\ No newline at end of file

src/resta/Router/CheckEndpointForAutoService.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
      * @param callable|null $func

      * @return string

      */

-    public function getNamespaceForAutoService($instance,callable $func = null)

+    public function getNamespaceForAutoService($instance, callable $func = null)

     {

         //get namespace for auto service

         $autoServiceNamespace = $instance->autoService();

@@ -22,7 +22,7 @@ 
         $configAutoServices = config('autoservices');

 

         //auto service is invoked if auto service is allowed for any class yada config.

-        if(class_exists($autoServiceNamespace) && isset($configAutoServices[strtolower(endpoint)])){

+        if (class_exists($autoServiceNamespace) && isset($configAutoServices[strtolower(endpoint)])) {

             return $autoServiceNamespace;

         }

 

src/resta/Client/Client.php

Spacing +88 added lines, -88 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,30 +107,30 @@ 
 

             // 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(method_exists($getObjectInstance,$dataKey) && is_array($data)){

-                    foreach ($data as $dataItem){

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

-                            $getObjectInstance->{$dataKey}($this->origin[$dataItem],$this,$dataItem);

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

+                    foreach ($data as $dataItem) {

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

+                            $getObjectInstance->{$dataKey}($this->origin[$dataItem], $this, $dataItem);

                         }

 

-                        if(method_exists($this,$afterMethod = 'after'.ucfirst($dataKey))){

-                            $this->{$afterMethod}($this,$dataItem);

+                        if (method_exists($this, $afterMethod = 'after'.ucfirst($dataKey))) {

+                            $this->{$afterMethod}($this, $dataItem);

                         }

                     }

                 }

 

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

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

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

+                        $getObjectInstance->{$data}($originData, $this, $data);

                     }

                 }

             }

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

             }

 

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

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

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

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

 

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

-                    $groupProcess = $this->groupsProcess($item,true);

-                    if(is_array($groupProcess)){

+                    $groupProcess = $this->groupsProcess($item, true);

+                    if (is_array($groupProcess)) {

                         $defaultInputs = $this->inputs;

-                        $this->inputs = array_merge($this->inputs,$groupProcess);

+                        $this->inputs = array_merge($this->inputs, $groupProcess);

                     }

                 }

             }

 

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

                 }

             }

 

-            if(isset($defaultInputs)){

+            if (isset($defaultInputs)) {

                 $this->inputs = $defaultInputs;

             }

         }

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

             }

         }

     }

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

     }

 

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

     }

 

     /**

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

     }

@@ -265,32 +265,32 @@ 
     {

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

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

 

                     // we should do key control for group format.

                     // this process will allow us to perform key control for 2D array correctly.

                     $this->groupsProcess($inputs);

 

-                    if(!isset($this->inputs[$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');

                 }

             }

         }

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

         }

     }

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

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

@@ -391,28 +391,28 @@ 
      * @param null $callback

      * @return mixed|void

      */

-    public function groupsProcess($key=null,$callback=null)

+    public function groupsProcess($key = null, $callback = null)

     {

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

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

 

             $clientObjects = $this->getClientObjects();

 

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

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

 

-                if(true === $callback){

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

+                if (true===$callback) {

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

                         return $clientObjects['origin'][$key];

                     }

                     return [];

                 }

 

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

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

 

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

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

 

-                    if(is_callable($callback)){

-                        call_user_func_array($callback,[$key]);

+                    if (is_callable($callback)) {

+                        call_user_func_array($callback, [$key]);

                     }

                 }

             }

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

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

                 }

             }

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

             }

         }

@@ -532,16 +532,16 @@ 
 

         // we update the input values ​​after

         // we receive and check the saved objects.

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

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

 

             // we should do key control for group format.

             // this process will allow us to perform key control for 2D array correctly.

-            $this->groupsProcess($key,function($key){

+            $this->groupsProcess($key, function($key) {

                 $this->registerRequestInputs($key);

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

             });

 

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

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

     }

 

     /**

@@ -584,28 +584,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 $ikey=>$input){

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

 

                     $this->{$key}[$ikey]        = $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;

                 }

@@ -624,8 +624,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');

         }

     }

Braces +2 added lines, -4 removed lines

@@ -349,8 +349,7 @@ 
                         $this->inputs[$generator] = $this->{$generatorMethodName}();

                         $this->generatorList[] = $generator;

                     }

-                }

-                else {

+                } else {

 

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

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

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

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

                 }

-            }

-            else{

+            } else{

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

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

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

src/resta/Authenticate/Driver/Eloquent/UserBuilderHelper.php

Spacing +34 added lines, -34 removed lines

@@ -51,7 +51,7 @@ 
     {

         $userId = $manager->getAuth()->params['userId'];

 

-        return DeviceToken::where('user_id',$userId)->get();

+        return DeviceToken::where('user_id', $userId)->get();

     }

 

     /**

@@ -64,8 +64,8 @@ 
         return DeviceToken::where(function($query) use($token) {

 

             //where query for token

-            $query->where('token_integer',crc32(md5($token)));

-            $query->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])));

+            $query->where('token_integer', crc32(md5($token)));

+            $query->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])));

         });

     }

 

@@ -79,8 +79,8 @@ 
         return DeviceToken::where(function($query) use($token) {

 

             //where query for token

-            $query->where('token_integer',crc32(md5($token)));

-            $query->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])));

+            $query->where('token_integer', crc32(md5($token)));

+            $query->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])));

 

         });

     }

@@ -91,23 +91,23 @@ 
      * @param null|object $query

      * @return mixed

      */

-    protected function checkPasswordVerify($query=null)

+    protected function checkPasswordVerify($query = null)

     {

-        if(is_null($query) && isset($this->credentials['password'])){

-            if(!is_null($password = $this->auth->provider('password'))

-                && $password($this->credentials['password'])=='verify'){

+        if (is_null($query) && isset($this->credentials['password'])) {

+            if (!is_null($password = $this->auth->provider('password'))

+                && $password($this->credentials['password'])=='verify') {

 

                 $this->password = $this->credentials['password'];

                 $this->passwordVerify = true;

-                $this->credentials = Arr::removeKey($this->credentials,['password']);

+                $this->credentials = Arr::removeKey($this->credentials, ['password']);

 

                 return null;

             }

         }

 

-        if(is_object($query) && $query->count()){

+        if (is_object($query) && $query->count()) {

             $password = $query->first()->password;

-            if(password_verify($this->password,$password)){

+            if (password_verify($this->password, $password)) {

                 return $query;

             }

         }

@@ -137,24 +137,24 @@ 
 

             // with the callback method (eloquent model)

             // we write the where clause.

-            foreach ($this->credentials as $credential=>$credentialValue){

+            foreach ($this->credentials as $credential=>$credentialValue) {

 

-                if(!is_null($provider = $this->auth->provider($credential))){

-                    $query->where($credential,$provider($credentialValue));

+                if (!is_null($provider = $this->auth->provider($credential))) {

+                    $query->where($credential, $provider($credentialValue));

                 }

-                else{

-                    $query->where($credential,$credentialValue);

+                else {

+                    $query->where($credential, $credentialValue);

                 }

             }

 

             // for the authenticate query,

             // the user can add additional queries by the service provider.

-            if(!is_null($addQuery = $this->auth->provider('addQuery'))){

+            if (!is_null($addQuery = $this->auth->provider('addQuery'))) {

                 $addQuery($query);

             }

         });

 

-        if(false === $this->passwordVerify){

+        if (false===$this->passwordVerify) {

             return $query;

         }

 

@@ -164,10 +164,10 @@ 
     /**

      * @return void|mixed

      */

-    protected function updateToken($token=null)

+    protected function updateToken($token = null)

     {

         //if query status value is true

-        if($this->auth->params['status']){

+        if ($this->auth->params['status']) {

 

             // we go to the method that produces

             // the classical token value and get the token value.

@@ -177,13 +177,13 @@ 
             // if there is no update, we reset the status value to 0.

             $update = $this->auth->params['builder']->update(['token'=>$this->auth->params['token']]);

 

-            if(!$update){

+            if (!$update) {

                 $this->auth->params['status'] = 0;

                 $this->auth->params['exception'] = 'update';

             }

-            else{

-                if(!is_null($after = $this->auth->provider('after'))){

-                    if(false === $after($this->auth->params['builder']->first())){

+            else {

+                if (!is_null($after = $this->auth->provider('after'))) {

+                    if (false===$after($this->auth->params['builder']->first())) {

                         $this->auth->params['status'] = 0;

                         $this->auth->params['exception'] = 'update';

                     }

@@ -203,10 +203,10 @@ 
     {

         $token_integer = crc32(md5($this->auth->params['token']));

 

-        if(!is_null($token_integer)){

+        if (!is_null($token_integer)) {

 

-            if(DeviceToken::where('user_id',$this->auth->params['authId'])

-                    ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))->count()==0){

+            if (DeviceToken::where('user_id', $this->auth->params['authId'])

+                    ->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])))->count()==0) {

 

                 return DeviceToken::create([

                     'user_id' => $this->auth->params['authId'],

@@ -217,10 +217,10 @@ 
                     'expire' => $this->auth->getExpire(),

                 ]);

             }

-            else{

+            else {

 

-                return DeviceToken::where('user_id',$this->auth->params['authId'])

-                    ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))

+                return DeviceToken::where('user_id', $this->auth->params['authId'])

+                    ->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])))

                     ->update([

                         'token' => $this->auth->params['token'],

                         'token_integer' => $token_integer

@@ -240,11 +240,11 @@ 
     {

         $token_integer = crc32(md5($this->auth->getTokenSentByUser()));

 

-        if(!is_null($token_integer)){

+        if (!is_null($token_integer)) {

 

-            DeviceToken::where('token_integer',$token_integer)->delete();

+            DeviceToken::where('token_integer', $token_integer)->delete();

 

-            return (DeviceToken::where('token_integer',$token_integer)->count()) ? false : true;

+            return (DeviceToken::where('token_integer', $token_integer)->count()) ? false : true;

         }

 

     }

Braces +3 added lines, -6 removed lines

@@ -141,8 +141,7 @@ 
 

                 if(!is_null($provider = $this->auth->provider($credential))){

                     $query->where($credential,$provider($credentialValue));

-                }

-                else{

+                } else{

                     $query->where($credential,$credentialValue);

                 }

             }

@@ -180,8 +179,7 @@ 
             if(!$update){

                 $this->auth->params['status'] = 0;

                 $this->auth->params['exception'] = 'update';

-            }

-            else{

+            } else{

                 if(!is_null($after = $this->auth->provider('after'))){

                     if(false === $after($this->auth->params['builder']->first())){

                         $this->auth->params['status'] = 0;

@@ -216,8 +214,7 @@ 
                     'device_agent_integer' => crc32(md5($_SERVER['HTTP_USER_AGENT'])),

                     'expire' => $this->auth->getExpire(),

                 ]);

-            }

-            else{

+            } else{

 

                 return DeviceToken::where('user_id',$this->auth->params['authId'])

                     ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))