@@ -349,8 +349,7 @@ discard block |
||
349 | 349 | $this->inputs[$generator] = $this->{$generatorMethodName}(); |
350 | 350 | $this->generatorList[] = $generator; |
351 | 351 | } |
352 | - } |
|
353 | - else { |
|
352 | + } else { |
|
354 | 353 | |
355 | 354 | if($this->checkProperties('auto_generators_dont_overwrite') |
356 | 355 | && in_array($generator,$this->getAutoGeneratorsDontOverwrite())){ |
@@ -603,8 +602,7 @@ discard block |
||
603 | 602 | $keyMethod = $this->{$method}(); |
604 | 603 | $this->inputs[$key] = $keyMethod; |
605 | 604 | } |
606 | - } |
|
607 | - else{ |
|
605 | + } else{ |
|
608 | 606 | if(isset($this->inputs[$key])){ |
609 | 607 | $keyMethod = $this->{$method}(); |
610 | 608 | $this->inputs[$key] = $keyMethod; |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * |
70 | 70 | * @throws ReflectionExceptionAlias |
71 | 71 | */ |
72 | - public function __construct($clientData=null) |
|
72 | + public function __construct($clientData = null) |
|
73 | 73 | { |
74 | 74 | //reflection process |
75 | 75 | $this->reflection = app()['reflection']($this); |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | $this->setClientName(); |
79 | 79 | |
80 | 80 | //get http method via request http manager class |
81 | - $this->requestHttp = app()->resolve(ClientHttpManager::class,['client'=>$this]); |
|
81 | + $this->requestHttp = app()->resolve(ClientHttpManager::class, ['client'=>$this]); |
|
82 | 82 | |
83 | 83 | //get request client data |
84 | 84 | $this->clientData = ($clientData===null) ? $this->requestHttp->resolve() : $clientData; |
@@ -95,9 +95,9 @@ discard block |
||
95 | 95 | private function autoValidate($validate) |
96 | 96 | { |
97 | 97 | //we get the values to auto-validate. |
98 | - foreach ($this->{$validate} as $object=>$datas){ |
|
98 | + foreach ($this->{$validate} as $object=>$datas) { |
|
99 | 99 | |
100 | - if(false===Utils::isNamespaceExists($object)){ |
|
100 | + if (false===Utils::isNamespaceExists($object)) { |
|
101 | 101 | return; |
102 | 102 | } |
103 | 103 | |
@@ -107,30 +107,30 @@ discard block |
||
107 | 107 | |
108 | 108 | // we get the index values, |
109 | 109 | // which are called methods of the auto-validate value that represents the class. |
110 | - foreach ($datas as $dataKey=>$data){ |
|
110 | + foreach ($datas as $dataKey=>$data) { |
|
111 | 111 | |
112 | 112 | // if the methods of the auto-validate class resolved by the container resolve method apply, |
113 | 113 | // the process of auto-validate automatic implementation will be completed. |
114 | - if(method_exists($getObjectInstance,$dataKey) && is_array($data)){ |
|
115 | - foreach ($data as $dataItem){ |
|
116 | - if(isset($this->origin[$dataItem])){ |
|
117 | - $getObjectInstance->{$dataKey}($this->origin[$dataItem],$this,$dataItem); |
|
114 | + if (method_exists($getObjectInstance, $dataKey) && is_array($data)) { |
|
115 | + foreach ($data as $dataItem) { |
|
116 | + if (isset($this->origin[$dataItem])) { |
|
117 | + $getObjectInstance->{$dataKey}($this->origin[$dataItem], $this, $dataItem); |
|
118 | 118 | } |
119 | 119 | |
120 | - if(method_exists($this,$afterMethod = 'after'.ucfirst($dataKey))){ |
|
121 | - $this->{$afterMethod}($this,$dataItem); |
|
120 | + if (method_exists($this, $afterMethod = 'after'.ucfirst($dataKey))) { |
|
121 | + $this->{$afterMethod}($this, $dataItem); |
|
122 | 122 | } |
123 | 123 | } |
124 | 124 | } |
125 | 125 | |
126 | 126 | // if the methods of the auto-validate class resolved by the container resolve method apply, |
127 | 127 | // the process of auto-validate automatic implementation will be completed. |
128 | - if(is_numeric($dataKey) && method_exists($getObjectInstance,$data) && isset($this->origin[$data])){ |
|
129 | - if(!is_array($this->origin[$data])){ |
|
128 | + if (is_numeric($dataKey) && method_exists($getObjectInstance, $data) && isset($this->origin[$data])) { |
|
129 | + if (!is_array($this->origin[$data])) { |
|
130 | 130 | $this->origin[$data] = array($this->origin[$data]); |
131 | 131 | } |
132 | - foreach ($this->origin[$data] as $originData){ |
|
133 | - $getObjectInstance->{$data}($originData,$this,$data); |
|
132 | + foreach ($this->origin[$data] as $originData) { |
|
133 | + $getObjectInstance->{$data}($originData, $this, $data); |
|
134 | 134 | } |
135 | 135 | } |
136 | 136 | } |
@@ -145,39 +145,39 @@ discard block |
||
145 | 145 | private function capsule() |
146 | 146 | { |
147 | 147 | //a process can be added to the capsule array using the method. |
148 | - if(method_exists($this,'capsuleMethod')){ |
|
149 | - $this->capsule = array_merge($this->capsule,$this->capsuleMethod()); |
|
148 | + if (method_exists($this, 'capsuleMethod')) { |
|
149 | + $this->capsule = array_merge($this->capsule, $this->capsuleMethod()); |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | // expected method is executed. |
153 | 153 | // this method is a must for http method values to be found in this property. |
154 | - if($this->checkProperties('capsule')){ |
|
154 | + if ($this->checkProperties('capsule')) { |
|
155 | 155 | |
156 | - if(property_exists($this,'auto_capsule') && is_array($this->auto_capsule)){ |
|
157 | - $this->capsule = array_merge($this->capsule,$this->auto_capsule); |
|
156 | + if (property_exists($this, 'auto_capsule') && is_array($this->auto_capsule)) { |
|
157 | + $this->capsule = array_merge($this->capsule, $this->auto_capsule); |
|
158 | 158 | } |
159 | 159 | |
160 | - if($this->checkProperties('groups')){ |
|
161 | - $this->capsule = array_merge($this->capsule,$this->groups); |
|
160 | + if ($this->checkProperties('groups')) { |
|
161 | + $this->capsule = array_merge($this->capsule, $this->groups); |
|
162 | 162 | |
163 | 163 | foreach ($this->capsule as $item) { |
164 | - $groupProcess = $this->groupsProcess($item,true); |
|
165 | - if(is_array($groupProcess)){ |
|
164 | + $groupProcess = $this->groupsProcess($item, true); |
|
165 | + if (is_array($groupProcess)) { |
|
166 | 166 | $defaultInputs = $this->inputs; |
167 | - $this->inputs = array_merge($this->inputs,$groupProcess); |
|
167 | + $this->inputs = array_merge($this->inputs, $groupProcess); |
|
168 | 168 | } |
169 | 169 | } |
170 | 170 | } |
171 | 171 | |
172 | - foreach($this->inputs as $input=>$value){ |
|
172 | + foreach ($this->inputs as $input=>$value) { |
|
173 | 173 | |
174 | - if($this->checkProperties('capsule') && !in_array($input,$this->capsule)){ |
|
175 | - exception('clientCapsule',['key'=>$input]) |
|
174 | + if ($this->checkProperties('capsule') && !in_array($input, $this->capsule)) { |
|
175 | + exception('clientCapsule', ['key'=>$input]) |
|
176 | 176 | ->overflow('The '.$input.' value cannot be sent.'); |
177 | 177 | } |
178 | 178 | } |
179 | 179 | |
180 | - if(isset($defaultInputs)){ |
|
180 | + if (isset($defaultInputs)) { |
|
181 | 181 | $this->inputs = $defaultInputs; |
182 | 182 | } |
183 | 183 | } |
@@ -195,15 +195,15 @@ discard block |
||
195 | 195 | |
196 | 196 | // Determines which HTTP method |
197 | 197 | // the request object will be exposed to. |
198 | - if($this->checkProperties('http')){ |
|
198 | + if ($this->checkProperties('http')) { |
|
199 | 199 | |
200 | 200 | // if the current http method does not exist |
201 | 201 | // in the http object, the exception will be thrown. |
202 | - if(!in_array($method,$this->http)){ |
|
202 | + if (!in_array($method, $this->http)) { |
|
203 | 203 | |
204 | 204 | //exception batMethodCall |
205 | 205 | exception()->badMethodCall( |
206 | - 'Invalid http method process for '.basename($this).'.That is accepted http methods ['.implode(",",$this->http).'] '); |
|
206 | + 'Invalid http method process for '.basename($this).'.That is accepted http methods ['.implode(",", $this->http).'] '); |
|
207 | 207 | } |
208 | 208 | } |
209 | 209 | } |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | { |
219 | 219 | // from the properties of the object properties to |
220 | 220 | // the existing variables, control the array and at least one element. |
221 | - return (property_exists($this,$properties) |
|
221 | + return (property_exists($this, $properties) |
|
222 | 222 | && is_array($this->{$properties}) && count($this->{$properties})) ? true : false; |
223 | 223 | } |
224 | 224 | |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | { |
232 | 232 | // we are saving the expected values for the request in container. |
233 | 233 | // this record can be returned in exception information. |
234 | - app()->register('requestExpected',$this->expected); |
|
234 | + app()->register('requestExpected', $this->expected); |
|
235 | 235 | } |
236 | 236 | |
237 | 237 | /** |
@@ -243,15 +243,15 @@ discard block |
||
243 | 243 | public function except($except) |
244 | 244 | { |
245 | 245 | // the except parameter is a callable value. |
246 | - if(is_callable($except)){ |
|
247 | - $call = call_user_func_array($except,[$this]); |
|
246 | + if (is_callable($except)) { |
|
247 | + $call = call_user_func_array($except, [$this]); |
|
248 | 248 | $except = $call; |
249 | 249 | } |
250 | 250 | |
251 | 251 | // except with the except exceptions property |
252 | 252 | // and then assigning them to the inputs property. |
253 | - $this->except = array_merge($this->except,$except); |
|
254 | - $this->inputs = array_diff_key($this->inputs,array_flip($this->except)); |
|
253 | + $this->except = array_merge($this->except, $except); |
|
254 | + $this->inputs = array_diff_key($this->inputs, array_flip($this->except)); |
|
255 | 255 | |
256 | 256 | return $this; |
257 | 257 | } |
@@ -265,32 +265,32 @@ discard block |
||
265 | 265 | { |
266 | 266 | // expected method is executed. |
267 | 267 | // this method is a must for http method values to be found in this property. |
268 | - if($this->checkProperties('expected')){ |
|
268 | + if ($this->checkProperties('expected')) { |
|
269 | 269 | |
270 | 270 | // if the expected values are not found in the inputs array, |
271 | 271 | // the exception will be thrown. |
272 | - foreach ($this->expected as $expected){ |
|
272 | + foreach ($this->expected as $expected) { |
|
273 | 273 | |
274 | 274 | $expectedValues = []; |
275 | 275 | |
276 | 276 | // mandatory expected data for each key can be separated by | operator. |
277 | 277 | // this is evaluated as "or". |
278 | - foreach($expectedData = explode("|",$expected) as $inputs){ |
|
278 | + foreach ($expectedData = explode("|", $expected) as $inputs) { |
|
279 | 279 | |
280 | 280 | // we should do key control for group format. |
281 | 281 | // this process will allow us to perform key control for 2D array correctly. |
282 | 282 | $this->groupsProcess($inputs); |
283 | 283 | |
284 | - if(!isset($this->inputs[$inputs])){ |
|
284 | + if (!isset($this->inputs[$inputs])) { |
|
285 | 285 | $expectedValues[$inputs] = $inputs; |
286 | 286 | } |
287 | 287 | } |
288 | 288 | |
289 | 289 | // if the expectedData and expectedValues |
290 | 290 | // array are numerically equal to the expected key, the exception is thrown. |
291 | - if(count($expectedData)===count($expectedValues)){ |
|
292 | - exception('clientExpected',['key'=>$expected]) |
|
293 | - ->unexpectedValue('You absolutely have to send the value '.implode(" or ",$expectedValues).' for request object'); |
|
291 | + if (count($expectedData)===count($expectedValues)) { |
|
292 | + exception('clientExpected', ['key'=>$expected]) |
|
293 | + ->unexpectedValue('You absolutely have to send the value '.implode(" or ", $expectedValues).' for request object'); |
|
294 | 294 | } |
295 | 295 | } |
296 | 296 | } |
@@ -305,17 +305,17 @@ discard block |
||
305 | 305 | { |
306 | 306 | // check the presence of the generator object |
307 | 307 | // and operate the generator over this object. |
308 | - if($this->checkProperties('auto_generators')){ |
|
308 | + if ($this->checkProperties('auto_generators')) { |
|
309 | 309 | $generators = $this->getAutoGenerators(); |
310 | 310 | } |
311 | 311 | |
312 | 312 | // check the presence of the generator object |
313 | 313 | // and operate the generator over this object. |
314 | - if($this->checkProperties('generators')){ |
|
315 | - $generators = array_merge(isset($generators) ? $generators: [],$this->getGenerators()); |
|
314 | + if ($this->checkProperties('generators')) { |
|
315 | + $generators = array_merge(isset($generators) ? $generators : [], $this->getGenerators()); |
|
316 | 316 | } |
317 | 317 | |
318 | - if(isset($generators)){ |
|
318 | + if (isset($generators)) { |
|
319 | 319 | $this->generatorMethod($generators); |
320 | 320 | } |
321 | 321 | } |
@@ -330,21 +330,21 @@ discard block |
||
330 | 330 | private function generatorMethod($generators) |
331 | 331 | { |
332 | 332 | //generator array object |
333 | - foreach ($generators as $generator){ |
|
333 | + foreach ($generators as $generator) { |
|
334 | 334 | |
335 | 335 | //generator method name |
336 | 336 | $generatorMethodName = $generator.'Generator'; |
337 | 337 | |
338 | 338 | // if the generator method is present, |
339 | 339 | // the fake value is assigned. |
340 | - if(method_exists($this,$generatorMethodName)){ |
|
340 | + if (method_exists($this, $generatorMethodName)) { |
|
341 | 341 | |
342 | 342 | //fake registration |
343 | - if(!isset($this->inputs[$generator])){ |
|
343 | + if (!isset($this->inputs[$generator])) { |
|
344 | 344 | |
345 | 345 | $generatorMethodNameResult = $this->{$generatorMethodName}(); |
346 | 346 | |
347 | - if(!is_null($generatorMethodNameResult)){ |
|
347 | + if (!is_null($generatorMethodNameResult)) { |
|
348 | 348 | $this->{$generator} = $this->{$generatorMethodName}(); |
349 | 349 | $this->inputs[$generator] = $this->{$generatorMethodName}(); |
350 | 350 | $this->generatorList[] = $generator; |
@@ -352,15 +352,15 @@ discard block |
||
352 | 352 | } |
353 | 353 | else { |
354 | 354 | |
355 | - if($this->checkProperties('auto_generators_dont_overwrite') |
|
356 | - && in_array($generator,$this->getAutoGeneratorsDontOverwrite())){ |
|
355 | + if ($this->checkProperties('auto_generators_dont_overwrite') |
|
356 | + && in_array($generator, $this->getAutoGeneratorsDontOverwrite())) { |
|
357 | 357 | $this->{$generator} = $this->{$generatorMethodName}(); |
358 | 358 | $this->inputs[$generator] = $this->{$generatorMethodName}(); |
359 | 359 | $this->generatorList[] = $generator; |
360 | 360 | } |
361 | 361 | |
362 | - if($this->checkProperties('generators_dont_overwrite') |
|
363 | - && in_array($generator,$this->getGeneratorsDontOverwrite())){ |
|
362 | + if ($this->checkProperties('generators_dont_overwrite') |
|
363 | + && in_array($generator, $this->getGeneratorsDontOverwrite())) { |
|
364 | 364 | $this->{$generator} = $this->{$generatorMethodName}(); |
365 | 365 | $this->inputs[$generator] = $this->{$generatorMethodName}(); |
366 | 366 | $this->generatorList[] = $generator; |
@@ -391,28 +391,28 @@ discard block |
||
391 | 391 | * @param null $callback |
392 | 392 | * @return mixed|void |
393 | 393 | */ |
394 | - public function groupsProcess($key=null,$callback=null) |
|
394 | + public function groupsProcess($key = null, $callback = null) |
|
395 | 395 | { |
396 | - if(property_exists($this,'groups') && is_array($this->groups)){ |
|
396 | + if (property_exists($this, 'groups') && is_array($this->groups)) { |
|
397 | 397 | |
398 | 398 | $clientObjects = $this->getClientObjects(); |
399 | 399 | |
400 | - foreach ($this->groups as $group){ |
|
400 | + foreach ($this->groups as $group) { |
|
401 | 401 | |
402 | - if(true === $callback){ |
|
403 | - if(isset($clientObjects['origin'][$key])){ |
|
402 | + if (true===$callback) { |
|
403 | + if (isset($clientObjects['origin'][$key])) { |
|
404 | 404 | return $clientObjects['origin'][$key]; |
405 | 405 | } |
406 | 406 | return []; |
407 | 407 | } |
408 | 408 | |
409 | - if(isset($clientObjects['origin'][$group][$key])){ |
|
409 | + if (isset($clientObjects['origin'][$group][$key])) { |
|
410 | 410 | |
411 | 411 | $this->{$key} = $clientObjects['origin'][$group][$key]; |
412 | 412 | $this->inputs[$key] = $this->{$key}; |
413 | 413 | |
414 | - if(is_callable($callback)){ |
|
415 | - call_user_func_array($callback,[$key]); |
|
414 | + if (is_callable($callback)) { |
|
415 | + call_user_func_array($callback, [$key]); |
|
416 | 416 | } |
417 | 417 | } |
418 | 418 | } |
@@ -437,7 +437,7 @@ discard block |
||
437 | 437 | //that coming with the post. |
438 | 438 | $this->initClient(); |
439 | 439 | |
440 | - if(method_exists($this,'eventBefore')){ |
|
440 | + if (method_exists($this, 'eventBefore')) { |
|
441 | 441 | $this->eventBefore(); |
442 | 442 | } |
443 | 443 | |
@@ -479,7 +479,7 @@ discard block |
||
479 | 479 | { |
480 | 480 | // we use the http method to write |
481 | 481 | // the values to the inputs and origin properties. |
482 | - foreach($this->clientData as $key=>$value){ |
|
482 | + foreach ($this->clientData as $key=>$value) { |
|
483 | 483 | |
484 | 484 | //inputs and origin properties |
485 | 485 | $this->inputs[$key] = $value; |
@@ -495,9 +495,9 @@ discard block |
||
495 | 495 | */ |
496 | 496 | private function requestExcept() |
497 | 497 | { |
498 | - if(property_exists($this,'requestExcept') && is_array($this->requestExcept)){ |
|
499 | - foreach ($this->requestExcept as $item){ |
|
500 | - if(isset($this->inputs[$item])){ |
|
498 | + if (property_exists($this, 'requestExcept') && is_array($this->requestExcept)) { |
|
499 | + foreach ($this->requestExcept as $item) { |
|
500 | + if (isset($this->inputs[$item])) { |
|
501 | 501 | unset($this->inputs[$item]); |
502 | 502 | } |
503 | 503 | } |
@@ -510,16 +510,16 @@ discard block |
||
510 | 510 | * @param null|string $clientName |
511 | 511 | * @return void|mixed |
512 | 512 | */ |
513 | - public function setClientName($clientName=null) |
|
513 | + public function setClientName($clientName = null) |
|
514 | 514 | { |
515 | - if(!is_null($clientName) && is_string($clientName)){ |
|
515 | + if (!is_null($clientName) && is_string($clientName)) { |
|
516 | 516 | return $this->clientName = $clientName; |
517 | 517 | } |
518 | 518 | |
519 | - if(!is_null(Utils::trace(0)) && isset(Utils::trace(0)['object'])){ |
|
519 | + if (!is_null(Utils::trace(0)) && isset(Utils::trace(0)['object'])) { |
|
520 | 520 | $backTrace = Utils::trace(0)['object']; |
521 | 521 | |
522 | - if(property_exists($backTrace,'clientName')){ |
|
522 | + if (property_exists($backTrace, 'clientName')) { |
|
523 | 523 | $this->clientName = $backTrace->clientName; |
524 | 524 | } |
525 | 525 | } |
@@ -536,16 +536,16 @@ discard block |
||
536 | 536 | |
537 | 537 | // we update the input values after |
538 | 538 | // we receive and check the saved objects. |
539 | - foreach ($clientObjects as $key=>$value){ |
|
539 | + foreach ($clientObjects as $key=>$value) { |
|
540 | 540 | |
541 | 541 | // we should do key control for group format. |
542 | 542 | // this process will allow us to perform key control for 2D array correctly. |
543 | - $this->groupsProcess($key,function($key){ |
|
543 | + $this->groupsProcess($key, function($key) { |
|
544 | 544 | $this->registerRequestInputs($key); |
545 | 545 | unset($this->inputs[$key]); |
546 | 546 | }); |
547 | 547 | |
548 | - if(!in_array($key,$this->generatorList) && isset($clientObjects['origin'][$key])){ |
|
548 | + if (!in_array($key, $this->generatorList) && isset($clientObjects['origin'][$key])) { |
|
549 | 549 | |
550 | 550 | $this->{$key} = $clientObjects['origin'][$key]; |
551 | 551 | $this->inputs[$key] = $this->{$key}; |
@@ -573,11 +573,11 @@ discard block |
||
573 | 573 | |
574 | 574 | // the request update to be performed using |
575 | 575 | // the method name to be used with the http method. |
576 | - $this->setRequestInputs($requestMethod,$key); |
|
576 | + $this->setRequestInputs($requestMethod, $key); |
|
577 | 577 | |
578 | 578 | // the request update to be performed using |
579 | 579 | // the method name to be used without the http method. |
580 | - $this->setRequestInputs($key,$key); |
|
580 | + $this->setRequestInputs($key, $key); |
|
581 | 581 | } |
582 | 582 | |
583 | 583 | /** |
@@ -588,28 +588,28 @@ discard block |
||
588 | 588 | * |
589 | 589 | * @throws ReflectionExceptionAlias |
590 | 590 | */ |
591 | - private function setRequestInputs($method,$key) |
|
591 | + private function setRequestInputs($method, $key) |
|
592 | 592 | { |
593 | - if(!in_array($key,$this->generatorList) && method_exists($this,$method) && $this->reflection->reflectionMethodParams($method)->isProtected){ |
|
593 | + if (!in_array($key, $this->generatorList) && method_exists($this, $method) && $this->reflection->reflectionMethodParams($method)->isProtected) { |
|
594 | 594 | |
595 | 595 | //check annotations for method |
596 | - $annotation = app()->resolve(ClientAnnotationManager::class,['request'=>$this]); |
|
597 | - $annotation->annotation($method,$key); |
|
596 | + $annotation = app()->resolve(ClientAnnotationManager::class, ['request'=>$this]); |
|
597 | + $annotation->annotation($method, $key); |
|
598 | 598 | |
599 | - if(isset($this->inputs[$key]) && is_array($this->inputs[$key])){ |
|
599 | + if (isset($this->inputs[$key]) && is_array($this->inputs[$key])) { |
|
600 | 600 | |
601 | 601 | $inputKeys = $this->inputs[$key]; |
602 | 602 | |
603 | 603 | $this->inputs[$key] = []; |
604 | - foreach ($inputKeys as $ikey=>$input){ |
|
604 | + foreach ($inputKeys as $ikey=>$input) { |
|
605 | 605 | |
606 | 606 | $this->{$key}[$ikey] = $input; |
607 | 607 | $keyMethod = $this->{$method}(); |
608 | 608 | $this->inputs[$key] = $keyMethod; |
609 | 609 | } |
610 | 610 | } |
611 | - else{ |
|
612 | - if(isset($this->inputs[$key])){ |
|
611 | + else { |
|
612 | + if (isset($this->inputs[$key])) { |
|
613 | 613 | $keyMethod = $this->{$method}(); |
614 | 614 | $this->inputs[$key] = $keyMethod; |
615 | 615 | } |
@@ -628,8 +628,8 @@ discard block |
||
628 | 628 | // the auto object validate property is the property |
629 | 629 | // where all of your request values are automatically validated. |
630 | 630 | /** @noinspection PhpParamsInspection */ |
631 | - if(property_exists($this,'autoObjectValidate') |
|
632 | - && is_array($this->autoObjectValidate) && count($this->autoObjectValidate)){ |
|
631 | + if (property_exists($this, 'autoObjectValidate') |
|
632 | + && is_array($this->autoObjectValidate) && count($this->autoObjectValidate)) { |
|
633 | 633 | $this->autoValidate('autoObjectValidate'); |
634 | 634 | } |
635 | 635 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | { |
52 | 52 | $userId = $manager->getAuth()->params['userId']; |
53 | 53 | |
54 | - return DeviceToken::where('user_id',$userId)->get(); |
|
54 | + return DeviceToken::where('user_id', $userId)->get(); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | /** |
@@ -64,8 +64,8 @@ discard block |
||
64 | 64 | return DeviceToken::where(function($query) use($token) { |
65 | 65 | |
66 | 66 | //where query for token |
67 | - $query->where('token_integer',crc32(md5($token))); |
|
68 | - $query->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT']))); |
|
67 | + $query->where('token_integer', crc32(md5($token))); |
|
68 | + $query->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT']))); |
|
69 | 69 | }); |
70 | 70 | } |
71 | 71 | |
@@ -79,8 +79,8 @@ discard block |
||
79 | 79 | return DeviceToken::where(function($query) use($token) { |
80 | 80 | |
81 | 81 | //where query for token |
82 | - $query->where('token_integer',crc32(md5($token))); |
|
83 | - $query->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT']))); |
|
82 | + $query->where('token_integer', crc32(md5($token))); |
|
83 | + $query->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT']))); |
|
84 | 84 | |
85 | 85 | }); |
86 | 86 | } |
@@ -91,23 +91,23 @@ discard block |
||
91 | 91 | * @param null|object $query |
92 | 92 | * @return mixed |
93 | 93 | */ |
94 | - protected function checkPasswordVerify($query=null) |
|
94 | + protected function checkPasswordVerify($query = null) |
|
95 | 95 | { |
96 | - if(is_null($query) && isset($this->credentials['password'])){ |
|
97 | - if(!is_null($password = $this->auth->provider('password')) |
|
98 | - && $password($this->credentials['password'])=='verify'){ |
|
96 | + if (is_null($query) && isset($this->credentials['password'])) { |
|
97 | + if (!is_null($password = $this->auth->provider('password')) |
|
98 | + && $password($this->credentials['password'])=='verify') { |
|
99 | 99 | |
100 | 100 | $this->password = $this->credentials['password']; |
101 | 101 | $this->passwordVerify = true; |
102 | - $this->credentials = Arr::removeKey($this->credentials,['password']); |
|
102 | + $this->credentials = Arr::removeKey($this->credentials, ['password']); |
|
103 | 103 | |
104 | 104 | return null; |
105 | 105 | } |
106 | 106 | } |
107 | 107 | |
108 | - if(is_object($query) && $query->count()){ |
|
108 | + if (is_object($query) && $query->count()) { |
|
109 | 109 | $password = $query->first()->password; |
110 | - if(password_verify($this->password,$password)){ |
|
110 | + if (password_verify($this->password, $password)) { |
|
111 | 111 | return $query; |
112 | 112 | } |
113 | 113 | } |
@@ -137,24 +137,24 @@ discard block |
||
137 | 137 | |
138 | 138 | // with the callback method (eloquent model) |
139 | 139 | // we write the where clause. |
140 | - foreach ($this->credentials as $credential=>$credentialValue){ |
|
140 | + foreach ($this->credentials as $credential=>$credentialValue) { |
|
141 | 141 | |
142 | - if(!is_null($provider = $this->auth->provider($credential))){ |
|
143 | - $query->where($credential,$provider($credentialValue)); |
|
142 | + if (!is_null($provider = $this->auth->provider($credential))) { |
|
143 | + $query->where($credential, $provider($credentialValue)); |
|
144 | 144 | } |
145 | - else{ |
|
146 | - $query->where($credential,$credentialValue); |
|
145 | + else { |
|
146 | + $query->where($credential, $credentialValue); |
|
147 | 147 | } |
148 | 148 | } |
149 | 149 | |
150 | 150 | // for the authenticate query, |
151 | 151 | // the user can add additional queries by the service provider. |
152 | - if(!is_null($addQuery = $this->auth->provider('addQuery'))){ |
|
152 | + if (!is_null($addQuery = $this->auth->provider('addQuery'))) { |
|
153 | 153 | $addQuery($query); |
154 | 154 | } |
155 | 155 | }); |
156 | 156 | |
157 | - if(false === $this->passwordVerify){ |
|
157 | + if (false===$this->passwordVerify) { |
|
158 | 158 | return $query; |
159 | 159 | } |
160 | 160 | |
@@ -164,10 +164,10 @@ discard block |
||
164 | 164 | /** |
165 | 165 | * @return void|mixed |
166 | 166 | */ |
167 | - protected function updateToken($token=null) |
|
167 | + protected function updateToken($token = null) |
|
168 | 168 | { |
169 | 169 | //if query status value is true |
170 | - if($this->auth->params['status']){ |
|
170 | + if ($this->auth->params['status']) { |
|
171 | 171 | |
172 | 172 | // we go to the method that produces |
173 | 173 | // the classical token value and get the token value. |
@@ -177,13 +177,13 @@ discard block |
||
177 | 177 | // if there is no update, we reset the status value to 0. |
178 | 178 | $update = $this->auth->params['builder']->update(['token'=>$this->auth->params['token']]); |
179 | 179 | |
180 | - if(!$update){ |
|
180 | + if (!$update) { |
|
181 | 181 | $this->auth->params['status'] = 0; |
182 | 182 | $this->auth->params['exception'] = 'update'; |
183 | 183 | } |
184 | - else{ |
|
185 | - if(!is_null($after = $this->auth->provider('after'))){ |
|
186 | - if(false === $after($this->auth->params['builder']->first())){ |
|
184 | + else { |
|
185 | + if (!is_null($after = $this->auth->provider('after'))) { |
|
186 | + if (false===$after($this->auth->params['builder']->first())) { |
|
187 | 187 | $this->auth->params['status'] = 0; |
188 | 188 | $this->auth->params['exception'] = 'update'; |
189 | 189 | } |
@@ -203,10 +203,10 @@ discard block |
||
203 | 203 | { |
204 | 204 | $token_integer = crc32(md5($this->auth->params['token'])); |
205 | 205 | |
206 | - if(!is_null($token_integer)){ |
|
206 | + if (!is_null($token_integer)) { |
|
207 | 207 | |
208 | - if(DeviceToken::where('user_id',$this->auth->params['authId']) |
|
209 | - ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))->count()==0){ |
|
208 | + if (DeviceToken::where('user_id', $this->auth->params['authId']) |
|
209 | + ->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])))->count()==0) { |
|
210 | 210 | |
211 | 211 | return DeviceToken::create([ |
212 | 212 | 'user_id' => $this->auth->params['authId'], |
@@ -217,10 +217,10 @@ discard block |
||
217 | 217 | 'expire' => $this->auth->getExpire(), |
218 | 218 | ]); |
219 | 219 | } |
220 | - else{ |
|
220 | + else { |
|
221 | 221 | |
222 | - return DeviceToken::where('user_id',$this->auth->params['authId']) |
|
223 | - ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT']))) |
|
222 | + return DeviceToken::where('user_id', $this->auth->params['authId']) |
|
223 | + ->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT']))) |
|
224 | 224 | ->update([ |
225 | 225 | 'token' => $this->auth->params['token'], |
226 | 226 | 'token_integer' => $token_integer |
@@ -240,11 +240,11 @@ discard block |
||
240 | 240 | { |
241 | 241 | $token_integer = crc32(md5($this->auth->getTokenSentByUser())); |
242 | 242 | |
243 | - if(!is_null($token_integer)){ |
|
243 | + if (!is_null($token_integer)) { |
|
244 | 244 | |
245 | - DeviceToken::where('token_integer',$token_integer)->delete(); |
|
245 | + DeviceToken::where('token_integer', $token_integer)->delete(); |
|
246 | 246 | |
247 | - return (DeviceToken::where('token_integer',$token_integer)->count()) ? false : true; |
|
247 | + return (DeviceToken::where('token_integer', $token_integer)->count()) ? false : true; |
|
248 | 248 | } |
249 | 249 | |
250 | 250 | } |
@@ -141,8 +141,7 @@ discard block |
||
141 | 141 | |
142 | 142 | if(!is_null($provider = $this->auth->provider($credential))){ |
143 | 143 | $query->where($credential,$provider($credentialValue)); |
144 | - } |
|
145 | - else{ |
|
144 | + } else{ |
|
146 | 145 | $query->where($credential,$credentialValue); |
147 | 146 | } |
148 | 147 | } |
@@ -180,8 +179,7 @@ discard block |
||
180 | 179 | if(!$update){ |
181 | 180 | $this->auth->params['status'] = 0; |
182 | 181 | $this->auth->params['exception'] = 'update'; |
183 | - } |
|
184 | - else{ |
|
182 | + } else{ |
|
185 | 183 | if(!is_null($after = $this->auth->provider('after'))){ |
186 | 184 | if(false === $after($this->auth->params['builder']->first())){ |
187 | 185 | $this->auth->params['status'] = 0; |
@@ -216,8 +214,7 @@ discard block |
||
216 | 214 | 'device_agent_integer' => crc32(md5($_SERVER['HTTP_USER_AGENT'])), |
217 | 215 | 'expire' => $this->auth->getExpire(), |
218 | 216 | ]); |
219 | - } |
|
220 | - else{ |
|
217 | + } else{ |
|
221 | 218 | |
222 | 219 | return DeviceToken::where('user_id',$this->auth->params['authId']) |
223 | 220 | ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT']))) |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | { |
25 | 25 | // if the status value is true, |
26 | 26 | // we send output generated from the token value. |
27 | - if($this->checkStatus()){ |
|
27 | + if ($this->checkStatus()) { |
|
28 | 28 | $this->setAuthenticateSuccess(true); |
29 | 29 | return true; |
30 | 30 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | { |
41 | 41 | // if the status value is true, |
42 | 42 | // we send output generated from the token value. |
43 | - if($this->checkStatus()){ |
|
43 | + if ($this->checkStatus()) { |
|
44 | 44 | return true; |
45 | 45 | } |
46 | 46 | |
@@ -53,11 +53,11 @@ discard block |
||
53 | 53 | */ |
54 | 54 | protected function getResult() |
55 | 55 | { |
56 | - $result= []; |
|
56 | + $result = []; |
|
57 | 57 | |
58 | 58 | // if the status value is true, |
59 | 59 | // we send output generated from the token value. |
60 | - if($this->checkStatus()){ |
|
60 | + if ($this->checkStatus()) { |
|
61 | 61 | $result['message'] = 'token success'; |
62 | 62 | $result['token'] = $this->params['token']; |
63 | 63 | $result['user'] = $this->params['data']; |
@@ -79,12 +79,12 @@ discard block |
||
79 | 79 | * |
80 | 80 | * @param bool $value |
81 | 81 | */ |
82 | - private function setAuthenticateSuccess($value=true) |
|
82 | + private function setAuthenticateSuccess($value = true) |
|
83 | 83 | { |
84 | - if(app()->has('authenticateSuccess')){ |
|
84 | + if (app()->has('authenticateSuccess')) { |
|
85 | 85 | app()->terminate('authenticateSuccess'); |
86 | 86 | } |
87 | 87 | |
88 | - app()->register('authenticateSuccess',$value); |
|
88 | + app()->register('authenticateSuccess', $value); |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | \ No newline at end of file |
@@ -5,7 +5,7 @@ |
||
5 | 5 | |
6 | 6 | class User extends Eloquent |
7 | 7 | { |
8 | - protected $hidden = ['id','password','token']; |
|
8 | + protected $hidden = ['id', 'password', 'token']; |
|
9 | 9 | |
10 | 10 | /** |
11 | 11 | * User constructor. |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | /** |
33 | 33 | * @var array |
34 | 34 | */ |
35 | - public $commandRule=['name','client']; |
|
35 | + public $commandRule = ['name', 'client']; |
|
36 | 36 | |
37 | 37 | /** |
38 | 38 | * @method create |
@@ -56,35 +56,35 @@ discard block |
||
56 | 56 | |
57 | 57 | $this->argument['managerTraitNamespace'] = Utils::getNamespace($this->directory['clientNameDir'].'/'.$name.'Trait.php'); |
58 | 58 | |
59 | - if(!file_exists($manager = $this->directory['clientNameDir'].'/'.$name.'Manager.php')){ |
|
59 | + if (!file_exists($manager = $this->directory['clientNameDir'].'/'.$name.'Manager.php')) { |
|
60 | 60 | $this->touch['client/manager'] = $manager; |
61 | 61 | $this->touch['client/managertrait'] = $this->directory['clientNameDir'].'/'.$name.'Trait.php'; |
62 | 62 | |
63 | 63 | } |
64 | 64 | |
65 | - if(isset($this->argument['trait'])){ |
|
65 | + if (isset($this->argument['trait'])) { |
|
66 | 66 | $this->argument['name'] = $this->argument['trait']; |
67 | 67 | |
68 | - if(!file_exists($managerCustomTrait = $this->directory['clientNameDir'].'/'.$this->argument['trait'].'Trait.php')){ |
|
68 | + if (!file_exists($managerCustomTrait = $this->directory['clientNameDir'].'/'.$this->argument['trait'].'Trait.php')) { |
|
69 | 69 | $this->touch['client/managercustomtrait'] = $managerCustomTrait; |
70 | 70 | } |
71 | 71 | |
72 | 72 | $this->argument['managerTraitNamespace'] = Utils::getNamespace($managerCustomTrait); |
73 | 73 | } |
74 | 74 | |
75 | - if(!file_exists($this->directory['clientNameCreate'].'/Client.php')){ |
|
75 | + if (!file_exists($this->directory['clientNameCreate'].'/Client.php')) { |
|
76 | 76 | $this->touch['client/client'] = $this->directory['clientNameCreate'].'/Client.php'; |
77 | 77 | $this->touch['client/clientGenerator'] = $this->directory['clientNameCreate'].'/ClientGenerator.php'; |
78 | 78 | } |
79 | 79 | |
80 | 80 | $clientSourceNamespace = Utils::getNamespace($this->directory['clientSource'].'/'.$client.'.php'); |
81 | 81 | |
82 | - if(!file_exists($clientSourceName = $this->directory['clientSource'].'/'.$client.'.php')){ |
|
82 | + if (!file_exists($clientSourceName = $this->directory['clientSource'].'/'.$client.'.php')) { |
|
83 | 83 | $this->touch['client/source'] = $clientSourceName.''; |
84 | 84 | } |
85 | 85 | |
86 | 86 | |
87 | - if(!file_exists($this->directory['clientNameCreate'].'/ClientProvider.php')){ |
|
87 | + if (!file_exists($this->directory['clientNameCreate'].'/ClientProvider.php')) { |
|
88 | 88 | $this->touch['client/clientProvider'] = $this->directory['clientNameCreate'].'/ClientProvider.php'; |
89 | 89 | } |
90 | 90 | |
@@ -98,13 +98,13 @@ discard block |
||
98 | 98 | |
99 | 99 | $nameGeneratorNamespace = Utils::getNamespace($managerPath = $this->directory['clientNameDir'].''.DIRECTORY_SEPARATOR.''.$nameManager.'.php'); |
100 | 100 | |
101 | - $generator = new Generator(path()->version(),'ClientManager'); |
|
101 | + $generator = new Generator(path()->version(), 'ClientManager'); |
|
102 | 102 | |
103 | 103 | $clientManager = app()->namespace()->version().'\\ClientManager'; |
104 | 104 | |
105 | 105 | $clientManagerResolve = new $clientManager; |
106 | 106 | |
107 | - if(!method_exists($clientManagerResolve,strtolower($name))){ |
|
107 | + if (!method_exists($clientManagerResolve, strtolower($name))) { |
|
108 | 108 | |
109 | 109 | $generator->createMethod([ |
110 | 110 | strtolower($name) |
@@ -135,11 +135,11 @@ discard block |
||
135 | 135 | |
136 | 136 | } |
137 | 137 | |
138 | - $nameGenerator = new Generator($this->directory['clientNameDir'],$name.'Manager'); |
|
138 | + $nameGenerator = new Generator($this->directory['clientNameDir'], $name.'Manager'); |
|
139 | 139 | |
140 | 140 | $nameGeneratorNamespaceResolve = new $nameGeneratorNamespace; |
141 | 141 | |
142 | - if(!method_exists($nameGeneratorNamespaceResolve,strtolower($client))){ |
|
142 | + if (!method_exists($nameGeneratorNamespaceResolve, strtolower($client))) { |
|
143 | 143 | |
144 | 144 | $nameGenerator->createMethod([ |
145 | 145 | strtolower($client) |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | { |
32 | 32 | $this->config(); |
33 | 33 | |
34 | - if($this->guard=="default"){ |
|
34 | + if ($this->guard=="default") { |
|
35 | 35 | $this->setAuthenticateNeeds(); |
36 | 36 | } |
37 | 37 | |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | */ |
60 | 60 | public function getAddToWhere() |
61 | 61 | { |
62 | - if(isset($this->config['guard'][$this->guard]['addToWhere'])){ |
|
62 | + if (isset($this->config['guard'][$this->guard]['addToWhere'])) { |
|
63 | 63 | return $this->config['guard'][$this->guard]['addToWhere']; |
64 | 64 | } |
65 | 65 | return null; |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | */ |
73 | 73 | public function getConfigToken() |
74 | 74 | { |
75 | - if(isset($this->config['guard'][$this->guard]['token'])){ |
|
75 | + if (isset($this->config['guard'][$this->guard]['token'])) { |
|
76 | 76 | return $this->config['guard'][$this->guard]['token']; |
77 | 77 | } |
78 | 78 | return null; |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | */ |
167 | 167 | public function provider($key) |
168 | 168 | { |
169 | - if(app()->has('authenticate.'.$key) && is_callable($provider = app()->get('authenticate.'.$key))){ |
|
169 | + if (app()->has('authenticate.'.$key) && is_callable($provider = app()->get('authenticate.'.$key))) { |
|
170 | 170 | return $provider; |
171 | 171 | } |
172 | 172 | |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | { |
206 | 206 | $table = $this->config['guard'][$this->guard]['table']; |
207 | 207 | |
208 | - app()->register('authenticateTable',$table); |
|
208 | + app()->register('authenticateTable', $table); |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | /** |
@@ -215,13 +215,13 @@ discard block |
||
215 | 215 | */ |
216 | 216 | public function deviceTokenTable() |
217 | 217 | { |
218 | - if(isset($this->config['guard'][$this->guard]['deviceTokenRegister'])){ |
|
218 | + if (isset($this->config['guard'][$this->guard]['deviceTokenRegister'])) { |
|
219 | 219 | $table = $this->config['guard'][$this->guard]['deviceTokenRegister']; |
220 | 220 | |
221 | - app()->register('authenticateDeviceTokenTable',$table); |
|
221 | + app()->register('authenticateDeviceTokenTable', $table); |
|
222 | 222 | } |
223 | - else{ |
|
224 | - app()->register('authenticateDeviceTokenTable','device_tokens'); |
|
223 | + else { |
|
224 | + app()->register('authenticateDeviceTokenTable', 'device_tokens'); |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | } |
@@ -219,8 +219,7 @@ |
||
219 | 219 | $table = $this->config['guard'][$this->guard]['deviceTokenRegister']; |
220 | 220 | |
221 | 221 | app()->register('authenticateDeviceTokenTable',$table); |
222 | - } |
|
223 | - else{ |
|
222 | + } else{ |
|
224 | 223 | app()->register('authenticateDeviceTokenTable','device_tokens'); |
225 | 224 | } |
226 | 225 |
@@ -8,7 +8,7 @@ |
||
8 | 8 | /** |
9 | 9 | * @var array |
10 | 10 | */ |
11 | - protected $fillable = ['user_id','token','token_integer','device_agent','device_agent_integer','expire']; |
|
11 | + protected $fillable = ['user_id', 'token', 'token_integer', 'device_agent', 'device_agent_integer', 'expire']; |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * User constructor. |