@@ -44,7 +44,7 @@ |
||
44 | 44 | $this->credentials = $credentials; |
45 | 45 | |
46 | 46 | //credentials loop for expected property |
47 | - foreach ($this->credentials->get() as $credential){ |
|
47 | + foreach ($this->credentials->get() as $credential) { |
|
48 | 48 | $this->capsule[] = $credential; |
49 | 49 | $this->expected[] = $credential; |
50 | 50 | } |
@@ -320,8 +320,7 @@ discard block |
||
320 | 320 | $this->inputs[$generator] = $this->{$generatorMethodName}(); |
321 | 321 | $this->generatorList[] = $generator; |
322 | 322 | } |
323 | - } |
|
324 | - else { |
|
323 | + } else { |
|
325 | 324 | |
326 | 325 | if($this->checkProperties('auto_generators_dont_overwrite') |
327 | 326 | && in_array($generator,$this->getAutoGeneratorsDontOverwrite())){ |
@@ -511,8 +510,7 @@ discard block |
||
511 | 510 | $keyMethod = $this->{$method}(); |
512 | 511 | $this->inputs[$key][] = $keyMethod; |
513 | 512 | } |
514 | - } |
|
515 | - else{ |
|
513 | + } else{ |
|
516 | 514 | if(isset($this->inputs[$key])){ |
517 | 515 | $keyMethod = $this->{$method}(); |
518 | 516 | $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,15 +107,15 @@ 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(is_numeric($dataKey) && method_exists($getObjectInstance,$data) && isset($this->origin[$data])){ |
|
115 | - if(!is_array($this->origin[$data])){ |
|
114 | + if (is_numeric($dataKey) && method_exists($getObjectInstance, $data) && isset($this->origin[$data])) { |
|
115 | + if (!is_array($this->origin[$data])) { |
|
116 | 116 | $this->origin[$data] = array($this->origin[$data]); |
117 | 117 | } |
118 | - foreach ($this->origin[$data] as $originData){ |
|
118 | + foreach ($this->origin[$data] as $originData) { |
|
119 | 119 | $getObjectInstance->{$data}($originData); |
120 | 120 | } |
121 | 121 | } |
@@ -131,39 +131,39 @@ discard block |
||
131 | 131 | private function capsule() |
132 | 132 | { |
133 | 133 | //a process can be added to the capsule array using the method. |
134 | - if(method_exists($this,'capsuleMethod')){ |
|
135 | - $this->capsule = array_merge($this->capsule,$this->capsuleMethod()); |
|
134 | + if (method_exists($this, 'capsuleMethod')) { |
|
135 | + $this->capsule = array_merge($this->capsule, $this->capsuleMethod()); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | // expected method is executed. |
139 | 139 | // this method is a must for http method values to be found in this property. |
140 | - if($this->checkProperties('capsule')){ |
|
140 | + if ($this->checkProperties('capsule')) { |
|
141 | 141 | |
142 | - if(property_exists($this,'auto_capsule') && is_array($this->auto_capsule)){ |
|
143 | - $this->capsule = array_merge($this->capsule,$this->auto_capsule); |
|
142 | + if (property_exists($this, 'auto_capsule') && is_array($this->auto_capsule)) { |
|
143 | + $this->capsule = array_merge($this->capsule, $this->auto_capsule); |
|
144 | 144 | } |
145 | 145 | |
146 | - if($this->checkProperties('groups')){ |
|
147 | - $this->capsule = array_merge($this->capsule,$this->groups); |
|
146 | + if ($this->checkProperties('groups')) { |
|
147 | + $this->capsule = array_merge($this->capsule, $this->groups); |
|
148 | 148 | |
149 | 149 | foreach ($this->capsule as $item) { |
150 | - $groupProcess = $this->groupsProcess($item,true); |
|
151 | - if(is_array($groupProcess)){ |
|
150 | + $groupProcess = $this->groupsProcess($item, true); |
|
151 | + if (is_array($groupProcess)) { |
|
152 | 152 | $defaultInputs = $this->inputs; |
153 | - $this->inputs = array_merge($this->inputs,$groupProcess); |
|
153 | + $this->inputs = array_merge($this->inputs, $groupProcess); |
|
154 | 154 | } |
155 | 155 | } |
156 | 156 | } |
157 | 157 | |
158 | - foreach($this->inputs as $input=>$value){ |
|
158 | + foreach ($this->inputs as $input=>$value) { |
|
159 | 159 | |
160 | - if($this->checkProperties('capsule') && !in_array($input,$this->capsule)){ |
|
161 | - exception('clientCapsule',['key'=>$input]) |
|
160 | + if ($this->checkProperties('capsule') && !in_array($input, $this->capsule)) { |
|
161 | + exception('clientCapsule', ['key'=>$input]) |
|
162 | 162 | ->overflow('The '.$input.' value cannot be sent.'); |
163 | 163 | } |
164 | 164 | } |
165 | 165 | |
166 | - if(isset($defaultInputs)){ |
|
166 | + if (isset($defaultInputs)) { |
|
167 | 167 | $this->inputs = $defaultInputs; |
168 | 168 | } |
169 | 169 | } |
@@ -181,15 +181,15 @@ discard block |
||
181 | 181 | |
182 | 182 | // Determines which HTTP method |
183 | 183 | // the request object will be exposed to. |
184 | - if($this->checkProperties('http')){ |
|
184 | + if ($this->checkProperties('http')) { |
|
185 | 185 | |
186 | 186 | // if the current http method does not exist |
187 | 187 | // in the http object, the exception will be thrown. |
188 | - if(!in_array($method,$this->http)){ |
|
188 | + if (!in_array($method, $this->http)) { |
|
189 | 189 | |
190 | 190 | //exception batMethodCall |
191 | 191 | exception()->badMethodCall( |
192 | - 'Invalid http method process for '.basename($this).'.That is accepted http methods ['.implode(",",$this->http).'] '); |
|
192 | + 'Invalid http method process for '.basename($this).'.That is accepted http methods ['.implode(",", $this->http).'] '); |
|
193 | 193 | } |
194 | 194 | } |
195 | 195 | } |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | { |
205 | 205 | // from the properties of the object properties to |
206 | 206 | // the existing variables, control the array and at least one element. |
207 | - return (property_exists($this,$properties) |
|
207 | + return (property_exists($this, $properties) |
|
208 | 208 | && is_array($this->{$properties}) && count($this->{$properties})) ? true : false; |
209 | 209 | } |
210 | 210 | |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | { |
218 | 218 | // we are saving the expected values for the request in container. |
219 | 219 | // this record can be returned in exception information. |
220 | - app()->register('requestExpected',$this->expected); |
|
220 | + app()->register('requestExpected', $this->expected); |
|
221 | 221 | } |
222 | 222 | |
223 | 223 | /** |
@@ -229,15 +229,15 @@ discard block |
||
229 | 229 | public function except($except) |
230 | 230 | { |
231 | 231 | // the except parameter is a callable value. |
232 | - if(is_callable($except)){ |
|
233 | - $call = call_user_func_array($except,[$this]); |
|
232 | + if (is_callable($except)) { |
|
233 | + $call = call_user_func_array($except, [$this]); |
|
234 | 234 | $except = $call; |
235 | 235 | } |
236 | 236 | |
237 | 237 | // except with the except exceptions property |
238 | 238 | // and then assigning them to the inputs property. |
239 | - $this->except = array_merge($this->except,$except); |
|
240 | - $this->inputs = array_diff_key($this->inputs,array_flip($this->except)); |
|
239 | + $this->except = array_merge($this->except, $except); |
|
240 | + $this->inputs = array_diff_key($this->inputs, array_flip($this->except)); |
|
241 | 241 | |
242 | 242 | return $this; |
243 | 243 | } |
@@ -251,32 +251,32 @@ discard block |
||
251 | 251 | { |
252 | 252 | // expected method is executed. |
253 | 253 | // this method is a must for http method values to be found in this property. |
254 | - if($this->checkProperties('expected')){ |
|
254 | + if ($this->checkProperties('expected')) { |
|
255 | 255 | |
256 | 256 | // if the expected values are not found in the inputs array, |
257 | 257 | // the exception will be thrown. |
258 | - foreach ($this->expected as $expected){ |
|
258 | + foreach ($this->expected as $expected) { |
|
259 | 259 | |
260 | 260 | $expectedValues = []; |
261 | 261 | |
262 | 262 | // mandatory expected data for each key can be separated by | operator. |
263 | 263 | // this is evaluated as "or". |
264 | - foreach($expectedData = explode("|",$expected) as $inputs){ |
|
264 | + foreach ($expectedData = explode("|", $expected) as $inputs) { |
|
265 | 265 | |
266 | 266 | // we should do key control for group format. |
267 | 267 | // this process will allow us to perform key control for 2D array correctly. |
268 | 268 | $this->groupsProcess($inputs); |
269 | 269 | |
270 | - if(!isset($this->inputs[$inputs])){ |
|
270 | + if (!isset($this->inputs[$inputs])) { |
|
271 | 271 | $expectedValues[$inputs] = $inputs; |
272 | 272 | } |
273 | 273 | } |
274 | 274 | |
275 | 275 | // if the expectedData and expectedValues |
276 | 276 | // array are numerically equal to the expected key, the exception is thrown. |
277 | - if(count($expectedData)===count($expectedValues)){ |
|
278 | - exception('clientExpected',['key'=>$expected]) |
|
279 | - ->unexpectedValue('You absolutely have to send the value '.implode(" or ",$expectedValues).' for request object'); |
|
277 | + if (count($expectedData)===count($expectedValues)) { |
|
278 | + exception('clientExpected', ['key'=>$expected]) |
|
279 | + ->unexpectedValue('You absolutely have to send the value '.implode(" or ", $expectedValues).' for request object'); |
|
280 | 280 | } |
281 | 281 | } |
282 | 282 | } |
@@ -291,17 +291,17 @@ discard block |
||
291 | 291 | { |
292 | 292 | // check the presence of the generator object |
293 | 293 | // and operate the generator over this object. |
294 | - if($this->checkProperties('auto_generators')){ |
|
294 | + if ($this->checkProperties('auto_generators')) { |
|
295 | 295 | $generators = $this->getAutoGenerators(); |
296 | 296 | } |
297 | 297 | |
298 | 298 | // check the presence of the generator object |
299 | 299 | // and operate the generator over this object. |
300 | - if($this->checkProperties('generators')){ |
|
301 | - $generators = array_merge(isset($generators) ? $generators: [],$this->getGenerators()); |
|
300 | + if ($this->checkProperties('generators')) { |
|
301 | + $generators = array_merge(isset($generators) ? $generators : [], $this->getGenerators()); |
|
302 | 302 | } |
303 | 303 | |
304 | - if(isset($generators)){ |
|
304 | + if (isset($generators)) { |
|
305 | 305 | $this->generatorMethod($generators); |
306 | 306 | } |
307 | 307 | } |
@@ -316,21 +316,21 @@ discard block |
||
316 | 316 | private function generatorMethod($generators) |
317 | 317 | { |
318 | 318 | //generator array object |
319 | - foreach ($generators as $generator){ |
|
319 | + foreach ($generators as $generator) { |
|
320 | 320 | |
321 | 321 | //generator method name |
322 | 322 | $generatorMethodName = $generator.'Generator'; |
323 | 323 | |
324 | 324 | // if the generator method is present, |
325 | 325 | // the fake value is assigned. |
326 | - if(method_exists($this,$generatorMethodName)){ |
|
326 | + if (method_exists($this, $generatorMethodName)) { |
|
327 | 327 | |
328 | 328 | //fake registration |
329 | - if(!isset($this->inputs[$generator])){ |
|
329 | + if (!isset($this->inputs[$generator])) { |
|
330 | 330 | |
331 | 331 | $generatorMethodNameResult = $this->{$generatorMethodName}(); |
332 | 332 | |
333 | - if(!is_null($generatorMethodNameResult)){ |
|
333 | + if (!is_null($generatorMethodNameResult)) { |
|
334 | 334 | $this->{$generator} = $this->{$generatorMethodName}(); |
335 | 335 | $this->inputs[$generator] = $this->{$generatorMethodName}(); |
336 | 336 | $this->generatorList[] = $generator; |
@@ -338,15 +338,15 @@ discard block |
||
338 | 338 | } |
339 | 339 | else { |
340 | 340 | |
341 | - if($this->checkProperties('auto_generators_dont_overwrite') |
|
342 | - && in_array($generator,$this->getAutoGeneratorsDontOverwrite())){ |
|
341 | + if ($this->checkProperties('auto_generators_dont_overwrite') |
|
342 | + && in_array($generator, $this->getAutoGeneratorsDontOverwrite())) { |
|
343 | 343 | $this->{$generator} = $this->{$generatorMethodName}(); |
344 | 344 | $this->inputs[$generator] = $this->{$generatorMethodName}(); |
345 | 345 | $this->generatorList[] = $generator; |
346 | 346 | } |
347 | 347 | |
348 | - if($this->checkProperties('generators_dont_overwrite') |
|
349 | - && in_array($generator,$this->getGeneratorsDontOverwrite())){ |
|
348 | + if ($this->checkProperties('generators_dont_overwrite') |
|
349 | + && in_array($generator, $this->getGeneratorsDontOverwrite())) { |
|
350 | 350 | $this->{$generator} = $this->{$generatorMethodName}(); |
351 | 351 | $this->inputs[$generator] = $this->{$generatorMethodName}(); |
352 | 352 | $this->generatorList[] = $generator; |
@@ -377,28 +377,28 @@ discard block |
||
377 | 377 | * @param null $callback |
378 | 378 | * @return mixed|void |
379 | 379 | */ |
380 | - public function groupsProcess($key=null,$callback=null) |
|
380 | + public function groupsProcess($key = null, $callback = null) |
|
381 | 381 | { |
382 | - if(property_exists($this,'groups') && is_array($this->groups)){ |
|
382 | + if (property_exists($this, 'groups') && is_array($this->groups)) { |
|
383 | 383 | |
384 | 384 | $clientObjects = $this->getClientObjects(); |
385 | 385 | |
386 | - foreach ($this->groups as $group){ |
|
386 | + foreach ($this->groups as $group) { |
|
387 | 387 | |
388 | - if(true === $callback){ |
|
389 | - if(isset($clientObjects['origin'][$key])){ |
|
388 | + if (true===$callback) { |
|
389 | + if (isset($clientObjects['origin'][$key])) { |
|
390 | 390 | return $clientObjects['origin'][$key]; |
391 | 391 | } |
392 | 392 | return []; |
393 | 393 | } |
394 | 394 | |
395 | - if(isset($clientObjects['origin'][$group][$key])){ |
|
395 | + if (isset($clientObjects['origin'][$group][$key])) { |
|
396 | 396 | |
397 | 397 | $this->{$key} = $clientObjects['origin'][$group][$key]; |
398 | 398 | $this->inputs[$key] = $this->{$key}; |
399 | 399 | |
400 | - if(is_callable($callback)){ |
|
401 | - call_user_func_array($callback,[$key]); |
|
400 | + if (is_callable($callback)) { |
|
401 | + call_user_func_array($callback, [$key]); |
|
402 | 402 | } |
403 | 403 | } |
404 | 404 | } |
@@ -461,7 +461,7 @@ discard block |
||
461 | 461 | { |
462 | 462 | // we use the http method to write |
463 | 463 | // the values to the inputs and origin properties. |
464 | - foreach($this->clientData as $key=>$value){ |
|
464 | + foreach ($this->clientData as $key=>$value) { |
|
465 | 465 | |
466 | 466 | //inputs and origin properties |
467 | 467 | $this->inputs[$key] = $value; |
@@ -477,9 +477,9 @@ discard block |
||
477 | 477 | */ |
478 | 478 | private function requestExcept() |
479 | 479 | { |
480 | - if(property_exists($this,'requestExcept') && is_array($this->requestExcept)){ |
|
481 | - foreach ($this->requestExcept as $item){ |
|
482 | - if(isset($this->inputs[$item])){ |
|
480 | + if (property_exists($this, 'requestExcept') && is_array($this->requestExcept)) { |
|
481 | + foreach ($this->requestExcept as $item) { |
|
482 | + if (isset($this->inputs[$item])) { |
|
483 | 483 | unset($this->inputs[$item]); |
484 | 484 | } |
485 | 485 | } |
@@ -492,16 +492,16 @@ discard block |
||
492 | 492 | * @param null|string $clientName |
493 | 493 | * @return void|mixed |
494 | 494 | */ |
495 | - public function setClientName($clientName=null) |
|
495 | + public function setClientName($clientName = null) |
|
496 | 496 | { |
497 | - if(!is_null($clientName) && is_string($clientName)){ |
|
497 | + if (!is_null($clientName) && is_string($clientName)) { |
|
498 | 498 | return $this->clientName = $clientName; |
499 | 499 | } |
500 | 500 | |
501 | - if(!is_null(Utils::trace(0)) && isset(Utils::trace(0)['object'])){ |
|
501 | + if (!is_null(Utils::trace(0)) && isset(Utils::trace(0)['object'])) { |
|
502 | 502 | $backTrace = Utils::trace(0)['object']; |
503 | 503 | |
504 | - if(property_exists($backTrace,'clientName')){ |
|
504 | + if (property_exists($backTrace, 'clientName')) { |
|
505 | 505 | $this->clientName = $backTrace->clientName; |
506 | 506 | } |
507 | 507 | } |
@@ -518,16 +518,16 @@ discard block |
||
518 | 518 | |
519 | 519 | // we update the input values after |
520 | 520 | // we receive and check the saved objects. |
521 | - foreach ($clientObjects as $key=>$value){ |
|
521 | + foreach ($clientObjects as $key=>$value) { |
|
522 | 522 | |
523 | 523 | // we should do key control for group format. |
524 | 524 | // this process will allow us to perform key control for 2D array correctly. |
525 | - $this->groupsProcess($key,function($key){ |
|
525 | + $this->groupsProcess($key, function($key) { |
|
526 | 526 | $this->registerRequestInputs($key); |
527 | 527 | unset($this->inputs[$key]); |
528 | 528 | }); |
529 | 529 | |
530 | - if(!in_array($key,$this->generatorList) && isset($clientObjects['origin'][$key])){ |
|
530 | + if (!in_array($key, $this->generatorList) && isset($clientObjects['origin'][$key])) { |
|
531 | 531 | |
532 | 532 | $this->{$key} = $clientObjects['origin'][$key]; |
533 | 533 | $this->inputs[$key] = $this->{$key}; |
@@ -555,11 +555,11 @@ discard block |
||
555 | 555 | |
556 | 556 | // the request update to be performed using |
557 | 557 | // the method name to be used with the http method. |
558 | - $this->setRequestInputs($requestMethod,$key); |
|
558 | + $this->setRequestInputs($requestMethod, $key); |
|
559 | 559 | |
560 | 560 | // the request update to be performed using |
561 | 561 | // the method name to be used without the http method. |
562 | - $this->setRequestInputs($key,$key); |
|
562 | + $this->setRequestInputs($key, $key); |
|
563 | 563 | } |
564 | 564 | |
565 | 565 | /** |
@@ -570,28 +570,28 @@ discard block |
||
570 | 570 | * |
571 | 571 | * @throws ReflectionExceptionAlias |
572 | 572 | */ |
573 | - private function setRequestInputs($method,$key) |
|
573 | + private function setRequestInputs($method, $key) |
|
574 | 574 | { |
575 | - if(!in_array($key,$this->generatorList) && method_exists($this,$method) && $this->reflection->reflectionMethodParams($method)->isProtected){ |
|
575 | + if (!in_array($key, $this->generatorList) && method_exists($this, $method) && $this->reflection->reflectionMethodParams($method)->isProtected) { |
|
576 | 576 | |
577 | 577 | //check annotations for method |
578 | - $annotation = app()->resolve(ClientAnnotationManager::class,['request'=>$this]); |
|
579 | - $annotation->annotation($method,$key); |
|
578 | + $annotation = app()->resolve(ClientAnnotationManager::class, ['request'=>$this]); |
|
579 | + $annotation->annotation($method, $key); |
|
580 | 580 | |
581 | - if(isset($this->inputs[$key]) && is_array($this->inputs[$key])){ |
|
581 | + if (isset($this->inputs[$key]) && is_array($this->inputs[$key])) { |
|
582 | 582 | |
583 | 583 | $inputKeys = $this->inputs[$key]; |
584 | 584 | |
585 | 585 | $this->inputs[$key] = []; |
586 | - foreach ($inputKeys as $input){ |
|
586 | + foreach ($inputKeys as $input) { |
|
587 | 587 | |
588 | 588 | $this->{$key} = $input; |
589 | 589 | $keyMethod = $this->{$method}(); |
590 | 590 | $this->inputs[$key][] = $keyMethod; |
591 | 591 | } |
592 | 592 | } |
593 | - else{ |
|
594 | - if(isset($this->inputs[$key])){ |
|
593 | + else { |
|
594 | + if (isset($this->inputs[$key])) { |
|
595 | 595 | $keyMethod = $this->{$method}(); |
596 | 596 | $this->inputs[$key] = $keyMethod; |
597 | 597 | } |
@@ -610,8 +610,8 @@ discard block |
||
610 | 610 | // the auto object validate property is the property |
611 | 611 | // where all of your request values are automatically validated. |
612 | 612 | /** @noinspection PhpParamsInspection */ |
613 | - if(property_exists($this,'autoObjectValidate') |
|
614 | - && is_array($this->autoObjectValidate) && count($this->autoObjectValidate)){ |
|
613 | + if (property_exists($this, 'autoObjectValidate') |
|
614 | + && is_array($this->autoObjectValidate) && count($this->autoObjectValidate)) { |
|
615 | 615 | $this->autoValidate('autoObjectValidate'); |
616 | 616 | } |
617 | 617 | } |
@@ -84,8 +84,9 @@ discard block |
||
84 | 84 | |
85 | 85 | /* Read the data 1 KB at a time |
86 | 86 | and write to the file */ |
87 | - while ($chunk = fread($putdata, 1024)) |
|
88 | - $raw_data .= $chunk; |
|
87 | + while ($chunk = fread($putdata, 1024)) { |
|
88 | + $raw_data .= $chunk; |
|
89 | + } |
|
89 | 90 | |
90 | 91 | /* Close the streams */ |
91 | 92 | fclose($putdata); |
@@ -105,7 +106,9 @@ discard block |
||
105 | 106 | |
106 | 107 | foreach ($parts as $part) { |
107 | 108 | // If this is the last part, break |
108 | - if ($part == "--\r\n") break; |
|
109 | + if ($part == "--\r\n") { |
|
110 | + break; |
|
111 | + } |
|
109 | 112 | |
110 | 113 | // Separate content from headers |
111 | 114 | $part = ltrim($part, "\r\n"); |
@@ -40,19 +40,19 @@ discard block |
||
40 | 40 | { |
41 | 41 | $inputs = $this->app->get($this->method); |
42 | 42 | |
43 | - $content = json_decode($this->app['request']->getContent(),1); |
|
43 | + $content = json_decode($this->app['request']->getContent(), 1); |
|
44 | 44 | |
45 | - if(is_array($inputs) && count($inputs)){ |
|
45 | + if (is_array($inputs) && count($inputs)) { |
|
46 | 46 | |
47 | - if(isset($inputs[$this->client->getClientName()])){ |
|
47 | + if (isset($inputs[$this->client->getClientName()])) { |
|
48 | 48 | return $inputs[$this->client->getClientName()]; |
49 | 49 | } |
50 | 50 | return $inputs; |
51 | 51 | } |
52 | 52 | |
53 | - if(is_array($content)){ |
|
53 | + if (is_array($content)) { |
|
54 | 54 | |
55 | - if(isset($content[$this->client->getClientName()])){ |
|
55 | + if (isset($content[$this->client->getClientName()])) { |
|
56 | 56 | return $content[$this->client->getClientName()]; |
57 | 57 | } |
58 | 58 | return $content; |
@@ -60,8 +60,8 @@ discard block |
||
60 | 60 | |
61 | 61 | $this->inputVars(); |
62 | 62 | |
63 | - if(is_array($GLOBALS[ '_PUT' ])){ |
|
64 | - return $GLOBALS[ '_PUT' ]; |
|
63 | + if (is_array($GLOBALS['_PUT'])) { |
|
64 | + return $GLOBALS['_PUT']; |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | return []; |
@@ -91,9 +91,9 @@ discard block |
||
91 | 91 | // Fetch content and determine boundary |
92 | 92 | $boundary = substr($raw_data, 0, strpos($raw_data, "\r\n")); |
93 | 93 | |
94 | - if(empty($boundary)){ |
|
95 | - parse_str($raw_data,$data); |
|
96 | - $GLOBALS[ '_PUT' ] = $data; |
|
94 | + if (empty($boundary)) { |
|
95 | + parse_str($raw_data, $data); |
|
96 | + $GLOBALS['_PUT'] = $data; |
|
97 | 97 | return; |
98 | 98 | } |
99 | 99 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | |
104 | 104 | foreach ($parts as $part) { |
105 | 105 | // If this is the last part, break |
106 | - if ($part == "--\r\n") break; |
|
106 | + if ($part=="--\r\n") break; |
|
107 | 107 | |
108 | 108 | // Separate content from headers |
109 | 109 | $part = ltrim($part, "\r\n"); |
@@ -130,10 +130,10 @@ discard block |
||
130 | 130 | list(, $type, $name) = $matches; |
131 | 131 | |
132 | 132 | //Parse File |
133 | - if( isset($matches[4]) ) |
|
133 | + if (isset($matches[4])) |
|
134 | 134 | { |
135 | 135 | //if labeled the same as previous, skip |
136 | - if( isset( $_FILES[ $matches[ 2 ] ] ) ) |
|
136 | + if (isset($_FILES[$matches[2]])) |
|
137 | 137 | { |
138 | 138 | continue; |
139 | 139 | } |
@@ -142,16 +142,16 @@ discard block |
||
142 | 142 | $filename = $matches[4]; |
143 | 143 | |
144 | 144 | //get tmp name |
145 | - $filename_parts = pathinfo( $filename ); |
|
146 | - $tmp_name = tempnam( ini_get('upload_tmp_dir'), $filename_parts['filename']); |
|
145 | + $filename_parts = pathinfo($filename); |
|
146 | + $tmp_name = tempnam(ini_get('upload_tmp_dir'), $filename_parts['filename']); |
|
147 | 147 | |
148 | 148 | //populate $_FILES with information, size may be off in multibyte situation |
149 | 149 | /** @noinspection PhpUndefinedVariableInspection */ |
150 | - $_FILES[ $matches[ 2 ] ] = array( |
|
150 | + $_FILES[$matches[2]] = array( |
|
151 | 151 | 'error'=>0, |
152 | 152 | 'name'=>$filename, |
153 | 153 | 'tmp_name'=>$tmp_name, |
154 | - 'size'=>strlen( $body ), |
|
154 | + 'size'=>strlen($body), |
|
155 | 155 | 'type'=>$value |
156 | 156 | ); |
157 | 157 | |
@@ -161,12 +161,12 @@ discard block |
||
161 | 161 | //Parse Field |
162 | 162 | else |
163 | 163 | { |
164 | - $data[$name] = substr($body, 0, strlen($body) - 2); |
|
164 | + $data[$name] = substr($body, 0, strlen($body)-2); |
|
165 | 165 | } |
166 | 166 | } |
167 | 167 | |
168 | 168 | } |
169 | - $GLOBALS[ '_PUT' ] = $data; |
|
169 | + $GLOBALS['_PUT'] = $data; |
|
170 | 170 | return; |
171 | 171 | } |
172 | 172 |
@@ -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 |
@@ -54,25 +54,25 @@ discard block |
||
54 | 54 | //set project directory |
55 | 55 | $this->file->makeDirectory($this); |
56 | 56 | |
57 | - if(!file_exists($manager = $this->directory['clientNameDir'].'/'.$name.'Manager.php')){ |
|
57 | + if (!file_exists($manager = $this->directory['clientNameDir'].'/'.$name.'Manager.php')) { |
|
58 | 58 | $this->touch['client/manager'] = $manager; |
59 | 59 | $this->touch['client/managertrait'] = $this->directory['clientNameDir'].'/'.$name.'Trait.php'; |
60 | 60 | $this->argument['managerTraitNamespace'] = Utils::getNamespace($this->directory['clientNameDir'].'/'.$name.'Trait.php'); |
61 | 61 | } |
62 | 62 | |
63 | - if(!file_exists($this->directory['clientNameCreate'].'/Client.php')){ |
|
63 | + if (!file_exists($this->directory['clientNameCreate'].'/Client.php')) { |
|
64 | 64 | $this->touch['client/client'] = $this->directory['clientNameCreate'].'/Client.php'; |
65 | 65 | $this->touch['client/clientGenerator'] = $this->directory['clientNameCreate'].'/ClientGenerator.php'; |
66 | 66 | } |
67 | 67 | |
68 | 68 | $clientSourceNamespace = Utils::getNamespace($this->directory['clientSource'].'/'.$client.'.php'); |
69 | 69 | |
70 | - if(!file_exists($clientSourceName = $this->directory['clientSource'].'/'.$client.'.php')){ |
|
70 | + if (!file_exists($clientSourceName = $this->directory['clientSource'].'/'.$client.'.php')) { |
|
71 | 71 | $this->touch['client/source'] = $clientSourceName.''; |
72 | 72 | //$this->touch['client/sourcegenerator'] = $this->directory['clientSource'].'/'.$client.'Generator.php'; |
73 | 73 | } |
74 | 74 | |
75 | - if(!file_exists($this->directory['clientNameCreate'].'/ClientProvider.php')){ |
|
75 | + if (!file_exists($this->directory['clientNameCreate'].'/ClientProvider.php')) { |
|
76 | 76 | $this->touch['client/clientProvider'] = $this->directory['clientNameCreate'].'/ClientProvider.php'; |
77 | 77 | } |
78 | 78 | |
@@ -86,13 +86,13 @@ discard block |
||
86 | 86 | |
87 | 87 | $nameGeneratorNamespace = Utils::getNamespace($managerPath = $this->directory['clientNameDir'].''.DIRECTORY_SEPARATOR.''.$nameManager.'.php'); |
88 | 88 | |
89 | - $generator = new Generator(path()->version(),'ClientManager'); |
|
89 | + $generator = new Generator(path()->version(), 'ClientManager'); |
|
90 | 90 | |
91 | 91 | $clientManager = app()->namespace()->version().'\\ClientManager'; |
92 | 92 | |
93 | 93 | $clientManagerResolve = new $clientManager; |
94 | 94 | |
95 | - if(!method_exists($clientManagerResolve,strtolower($name))){ |
|
95 | + if (!method_exists($clientManagerResolve, strtolower($name))) { |
|
96 | 96 | |
97 | 97 | $generator->createMethod([ |
98 | 98 | strtolower($name) |
@@ -123,11 +123,11 @@ discard block |
||
123 | 123 | |
124 | 124 | } |
125 | 125 | |
126 | - $nameGenerator = new Generator($this->directory['clientNameDir'],$name.'Manager'); |
|
126 | + $nameGenerator = new Generator($this->directory['clientNameDir'], $name.'Manager'); |
|
127 | 127 | |
128 | 128 | $nameGeneratorNamespaceResolve = new $nameGeneratorNamespace; |
129 | 129 | |
130 | - if(!method_exists($nameGeneratorNamespaceResolve,strtolower($client))){ |
|
130 | + if (!method_exists($nameGeneratorNamespaceResolve, strtolower($client))) { |
|
131 | 131 | |
132 | 132 | $nameGenerator->createMethod([ |
133 | 133 | strtolower($client) |
@@ -26,11 +26,11 @@ discard block |
||
26 | 26 | * |
27 | 27 | * @throws FileNotFoundException |
28 | 28 | */ |
29 | - private function applyProvider($key,$provider,$method='register') |
|
29 | + private function applyProvider($key, $provider, $method = 'register') |
|
30 | 30 | { |
31 | 31 | // If the provider classes are a real object |
32 | 32 | // we will run them. |
33 | - if(Utils::isNamespaceExists($provider)){ |
|
33 | + if (Utils::isNamespaceExists($provider)) { |
|
34 | 34 | |
35 | 35 | // after determining whether the register or boot methods |
36 | 36 | // we are running the provider. |
@@ -38,13 +38,13 @@ discard block |
||
38 | 38 | $providerInstance = $this->app->resolve($provider); |
39 | 39 | |
40 | 40 | //we need to do method check for provider. |
41 | - if(method_exists($providerInstance,$method)){ |
|
41 | + if (method_exists($providerInstance, $method)) { |
|
42 | 42 | $providerInstance->{$method}(); |
43 | 43 | |
44 | - if($method=="register"){ |
|
44 | + if ($method=="register") { |
|
45 | 45 | /** @scrutinizer ignore-call */ |
46 | - $this->app->register('loadedProviders',$key,$provider); |
|
47 | - $this->deferrableProvider($providerInstance,$provider); |
|
46 | + $this->app->register('loadedProviders', $key, $provider); |
|
47 | + $this->deferrableProvider($providerInstance, $provider); |
|
48 | 48 | } |
49 | 49 | } |
50 | 50 | } |
@@ -58,48 +58,48 @@ discard block |
||
58 | 58 | * |
59 | 59 | * @throws FileNotFoundException |
60 | 60 | */ |
61 | - private function deferrableProvider($providerInstance,$provider) |
|
61 | + private function deferrableProvider($providerInstance, $provider) |
|
62 | 62 | { |
63 | - if($providerInstance instanceof DeferrableProvider && file_exists(serviceJson())){ |
|
63 | + if ($providerInstance instanceof DeferrableProvider && file_exists(serviceJson())) { |
|
64 | 64 | $deferrableProvides = $providerInstance->provides(); |
65 | 65 | |
66 | 66 | foreach ($deferrableProvides as $deferrableProvide) { |
67 | - if($this->app->has($deferrableProvide)){ |
|
67 | + if ($this->app->has($deferrableProvide)) { |
|
68 | 68 | JsonHandler::$file = serviceJson(); |
69 | 69 | $serviceJson = JsonHandler::get(); |
70 | 70 | |
71 | - if(!isset($serviceJson['providers'][$provider])){ |
|
72 | - JsonHandler::set('providers-deferrable-classes',[ |
|
71 | + if (!isset($serviceJson['providers'][$provider])) { |
|
72 | + JsonHandler::set('providers-deferrable-classes', [ |
|
73 | 73 | $provider => true |
74 | 74 | ]); |
75 | 75 | |
76 | 76 | $container = $this->app->get($deferrableProvide); |
77 | 77 | |
78 | - if(!is_array($container)){ |
|
78 | + if (!is_array($container)) { |
|
79 | 79 | |
80 | - if($container instanceof \Closure){ |
|
81 | - JsonHandler::set('container',[ |
|
80 | + if ($container instanceof \Closure) { |
|
81 | + JsonHandler::set('container', [ |
|
82 | 82 | $deferrableProvide => SuperClosure::set($container) |
83 | 83 | ]); |
84 | 84 | |
85 | - JsonHandler::set('container-format',[ |
|
85 | + JsonHandler::set('container-format', [ |
|
86 | 86 | $deferrableProvide => 'closure' |
87 | 87 | ]); |
88 | 88 | } |
89 | - else{ |
|
90 | - JsonHandler::set('container',[ |
|
89 | + else { |
|
90 | + JsonHandler::set('container', [ |
|
91 | 91 | $deferrableProvide => $container |
92 | 92 | ]); |
93 | 93 | |
94 | - JsonHandler::set('container-format',[ |
|
94 | + JsonHandler::set('container-format', [ |
|
95 | 95 | $deferrableProvide => 'string' |
96 | 96 | ]); |
97 | 97 | } |
98 | 98 | |
99 | 99 | } |
100 | - else{ |
|
100 | + else { |
|
101 | 101 | foreach ($container as $containerKey=>$containerItem) { |
102 | - JsonHandler::set('container',[ |
|
102 | + JsonHandler::set('container', [ |
|
103 | 103 | $deferrableProvide.'.'.$containerKey => SuperClosure::set($containerItem) |
104 | 104 | ]); |
105 | 105 | } |
@@ -118,12 +118,12 @@ discard block |
||
118 | 118 | */ |
119 | 119 | private function assignerLoadedProvidersInitialCoreValue() |
120 | 120 | { |
121 | - if(!isset($this->app['loadedProviders'])){ |
|
121 | + if (!isset($this->app['loadedProviders'])) { |
|
122 | 122 | |
123 | 123 | // for loaded providers, |
124 | 124 | // we register an empty array for the container object. |
125 | 125 | /** @scrutinizer ignore-call */ |
126 | - $this->app->register('loadedProviders',[]); |
|
126 | + $this->app->register('loadedProviders', []); |
|
127 | 127 | } |
128 | 128 | } |
129 | 129 | |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | /** @scrutinizer ignore-call */ |
139 | 139 | $providers = $this->app->serviceProviders(); |
140 | 140 | |
141 | - if(count($providers)){ |
|
141 | + if (count($providers)) { |
|
142 | 142 | $this->providers = $providers; |
143 | 143 | } |
144 | 144 | |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | */ |
153 | 153 | public function handle() |
154 | 154 | { |
155 | - define ('serviceprovider',true); |
|
155 | + define('serviceprovider', true); |
|
156 | 156 | |
157 | 157 | //check providers and resolve |
158 | 158 | $this->resolveProviders($this->getServiceProviders()); |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | * |
166 | 166 | * @throws FileNotFoundException |
167 | 167 | */ |
168 | - public function resolveProviders($providers=array()) |
|
168 | + public function resolveProviders($providers = array()) |
|
169 | 169 | { |
170 | 170 | // for loaded providers, |
171 | 171 | // we register an empty array for the container object. |
@@ -174,36 +174,36 @@ discard block |
||
174 | 174 | $serviceJson = []; |
175 | 175 | |
176 | 176 | //first we are running register methods of provider classes. |
177 | - foreach($providers as $key=>$provider){ |
|
177 | + foreach ($providers as $key=>$provider) { |
|
178 | 178 | |
179 | - if(file_exists(serviceJson())){ |
|
179 | + if (file_exists(serviceJson())) { |
|
180 | 180 | JsonHandler::$file = serviceJson(); |
181 | 181 | $serviceJson = JsonHandler::get(); |
182 | 182 | } |
183 | 183 | |
184 | 184 | // providers can only be installed once. |
185 | 185 | // apply providers and register for kernel |
186 | - if(!isset($this->app['loadedProviders'][$key])){ |
|
186 | + if (!isset($this->app['loadedProviders'][$key])) { |
|
187 | 187 | |
188 | - if(is_array($provider) && isset($provider['status']) && $provider['status']){ |
|
189 | - if(!isset($serviceJson['providers-deferrable-classes'][$provider['class']])){ |
|
190 | - $this->applyProvider($key,$provider['class']); |
|
188 | + if (is_array($provider) && isset($provider['status']) && $provider['status']) { |
|
189 | + if (!isset($serviceJson['providers-deferrable-classes'][$provider['class']])) { |
|
190 | + $this->applyProvider($key, $provider['class']); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | } |
194 | - else{ |
|
195 | - $this->applyProvider($key,$provider); |
|
194 | + else { |
|
195 | + $this->applyProvider($key, $provider); |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | } |
199 | 199 | } |
200 | 200 | |
201 | 201 | //then we are running boot methods of provider classes. |
202 | - foreach($providers as $key=>$provider){ |
|
202 | + foreach ($providers as $key=>$provider) { |
|
203 | 203 | |
204 | 204 | //if the providers register is already booted. |
205 | - if(isset($this->app['loadedProviders'][$key])){ |
|
206 | - $this->applyProvider($key,$provider,'boot'); |
|
205 | + if (isset($this->app['loadedProviders'][$key])) { |
|
206 | + $this->applyProvider($key, $provider, 'boot'); |
|
207 | 207 | } |
208 | 208 | } |
209 | 209 | } |
@@ -85,8 +85,7 @@ discard block |
||
85 | 85 | JsonHandler::set('container-format',[ |
86 | 86 | $deferrableProvide => 'closure' |
87 | 87 | ]); |
88 | - } |
|
89 | - else{ |
|
88 | + } else{ |
|
90 | 89 | JsonHandler::set('container',[ |
91 | 90 | $deferrableProvide => $container |
92 | 91 | ]); |
@@ -96,8 +95,7 @@ discard block |
||
96 | 95 | ]); |
97 | 96 | } |
98 | 97 | |
99 | - } |
|
100 | - else{ |
|
98 | + } else{ |
|
101 | 99 | foreach ($container as $containerKey=>$containerItem) { |
102 | 100 | JsonHandler::set('container',[ |
103 | 101 | $deferrableProvide.'.'.$containerKey => SuperClosure::set($containerItem) |
@@ -190,8 +188,7 @@ discard block |
||
190 | 188 | $this->applyProvider($key,$provider['class']); |
191 | 189 | } |
192 | 190 | |
193 | - } |
|
194 | - else{ |
|
191 | + } else{ |
|
195 | 192 | $this->applyProvider($key,$provider); |
196 | 193 | } |
197 | 194 |
@@ -18,12 +18,12 @@ |
||
18 | 18 | */ |
19 | 19 | public static function get($key) |
20 | 20 | { |
21 | - if(file_exists(serviceJson())){ |
|
21 | + if (file_exists(serviceJson())) { |
|
22 | 22 | JsonHandler::$file = serviceJson(); |
23 | 23 | $serviceJson = JsonHandler::get(); |
24 | 24 | |
25 | - if(isset($serviceJson['container'][$key])){ |
|
26 | - if($serviceJson['container-format'][$key]=='string'){ |
|
25 | + if (isset($serviceJson['container'][$key])) { |
|
26 | + if ($serviceJson['container-format'][$key]=='string') { |
|
27 | 27 | return $serviceJson['container'][$key]; |
28 | 28 | } |
29 | 29 | return SuperClosure::get($serviceJson['container'][$key]); |
@@ -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 | |
@@ -78,12 +78,12 @@ discard block |
||
78 | 78 | * |
79 | 79 | * @param bool $value |
80 | 80 | */ |
81 | - private function setAuthenticateSuccess($value=true) |
|
81 | + private function setAuthenticateSuccess($value = true) |
|
82 | 82 | { |
83 | - if(app()->has('authenticateSuccess')){ |
|
83 | + if (app()->has('authenticateSuccess')) { |
|
84 | 84 | app()->terminate('authenticateSuccess'); |
85 | 85 | } |
86 | 86 | |
87 | - app()->register('authenticateSuccess',$value); |
|
87 | + app()->register('authenticateSuccess', $value); |
|
88 | 88 | } |
89 | 89 | } |
90 | 90 | \ No newline at end of file |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | /** |
15 | 15 | * @var $type |
16 | 16 | */ |
17 | - public $type='project'; |
|
17 | + public $type = 'project'; |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * @var array |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | /** |
32 | 32 | * @var $commandRule |
33 | 33 | */ |
34 | - public $commandRule=[]; |
|
34 | + public $commandRule = []; |
|
35 | 35 | |
36 | 36 | /** |
37 | 37 | * @method create |
@@ -46,17 +46,17 @@ discard block |
||
46 | 46 | $this->directory['projectDir'] = $this->projectPath(); |
47 | 47 | $this->argument['exceptionNamespace'] = app()->namespace()->exception(); |
48 | 48 | $this->argument['resourcePath'] = app()->path()->appResourche(); |
49 | - $this->argument['testNamespace'] = app()->namespace()->tests(); |
|
49 | + $this->argument['testNamespace'] = app()->namespace()->tests(); |
|
50 | 50 | |
51 | - $recursiveDefaultDirectory = explode("\\",$this->argument['project']); |
|
51 | + $recursiveDefaultDirectory = explode("\\", $this->argument['project']); |
|
52 | 52 | $this->argument['applicationName'] = pos($recursiveDefaultDirectory); |
53 | 53 | $recursiveDefaultDirectory[] = 'V1'; |
54 | 54 | $recursiveDefaultDirectoryList = []; |
55 | 55 | |
56 | - foreach (array_slice($recursiveDefaultDirectory,1) as $defaultDirectory){ |
|
56 | + foreach (array_slice($recursiveDefaultDirectory, 1) as $defaultDirectory) { |
|
57 | 57 | |
58 | - $recursiveDefaultDirectoryList[]=$defaultDirectory; |
|
59 | - $this->directory[$defaultDirectory.'Path'] = $this->projectPath().''.implode("/",$recursiveDefaultDirectoryList); |
|
58 | + $recursiveDefaultDirectoryList[] = $defaultDirectory; |
|
59 | + $this->directory[$defaultDirectory.'Path'] = $this->projectPath().''.implode("/", $recursiveDefaultDirectoryList); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | //$this->directory['optionalDir'] = $this->optional(); |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | //$this->directory['sourceDir'] = $this->sourceDir(); |
83 | 83 | //$this->directory['sourceSupportDir'] = $this->sourceSupportDir(); |
84 | 84 | //$this->directory['sourceSupportTraitDir'] = $this->sourceSupportDir().'/Traits'; |
85 | - $this->directory['exceptionDir'] = app()->path()->exception(); |
|
85 | + $this->directory['exceptionDir'] = app()->path()->exception(); |
|
86 | 86 | |
87 | 87 | //set project directory |
88 | 88 | $this->file->makeDirectory($this); |
@@ -97,11 +97,11 @@ discard block |
||
97 | 97 | $this->touch['kernel/app'] = $this->provider().'/AppServiceProvider.php'; |
98 | 98 | $this->touch['kernel/worker'] = $this->provider().'/WorkerServiceProvider.php'; |
99 | 99 | $this->touch['kernel/exception'] = $this->provider().'/ExceptionServiceProvider.php'; |
100 | - $this->touch['kernel/cache'] = $this->provider().'/CacheServiceProvider.php'; |
|
100 | + $this->touch['kernel/cache'] = $this->provider().'/CacheServiceProvider.php'; |
|
101 | 101 | $this->touch['kernel/authenticate'] = $this->provider().'/AuthenticateServiceProvider.php'; |
102 | 102 | $this->touch['kernel/role'] = $this->provider().'/RoleServiceProvider.php'; |
103 | 103 | $this->touch['kernel/track'] = $this->provider().'/TrackServiceProvider.php'; |
104 | - $this->touch['test/testcase'] = $this->test().'/TestCase.php'; |
|
104 | + $this->touch['test/testcase'] = $this->test().'/TestCase.php'; |
|
105 | 105 | $this->touch['kernel/consoleevent'] = $this->provider().'/ConsoleEventServiceProvider.php'; |
106 | 106 | $this->touch['middleware/authenticate'] = $this->middleware().'/Authenticate.php'; |
107 | 107 | $this->touch['middleware/ratelimit'] = $this->middleware().'/RateLimit.php'; |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | $this->touch['app/gitignore'] = $this->projectPath().'/.gitignore'; |
143 | 143 | $this->touch['app/composer'] = $this->projectPath().'/composer.json'; |
144 | 144 | $this->touch['test/index'] = $this->storage().'/index.html'; |
145 | - $this->touch['exception/authenticate'] = $this->directory['exceptionDir'] .'/AuthenticateException.php'; |
|
145 | + $this->touch['exception/authenticate'] = $this->directory['exceptionDir'].'/AuthenticateException.php'; |
|
146 | 146 | |
147 | 147 | //set project touch |
148 | 148 | $this->file->touch($this); |
@@ -76,8 +76,7 @@ discard block |
||
76 | 76 | //catch exception |
77 | 77 | exception($this->exceptionParams[$key]['name'],$keyParams) |
78 | 78 | ->unexpectedValue($this->exceptionParams[$key]['name'].' input value is not valid as format ('.$data.')'); |
79 | - } |
|
80 | - else{ |
|
79 | + } else{ |
|
81 | 80 | //catch exception |
82 | 81 | exception()->unexpectedValue($key.' input value is not valid as format ('.$data.')'); |
83 | 82 | } |
@@ -140,16 +139,14 @@ discard block |
||
140 | 139 | } |
141 | 140 | } |
142 | 141 | |
143 | - } |
|
144 | - else{ |
|
142 | + } else{ |
|
145 | 143 | if(!preg_match('@'.$regex[1].'@is',$this->inputsValue)){ |
146 | 144 | $this->catchException($key,$regex[1]); |
147 | 145 | } |
148 | 146 | } |
149 | 147 | |
150 | 148 | } |
151 | - } |
|
152 | - else{ |
|
149 | + } else{ |
|
153 | 150 | |
154 | 151 | // we control the regex rule that evaluates when only string arrives. |
155 | 152 | if(!preg_match('@'.$regex[1].'@is',$this->inputs[$key])){ |
@@ -198,8 +195,7 @@ discard block |
||
198 | 195 | } |
199 | 196 | } |
200 | 197 | } |
201 | - } |
|
202 | - else{ |
|
198 | + } else{ |
|
203 | 199 | |
204 | 200 | foreach ($this->inputs[$key] as $ikey=>$input){ |
205 | 201 | |
@@ -212,8 +208,7 @@ discard block |
||
212 | 208 | } |
213 | 209 | } |
214 | 210 | } |
215 | - } |
|
216 | - else{ |
|
211 | + } else{ |
|
217 | 212 | |
218 | 213 | foreach ($input as $ikey=>$item){ |
219 | 214 | foreach($rules as $rule){ |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * @param ApplicationContracts $app |
26 | 26 | * @param $request |
27 | 27 | */ |
28 | - public function __construct(ApplicationContracts $app,$request) |
|
28 | + public function __construct(ApplicationContracts $app, $request) |
|
29 | 29 | { |
30 | 30 | parent::__construct($app); |
31 | 31 | |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * @param $key |
42 | 42 | * @return mixed|void |
43 | 43 | */ |
44 | - public function annotation($method,$key) |
|
44 | + public function annotation($method, $key) |
|
45 | 45 | { |
46 | 46 | //set annotation value with getting reflection |
47 | 47 | $reflection = $this->getReflection('reflection')->reflectionMethodParams($method); |
@@ -66,18 +66,18 @@ discard block |
||
66 | 66 | * @param string $key |
67 | 67 | * @param null|string $data |
68 | 68 | */ |
69 | - private function catchException($key,$data) |
|
69 | + private function catchException($key, $data) |
|
70 | 70 | { |
71 | - if(isset($this->exceptionParams[$key])){ |
|
71 | + if (isset($this->exceptionParams[$key])) { |
|
72 | 72 | |
73 | 73 | //get key params for exception params |
74 | 74 | $keyParams = ($this->exceptionParams[$key]['params']) ?? []; |
75 | 75 | |
76 | 76 | //catch exception |
77 | - exception($this->exceptionParams[$key]['name'],$keyParams) |
|
77 | + exception($this->exceptionParams[$key]['name'], $keyParams) |
|
78 | 78 | ->unexpectedValue($this->exceptionParams[$key]['name'].' input value is not valid as format ('.$data.')'); |
79 | 79 | } |
80 | - else{ |
|
80 | + else { |
|
81 | 81 | //catch exception |
82 | 82 | exception()->unexpectedValue($key.' input value is not valid as format ('.$data.')'); |
83 | 83 | } |
@@ -90,23 +90,23 @@ discard block |
||
90 | 90 | */ |
91 | 91 | private function getException($key) |
92 | 92 | { |
93 | - if(preg_match('@exception\((.*?)\)\r\n@is',$this->annotation,$exception)){ |
|
93 | + if (preg_match('@exception\((.*?)\)\r\n@is', $this->annotation, $exception)) { |
|
94 | 94 | |
95 | - $exceptionSpaceExplode = explode(" ",$exception[1]); |
|
95 | + $exceptionSpaceExplode = explode(" ", $exception[1]); |
|
96 | 96 | |
97 | - foreach ($exceptionSpaceExplode as $exceptions){ |
|
98 | - $exceptionsDotExplode = explode(":",$exceptions); |
|
97 | + foreach ($exceptionSpaceExplode as $exceptions) { |
|
98 | + $exceptionsDotExplode = explode(":", $exceptions); |
|
99 | 99 | $this->exceptionParams[$key][$exceptionsDotExplode[0]] = $exceptionsDotExplode[1]; |
100 | 100 | } |
101 | 101 | |
102 | - if(isset($this->exceptionParams[$key]['params'])){ |
|
102 | + if (isset($this->exceptionParams[$key]['params'])) { |
|
103 | 103 | |
104 | - $paramsCommaExplode = explode(",",$this->exceptionParams[$key]['params']); |
|
104 | + $paramsCommaExplode = explode(",", $this->exceptionParams[$key]['params']); |
|
105 | 105 | unset($this->exceptionParams[$key]['params']); |
106 | 106 | |
107 | - foreach ($paramsCommaExplode as $params){ |
|
108 | - $paramsEqualExplode = explode("=",$params); |
|
109 | - if(isset($paramsEqualExplode[0]) && isset($paramsEqualExplode[1])){ |
|
107 | + foreach ($paramsCommaExplode as $params) { |
|
108 | + $paramsEqualExplode = explode("=", $params); |
|
109 | + if (isset($paramsEqualExplode[0]) && isset($paramsEqualExplode[1])) { |
|
110 | 110 | $this->exceptionParams[$key]['params'][$paramsEqualExplode[0]] = $paramsEqualExplode[1]; |
111 | 111 | } |
112 | 112 | } |
@@ -123,37 +123,37 @@ discard block |
||
123 | 123 | { |
124 | 124 | // with the method based regex annotation, |
125 | 125 | // we check the rule definition for our requests. |
126 | - if(preg_match('@regex\((.*?)\)\r\n@is',$this->annotation,$regex)){ |
|
127 | - if(isset($this->inputs[$key])){ |
|
126 | + if (preg_match('@regex\((.*?)\)\r\n@is', $this->annotation, $regex)) { |
|
127 | + if (isset($this->inputs[$key])) { |
|
128 | 128 | |
129 | 129 | // for the definition of rules, |
130 | 130 | // our inputs can be array and in this case we offer array option for user comfort. |
131 | - if(is_array($this->inputs[$key])){ |
|
131 | + if (is_array($this->inputs[$key])) { |
|
132 | 132 | |
133 | - foreach ($this->inputs[$key] as $this->inputsKey => $this->inputsValue){ |
|
133 | + foreach ($this->inputs[$key] as $this->inputsKey => $this->inputsValue) { |
|
134 | 134 | |
135 | - if(is_array($this->inputsValue)){ |
|
135 | + if (is_array($this->inputsValue)) { |
|
136 | 136 | |
137 | - foreach ($this->inputsValue as $inputsValueKey => $inputsValueItem){ |
|
138 | - if(!preg_match('@'.$regex[1].'@is',$inputsValueItem)){ |
|
139 | - $this->catchException($key,$regex[1]); |
|
137 | + foreach ($this->inputsValue as $inputsValueKey => $inputsValueItem) { |
|
138 | + if (!preg_match('@'.$regex[1].'@is', $inputsValueItem)) { |
|
139 | + $this->catchException($key, $regex[1]); |
|
140 | 140 | } |
141 | 141 | } |
142 | 142 | |
143 | 143 | } |
144 | - else{ |
|
145 | - if(!preg_match('@'.$regex[1].'@is',$this->inputsValue)){ |
|
146 | - $this->catchException($key,$regex[1]); |
|
144 | + else { |
|
145 | + if (!preg_match('@'.$regex[1].'@is', $this->inputsValue)) { |
|
146 | + $this->catchException($key, $regex[1]); |
|
147 | 147 | } |
148 | 148 | } |
149 | 149 | |
150 | 150 | } |
151 | 151 | } |
152 | - else{ |
|
152 | + else { |
|
153 | 153 | |
154 | 154 | // we control the regex rule that evaluates when only string arrives. |
155 | - if(!preg_match('@'.$regex[1].'@is',$this->inputs[$key])){ |
|
156 | - $this->catchException($key,$regex[1]); |
|
155 | + if (!preg_match('@'.$regex[1].'@is', $this->inputs[$key])) { |
|
156 | + $this->catchException($key, $regex[1]); |
|
157 | 157 | } |
158 | 158 | } |
159 | 159 | } |
@@ -168,9 +168,9 @@ discard block |
||
168 | 168 | */ |
169 | 169 | private function getRemove($key) |
170 | 170 | { |
171 | - if(preg_match('@remove\((.*?)\)\r\n@is',$this->annotation,$remove)){ |
|
172 | - if(isset($this->inputs[$key])){ |
|
173 | - if(preg_match('@'.$remove[1].'@is',$this->inputs[$key])){ |
|
171 | + if (preg_match('@remove\((.*?)\)\r\n@is', $this->annotation, $remove)) { |
|
172 | + if (isset($this->inputs[$key])) { |
|
173 | + if (preg_match('@'.$remove[1].'@is', $this->inputs[$key])) { |
|
174 | 174 | unset($this->inputs[$key]); |
175 | 175 | } |
176 | 176 | } |
@@ -184,42 +184,42 @@ discard block |
||
184 | 184 | */ |
185 | 185 | private function getRules($key) |
186 | 186 | { |
187 | - if(preg_match('@rule\((.*?)\)|rule\((.*?)\)\r\n@is',$this->annotation,$rule)){ |
|
187 | + if (preg_match('@rule\((.*?)\)|rule\((.*?)\)\r\n@is', $this->annotation, $rule)) { |
|
188 | 188 | |
189 | 189 | $requestRules = $this->getReflection('rules'); |
190 | 190 | |
191 | - $rules = explode(":",$rule[1]); |
|
192 | - if(isset($this->inputs[$key]) && !is_array($this->inputs[$key])){ |
|
193 | - foreach($rules as $rule){ |
|
194 | - if(isset($requestRules[$rule])){ |
|
195 | - if(!preg_match('@'.$requestRules[$rule].'@',$this->inputs[$key])){ |
|
196 | - exception($rule,['key'=>$key.':'.$this->inputs[$key]]) |
|
191 | + $rules = explode(":", $rule[1]); |
|
192 | + if (isset($this->inputs[$key]) && !is_array($this->inputs[$key])) { |
|
193 | + foreach ($rules as $rule) { |
|
194 | + if (isset($requestRules[$rule])) { |
|
195 | + if (!preg_match('@'.$requestRules[$rule].'@', $this->inputs[$key])) { |
|
196 | + exception($rule, ['key'=>$key.':'.$this->inputs[$key]]) |
|
197 | 197 | ->invalidArgument($key.':'.$this->inputs[$key].' input value is not valid for '.$rule.' request rule'); |
198 | 198 | } |
199 | 199 | } |
200 | 200 | } |
201 | 201 | } |
202 | - else{ |
|
202 | + else { |
|
203 | 203 | |
204 | - foreach ($this->inputs[$key] as $ikey=>$input){ |
|
204 | + foreach ($this->inputs[$key] as $ikey=>$input) { |
|
205 | 205 | |
206 | - if(!is_array($input)){ |
|
207 | - foreach($rules as $rule){ |
|
208 | - if(isset($requestRules[$rule])){ |
|
209 | - if(!preg_match('@'.$requestRules[$rule].'@',$input)){ |
|
210 | - exception($rule,['key'=>''.$key.':'.$input]) |
|
206 | + if (!is_array($input)) { |
|
207 | + foreach ($rules as $rule) { |
|
208 | + if (isset($requestRules[$rule])) { |
|
209 | + if (!preg_match('@'.$requestRules[$rule].'@', $input)) { |
|
210 | + exception($rule, ['key'=>''.$key.':'.$input]) |
|
211 | 211 | ->invalidArgument($key.':'.$input.' input value is not valid for '.$rule.' request rule'); |
212 | 212 | } |
213 | 213 | } |
214 | 214 | } |
215 | 215 | } |
216 | - else{ |
|
216 | + else { |
|
217 | 217 | |
218 | - foreach ($input as $ikey=>$item){ |
|
219 | - foreach($rules as $rule){ |
|
220 | - if(isset($requestRules[$rule])){ |
|
221 | - if(!preg_match('@'.$requestRules[$rule].'@',$item)){ |
|
222 | - exception($rule,['key'=>''.$key.':'.$item]) |
|
218 | + foreach ($input as $ikey=>$item) { |
|
219 | + foreach ($rules as $rule) { |
|
220 | + if (isset($requestRules[$rule])) { |
|
221 | + if (!preg_match('@'.$requestRules[$rule].'@', $item)) { |
|
222 | + exception($rule, ['key'=>''.$key.':'.$item]) |
|
223 | 223 | ->invalidArgument($key.':'.$item.' input value is not valid for '.$rule.' request rule'); |
224 | 224 | } |
225 | 225 | } |