@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | public static function getInstance() |
| 18 | 18 | { |
| 19 | - if(is_null(self::$singleton)){ |
|
| 19 | + if (is_null(self::$singleton)) { |
|
| 20 | 20 | self::$singleton = new Serializer(); |
| 21 | 21 | } |
| 22 | 22 | |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | public static function set($data) |
| 32 | 32 | { |
| 33 | - if(is_callable($data)){ |
|
| 33 | + if (is_callable($data)) { |
|
| 34 | 34 | return self::getInstance()->serialize($data); |
| 35 | 35 | } |
| 36 | 36 | return self::getInstance()->serialize(function() use ($data){ |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | * @param $credentials |
| 32 | 32 | * @param null|AuthLoginManager $manager |
| 33 | 33 | */ |
| 34 | - public function __construct($credentials,$manager) |
|
| 34 | + public function __construct($credentials, $manager) |
|
| 35 | 35 | {
|
| 36 | 36 | //get credentials as default |
| 37 | 37 | $this->credentials = $credentials; |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | //get credential hash |
| 43 | 43 | $this->setCredentialHash(); |
| 44 | 44 | |
| 45 | - if($this->manager->getUsing()===false){
|
|
| 45 | + if ($this->manager->getUsing()===false) {
|
|
| 46 | 46 | |
| 47 | 47 | // the request object will help you process |
| 48 | 48 | // the credentials and get them correctly. |
@@ -92,13 +92,13 @@ discard block |
||
| 92 | 92 | */ |
| 93 | 93 | public function getRequest() |
| 94 | 94 | {
|
| 95 | - if(!is_null($clientProvider = $this->manager->getAuth()->provider('client'))){
|
|
| 95 | + if (!is_null($clientProvider = $this->manager->getAuth()->provider('client'))) {
|
|
| 96 | 96 | return $clientProvider(); |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | $request = $this->manager->getAuth()->getRequest(); |
| 100 | 100 | |
| 101 | - if($request=='Default'){
|
|
| 101 | + if ($request=='Default') {
|
|
| 102 | 102 | return new AuthenticateRequest($this); |
| 103 | 103 | } |
| 104 | 104 | |
@@ -126,8 +126,8 @@ discard block |
||
| 126 | 126 | private function setCredentialHash() |
| 127 | 127 | {
|
| 128 | 128 | //set credential hash |
| 129 | - if(count($this->credentials)){
|
|
| 130 | - $this->credentialHash = md5(sha1(implode("|",$this->credentials)));
|
|
| 129 | + if (count($this->credentials)) {
|
|
| 130 | + $this->credentialHash = md5(sha1(implode("|", $this->credentials)));
|
|
| 131 | 131 | } |
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | 134 | \ No newline at end of file |
@@ -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,13 +107,13 @@ 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])){
|
|
| 114 | + if (method_exists($getObjectInstance, $dataKey) && is_array($data)) {
|
|
| 115 | + foreach ($data as $dataItem) {
|
|
| 116 | + if (isset($this->origin[$dataItem])) {
|
|
| 117 | 117 | $getObjectInstance->{$dataKey}($this->origin[$dataItem]);
|
| 118 | 118 | } |
| 119 | 119 | } |
@@ -121,11 +121,11 @@ discard block |
||
| 121 | 121 | |
| 122 | 122 | // if the methods of the auto-validate class resolved by the container resolve method apply, |
| 123 | 123 | // the process of auto-validate automatic implementation will be completed. |
| 124 | - if(is_numeric($dataKey) && method_exists($getObjectInstance,$data) && isset($this->origin[$data])){
|
|
| 125 | - if(!is_array($this->origin[$data])){
|
|
| 124 | + if (is_numeric($dataKey) && method_exists($getObjectInstance, $data) && isset($this->origin[$data])) {
|
|
| 125 | + if (!is_array($this->origin[$data])) {
|
|
| 126 | 126 | $this->origin[$data] = array($this->origin[$data]); |
| 127 | 127 | } |
| 128 | - foreach ($this->origin[$data] as $originData){
|
|
| 128 | + foreach ($this->origin[$data] as $originData) {
|
|
| 129 | 129 | $getObjectInstance->{$data}($originData);
|
| 130 | 130 | } |
| 131 | 131 | } |
@@ -141,39 +141,39 @@ discard block |
||
| 141 | 141 | private function capsule() |
| 142 | 142 | {
|
| 143 | 143 | //a process can be added to the capsule array using the method. |
| 144 | - if(method_exists($this,'capsuleMethod')){
|
|
| 145 | - $this->capsule = array_merge($this->capsule,$this->capsuleMethod()); |
|
| 144 | + if (method_exists($this, 'capsuleMethod')) {
|
|
| 145 | + $this->capsule = array_merge($this->capsule, $this->capsuleMethod()); |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | // expected method is executed. |
| 149 | 149 | // this method is a must for http method values to be found in this property. |
| 150 | - if($this->checkProperties('capsule')){
|
|
| 150 | + if ($this->checkProperties('capsule')) {
|
|
| 151 | 151 | |
| 152 | - if(property_exists($this,'auto_capsule') && is_array($this->auto_capsule)){
|
|
| 153 | - $this->capsule = array_merge($this->capsule,$this->auto_capsule); |
|
| 152 | + if (property_exists($this, 'auto_capsule') && is_array($this->auto_capsule)) {
|
|
| 153 | + $this->capsule = array_merge($this->capsule, $this->auto_capsule); |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | - if($this->checkProperties('groups')){
|
|
| 157 | - $this->capsule = array_merge($this->capsule,$this->groups); |
|
| 156 | + if ($this->checkProperties('groups')) {
|
|
| 157 | + $this->capsule = array_merge($this->capsule, $this->groups); |
|
| 158 | 158 | |
| 159 | 159 | foreach ($this->capsule as $item) {
|
| 160 | - $groupProcess = $this->groupsProcess($item,true); |
|
| 161 | - if(is_array($groupProcess)){
|
|
| 160 | + $groupProcess = $this->groupsProcess($item, true); |
|
| 161 | + if (is_array($groupProcess)) {
|
|
| 162 | 162 | $defaultInputs = $this->inputs; |
| 163 | - $this->inputs = array_merge($this->inputs,$groupProcess); |
|
| 163 | + $this->inputs = array_merge($this->inputs, $groupProcess); |
|
| 164 | 164 | } |
| 165 | 165 | } |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | - foreach($this->inputs as $input=>$value){
|
|
| 168 | + foreach ($this->inputs as $input=>$value) {
|
|
| 169 | 169 | |
| 170 | - if($this->checkProperties('capsule') && !in_array($input,$this->capsule)){
|
|
| 171 | - exception('clientCapsule',['key'=>$input])
|
|
| 170 | + if ($this->checkProperties('capsule') && !in_array($input, $this->capsule)) {
|
|
| 171 | + exception('clientCapsule', ['key'=>$input])
|
|
| 172 | 172 | ->overflow('The '.$input.' value cannot be sent.');
|
| 173 | 173 | } |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | - if(isset($defaultInputs)){
|
|
| 176 | + if (isset($defaultInputs)) {
|
|
| 177 | 177 | $this->inputs = $defaultInputs; |
| 178 | 178 | } |
| 179 | 179 | } |
@@ -191,15 +191,15 @@ discard block |
||
| 191 | 191 | |
| 192 | 192 | // Determines which HTTP method |
| 193 | 193 | // the request object will be exposed to. |
| 194 | - if($this->checkProperties('http')){
|
|
| 194 | + if ($this->checkProperties('http')) {
|
|
| 195 | 195 | |
| 196 | 196 | // if the current http method does not exist |
| 197 | 197 | // in the http object, the exception will be thrown. |
| 198 | - if(!in_array($method,$this->http)){
|
|
| 198 | + if (!in_array($method, $this->http)) {
|
|
| 199 | 199 | |
| 200 | 200 | //exception batMethodCall |
| 201 | 201 | exception()->badMethodCall( |
| 202 | - 'Invalid http method process for '.basename($this).'.That is accepted http methods ['.implode(",",$this->http).'] ');
|
|
| 202 | + 'Invalid http method process for '.basename($this).'.That is accepted http methods ['.implode(",", $this->http).'] ');
|
|
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | } |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | {
|
| 215 | 215 | // from the properties of the object properties to |
| 216 | 216 | // the existing variables, control the array and at least one element. |
| 217 | - return (property_exists($this,$properties) |
|
| 217 | + return (property_exists($this, $properties) |
|
| 218 | 218 | && is_array($this->{$properties}) && count($this->{$properties})) ? true : false;
|
| 219 | 219 | } |
| 220 | 220 | |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | {
|
| 228 | 228 | // we are saving the expected values for the request in container. |
| 229 | 229 | // this record can be returned in exception information. |
| 230 | - app()->register('requestExpected',$this->expected);
|
|
| 230 | + app()->register('requestExpected', $this->expected);
|
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | /** |
@@ -239,15 +239,15 @@ discard block |
||
| 239 | 239 | public function except($except) |
| 240 | 240 | {
|
| 241 | 241 | // the except parameter is a callable value. |
| 242 | - if(is_callable($except)){
|
|
| 243 | - $call = call_user_func_array($except,[$this]); |
|
| 242 | + if (is_callable($except)) {
|
|
| 243 | + $call = call_user_func_array($except, [$this]); |
|
| 244 | 244 | $except = $call; |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | // except with the except exceptions property |
| 248 | 248 | // and then assigning them to the inputs property. |
| 249 | - $this->except = array_merge($this->except,$except); |
|
| 250 | - $this->inputs = array_diff_key($this->inputs,array_flip($this->except)); |
|
| 249 | + $this->except = array_merge($this->except, $except); |
|
| 250 | + $this->inputs = array_diff_key($this->inputs, array_flip($this->except)); |
|
| 251 | 251 | |
| 252 | 252 | return $this; |
| 253 | 253 | } |
@@ -261,32 +261,32 @@ discard block |
||
| 261 | 261 | {
|
| 262 | 262 | // expected method is executed. |
| 263 | 263 | // this method is a must for http method values to be found in this property. |
| 264 | - if($this->checkProperties('expected')){
|
|
| 264 | + if ($this->checkProperties('expected')) {
|
|
| 265 | 265 | |
| 266 | 266 | // if the expected values are not found in the inputs array, |
| 267 | 267 | // the exception will be thrown. |
| 268 | - foreach ($this->expected as $expected){
|
|
| 268 | + foreach ($this->expected as $expected) {
|
|
| 269 | 269 | |
| 270 | 270 | $expectedValues = []; |
| 271 | 271 | |
| 272 | 272 | // mandatory expected data for each key can be separated by | operator. |
| 273 | 273 | // this is evaluated as "or". |
| 274 | - foreach($expectedData = explode("|",$expected) as $inputs){
|
|
| 274 | + foreach ($expectedData = explode("|", $expected) as $inputs) {
|
|
| 275 | 275 | |
| 276 | 276 | // we should do key control for group format. |
| 277 | 277 | // this process will allow us to perform key control for 2D array correctly. |
| 278 | 278 | $this->groupsProcess($inputs); |
| 279 | 279 | |
| 280 | - if(!isset($this->inputs[$inputs])){
|
|
| 280 | + if (!isset($this->inputs[$inputs])) {
|
|
| 281 | 281 | $expectedValues[$inputs] = $inputs; |
| 282 | 282 | } |
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | // if the expectedData and expectedValues |
| 286 | 286 | // array are numerically equal to the expected key, the exception is thrown. |
| 287 | - if(count($expectedData)===count($expectedValues)){
|
|
| 288 | - exception('clientExpected',['key'=>$expected])
|
|
| 289 | - ->unexpectedValue('You absolutely have to send the value '.implode(" or ",$expectedValues).' for request object');
|
|
| 287 | + if (count($expectedData)===count($expectedValues)) {
|
|
| 288 | + exception('clientExpected', ['key'=>$expected])
|
|
| 289 | + ->unexpectedValue('You absolutely have to send the value '.implode(" or ", $expectedValues).' for request object');
|
|
| 290 | 290 | } |
| 291 | 291 | } |
| 292 | 292 | } |
@@ -301,17 +301,17 @@ discard block |
||
| 301 | 301 | {
|
| 302 | 302 | // check the presence of the generator object |
| 303 | 303 | // and operate the generator over this object. |
| 304 | - if($this->checkProperties('auto_generators')){
|
|
| 304 | + if ($this->checkProperties('auto_generators')) {
|
|
| 305 | 305 | $generators = $this->getAutoGenerators(); |
| 306 | 306 | } |
| 307 | 307 | |
| 308 | 308 | // check the presence of the generator object |
| 309 | 309 | // and operate the generator over this object. |
| 310 | - if($this->checkProperties('generators')){
|
|
| 311 | - $generators = array_merge(isset($generators) ? $generators: [],$this->getGenerators()); |
|
| 310 | + if ($this->checkProperties('generators')) {
|
|
| 311 | + $generators = array_merge(isset($generators) ? $generators : [], $this->getGenerators()); |
|
| 312 | 312 | } |
| 313 | 313 | |
| 314 | - if(isset($generators)){
|
|
| 314 | + if (isset($generators)) {
|
|
| 315 | 315 | $this->generatorMethod($generators); |
| 316 | 316 | } |
| 317 | 317 | } |
@@ -326,21 +326,21 @@ discard block |
||
| 326 | 326 | private function generatorMethod($generators) |
| 327 | 327 | {
|
| 328 | 328 | //generator array object |
| 329 | - foreach ($generators as $generator){
|
|
| 329 | + foreach ($generators as $generator) {
|
|
| 330 | 330 | |
| 331 | 331 | //generator method name |
| 332 | 332 | $generatorMethodName = $generator.'Generator'; |
| 333 | 333 | |
| 334 | 334 | // if the generator method is present, |
| 335 | 335 | // the fake value is assigned. |
| 336 | - if(method_exists($this,$generatorMethodName)){
|
|
| 336 | + if (method_exists($this, $generatorMethodName)) {
|
|
| 337 | 337 | |
| 338 | 338 | //fake registration |
| 339 | - if(!isset($this->inputs[$generator])){
|
|
| 339 | + if (!isset($this->inputs[$generator])) {
|
|
| 340 | 340 | |
| 341 | 341 | $generatorMethodNameResult = $this->{$generatorMethodName}();
|
| 342 | 342 | |
| 343 | - if(!is_null($generatorMethodNameResult)){
|
|
| 343 | + if (!is_null($generatorMethodNameResult)) {
|
|
| 344 | 344 | $this->{$generator} = $this->{$generatorMethodName}();
|
| 345 | 345 | $this->inputs[$generator] = $this->{$generatorMethodName}();
|
| 346 | 346 | $this->generatorList[] = $generator; |
@@ -348,15 +348,15 @@ discard block |
||
| 348 | 348 | } |
| 349 | 349 | else {
|
| 350 | 350 | |
| 351 | - if($this->checkProperties('auto_generators_dont_overwrite')
|
|
| 352 | - && in_array($generator,$this->getAutoGeneratorsDontOverwrite())){
|
|
| 351 | + if ($this->checkProperties('auto_generators_dont_overwrite')
|
|
| 352 | + && in_array($generator, $this->getAutoGeneratorsDontOverwrite())) {
|
|
| 353 | 353 | $this->{$generator} = $this->{$generatorMethodName}();
|
| 354 | 354 | $this->inputs[$generator] = $this->{$generatorMethodName}();
|
| 355 | 355 | $this->generatorList[] = $generator; |
| 356 | 356 | } |
| 357 | 357 | |
| 358 | - if($this->checkProperties('generators_dont_overwrite')
|
|
| 359 | - && in_array($generator,$this->getGeneratorsDontOverwrite())){
|
|
| 358 | + if ($this->checkProperties('generators_dont_overwrite')
|
|
| 359 | + && in_array($generator, $this->getGeneratorsDontOverwrite())) {
|
|
| 360 | 360 | $this->{$generator} = $this->{$generatorMethodName}();
|
| 361 | 361 | $this->inputs[$generator] = $this->{$generatorMethodName}();
|
| 362 | 362 | $this->generatorList[] = $generator; |
@@ -387,28 +387,28 @@ discard block |
||
| 387 | 387 | * @param null $callback |
| 388 | 388 | * @return mixed|void |
| 389 | 389 | */ |
| 390 | - public function groupsProcess($key=null,$callback=null) |
|
| 390 | + public function groupsProcess($key = null, $callback = null) |
|
| 391 | 391 | {
|
| 392 | - if(property_exists($this,'groups') && is_array($this->groups)){
|
|
| 392 | + if (property_exists($this, 'groups') && is_array($this->groups)) {
|
|
| 393 | 393 | |
| 394 | 394 | $clientObjects = $this->getClientObjects(); |
| 395 | 395 | |
| 396 | - foreach ($this->groups as $group){
|
|
| 396 | + foreach ($this->groups as $group) {
|
|
| 397 | 397 | |
| 398 | - if(true === $callback){
|
|
| 399 | - if(isset($clientObjects['origin'][$key])){
|
|
| 398 | + if (true===$callback) {
|
|
| 399 | + if (isset($clientObjects['origin'][$key])) {
|
|
| 400 | 400 | return $clientObjects['origin'][$key]; |
| 401 | 401 | } |
| 402 | 402 | return []; |
| 403 | 403 | } |
| 404 | 404 | |
| 405 | - if(isset($clientObjects['origin'][$group][$key])){
|
|
| 405 | + if (isset($clientObjects['origin'][$group][$key])) {
|
|
| 406 | 406 | |
| 407 | 407 | $this->{$key} = $clientObjects['origin'][$group][$key];
|
| 408 | 408 | $this->inputs[$key] = $this->{$key};
|
| 409 | 409 | |
| 410 | - if(is_callable($callback)){
|
|
| 411 | - call_user_func_array($callback,[$key]); |
|
| 410 | + if (is_callable($callback)) {
|
|
| 411 | + call_user_func_array($callback, [$key]); |
|
| 412 | 412 | } |
| 413 | 413 | } |
| 414 | 414 | } |
@@ -471,7 +471,7 @@ discard block |
||
| 471 | 471 | {
|
| 472 | 472 | // we use the http method to write |
| 473 | 473 | // the values to the inputs and origin properties. |
| 474 | - foreach($this->clientData as $key=>$value){
|
|
| 474 | + foreach ($this->clientData as $key=>$value) {
|
|
| 475 | 475 | |
| 476 | 476 | //inputs and origin properties |
| 477 | 477 | $this->inputs[$key] = $value; |
@@ -487,9 +487,9 @@ discard block |
||
| 487 | 487 | */ |
| 488 | 488 | private function requestExcept() |
| 489 | 489 | {
|
| 490 | - if(property_exists($this,'requestExcept') && is_array($this->requestExcept)){
|
|
| 491 | - foreach ($this->requestExcept as $item){
|
|
| 492 | - if(isset($this->inputs[$item])){
|
|
| 490 | + if (property_exists($this, 'requestExcept') && is_array($this->requestExcept)) {
|
|
| 491 | + foreach ($this->requestExcept as $item) {
|
|
| 492 | + if (isset($this->inputs[$item])) {
|
|
| 493 | 493 | unset($this->inputs[$item]); |
| 494 | 494 | } |
| 495 | 495 | } |
@@ -502,16 +502,16 @@ discard block |
||
| 502 | 502 | * @param null|string $clientName |
| 503 | 503 | * @return void|mixed |
| 504 | 504 | */ |
| 505 | - public function setClientName($clientName=null) |
|
| 505 | + public function setClientName($clientName = null) |
|
| 506 | 506 | {
|
| 507 | - if(!is_null($clientName) && is_string($clientName)){
|
|
| 507 | + if (!is_null($clientName) && is_string($clientName)) {
|
|
| 508 | 508 | return $this->clientName = $clientName; |
| 509 | 509 | } |
| 510 | 510 | |
| 511 | - if(!is_null(Utils::trace(0)) && isset(Utils::trace(0)['object'])){
|
|
| 511 | + if (!is_null(Utils::trace(0)) && isset(Utils::trace(0)['object'])) {
|
|
| 512 | 512 | $backTrace = Utils::trace(0)['object']; |
| 513 | 513 | |
| 514 | - if(property_exists($backTrace,'clientName')){
|
|
| 514 | + if (property_exists($backTrace, 'clientName')) {
|
|
| 515 | 515 | $this->clientName = $backTrace->clientName; |
| 516 | 516 | } |
| 517 | 517 | } |
@@ -528,16 +528,16 @@ discard block |
||
| 528 | 528 | |
| 529 | 529 | // we update the input values after |
| 530 | 530 | // we receive and check the saved objects. |
| 531 | - foreach ($clientObjects as $key=>$value){
|
|
| 531 | + foreach ($clientObjects as $key=>$value) {
|
|
| 532 | 532 | |
| 533 | 533 | // we should do key control for group format. |
| 534 | 534 | // this process will allow us to perform key control for 2D array correctly. |
| 535 | - $this->groupsProcess($key,function($key){
|
|
| 535 | + $this->groupsProcess($key, function($key) {
|
|
| 536 | 536 | $this->registerRequestInputs($key); |
| 537 | 537 | unset($this->inputs[$key]); |
| 538 | 538 | }); |
| 539 | 539 | |
| 540 | - if(!in_array($key,$this->generatorList) && isset($clientObjects['origin'][$key])){
|
|
| 540 | + if (!in_array($key, $this->generatorList) && isset($clientObjects['origin'][$key])) {
|
|
| 541 | 541 | |
| 542 | 542 | $this->{$key} = $clientObjects['origin'][$key];
|
| 543 | 543 | $this->inputs[$key] = $this->{$key};
|
@@ -565,11 +565,11 @@ discard block |
||
| 565 | 565 | |
| 566 | 566 | // the request update to be performed using |
| 567 | 567 | // the method name to be used with the http method. |
| 568 | - $this->setRequestInputs($requestMethod,$key); |
|
| 568 | + $this->setRequestInputs($requestMethod, $key); |
|
| 569 | 569 | |
| 570 | 570 | // the request update to be performed using |
| 571 | 571 | // the method name to be used without the http method. |
| 572 | - $this->setRequestInputs($key,$key); |
|
| 572 | + $this->setRequestInputs($key, $key); |
|
| 573 | 573 | } |
| 574 | 574 | |
| 575 | 575 | /** |
@@ -580,28 +580,28 @@ discard block |
||
| 580 | 580 | * |
| 581 | 581 | * @throws ReflectionExceptionAlias |
| 582 | 582 | */ |
| 583 | - private function setRequestInputs($method,$key) |
|
| 583 | + private function setRequestInputs($method, $key) |
|
| 584 | 584 | {
|
| 585 | - if(!in_array($key,$this->generatorList) && method_exists($this,$method) && $this->reflection->reflectionMethodParams($method)->isProtected){
|
|
| 585 | + if (!in_array($key, $this->generatorList) && method_exists($this, $method) && $this->reflection->reflectionMethodParams($method)->isProtected) {
|
|
| 586 | 586 | |
| 587 | 587 | //check annotations for method |
| 588 | - $annotation = app()->resolve(ClientAnnotationManager::class,['request'=>$this]); |
|
| 589 | - $annotation->annotation($method,$key); |
|
| 588 | + $annotation = app()->resolve(ClientAnnotationManager::class, ['request'=>$this]); |
|
| 589 | + $annotation->annotation($method, $key); |
|
| 590 | 590 | |
| 591 | - if(isset($this->inputs[$key]) && is_array($this->inputs[$key])){
|
|
| 591 | + if (isset($this->inputs[$key]) && is_array($this->inputs[$key])) {
|
|
| 592 | 592 | |
| 593 | 593 | $inputKeys = $this->inputs[$key]; |
| 594 | 594 | |
| 595 | 595 | $this->inputs[$key] = []; |
| 596 | - foreach ($inputKeys as $input){
|
|
| 596 | + foreach ($inputKeys as $input) {
|
|
| 597 | 597 | |
| 598 | 598 | $this->{$key} = $input;
|
| 599 | 599 | $keyMethod = $this->{$method}();
|
| 600 | 600 | $this->inputs[$key][] = $keyMethod; |
| 601 | 601 | } |
| 602 | 602 | } |
| 603 | - else{
|
|
| 604 | - if(isset($this->inputs[$key])){
|
|
| 603 | + else {
|
|
| 604 | + if (isset($this->inputs[$key])) {
|
|
| 605 | 605 | $keyMethod = $this->{$method}();
|
| 606 | 606 | $this->inputs[$key] = $keyMethod; |
| 607 | 607 | } |
@@ -620,8 +620,8 @@ discard block |
||
| 620 | 620 | // the auto object validate property is the property |
| 621 | 621 | // where all of your request values are automatically validated. |
| 622 | 622 | /** @noinspection PhpParamsInspection */ |
| 623 | - if(property_exists($this,'autoObjectValidate') |
|
| 624 | - && is_array($this->autoObjectValidate) && count($this->autoObjectValidate)){
|
|
| 623 | + if (property_exists($this, 'autoObjectValidate') |
|
| 624 | + && is_array($this->autoObjectValidate) && count($this->autoObjectValidate)) {
|
|
| 625 | 625 | $this->autoValidate('autoObjectValidate');
|
| 626 | 626 | } |
| 627 | 627 | } |
@@ -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 | |
@@ -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 |
@@ -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\((.*?)\)|exception\((.*?)\)\r\n@is',$this->annotation,$exception)){
|
|
| 93 | + if (preg_match('@exception\((.*?)\)|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\((.*?)\)|regex\((.*?)\)\r\n@is',$this->annotation,$regex)){
|
|
| 127 | - if(isset($this->inputs[$key])){
|
|
| 126 | + if (preg_match('@regex\((.*?)\)|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 | } |
@@ -28,9 +28,9 @@ discard block |
||
| 28 | 28 | // Fetch content and determine boundary |
| 29 | 29 | $boundary = substr($raw_data, 0, strpos($raw_data, "\r\n")); |
| 30 | 30 | |
| 31 | - if(empty($boundary)){ |
|
| 32 | - parse_str($raw_data,$data); |
|
| 33 | - $GLOBALS[ '_PUT' ] = $data; |
|
| 31 | + if (empty($boundary)) { |
|
| 32 | + parse_str($raw_data, $data); |
|
| 33 | + $GLOBALS['_PUT'] = $data; |
|
| 34 | 34 | return; |
| 35 | 35 | } |
| 36 | 36 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | foreach ($parts as $part) { |
| 42 | 42 | // If this is the last part, break |
| 43 | - if ($part == "--\r\n") break; |
|
| 43 | + if ($part=="--\r\n") break; |
|
| 44 | 44 | |
| 45 | 45 | // Separate content from headers |
| 46 | 46 | $part = ltrim($part, "\r\n"); |
@@ -67,10 +67,10 @@ discard block |
||
| 67 | 67 | list(, $type, $name) = $matches; |
| 68 | 68 | |
| 69 | 69 | //Parse File |
| 70 | - if( isset($matches[4]) ) |
|
| 70 | + if (isset($matches[4])) |
|
| 71 | 71 | { |
| 72 | 72 | //if labeled the same as previous, skip |
| 73 | - if( isset( $_FILES[ $matches[ 2 ] ] ) ) |
|
| 73 | + if (isset($_FILES[$matches[2]])) |
|
| 74 | 74 | { |
| 75 | 75 | continue; |
| 76 | 76 | } |
@@ -79,16 +79,16 @@ discard block |
||
| 79 | 79 | $filename = $matches[4]; |
| 80 | 80 | |
| 81 | 81 | //get tmp name |
| 82 | - $filename_parts = pathinfo( $filename ); |
|
| 83 | - $tmp_name = tempnam( ini_get('upload_tmp_dir'), $filename_parts['filename']); |
|
| 82 | + $filename_parts = pathinfo($filename); |
|
| 83 | + $tmp_name = tempnam(ini_get('upload_tmp_dir'), $filename_parts['filename']); |
|
| 84 | 84 | |
| 85 | 85 | //populate $_FILES with information, size may be off in multibyte situation |
| 86 | 86 | /** @noinspection PhpUndefinedVariableInspection */ |
| 87 | - $_FILES[ $matches[ 2 ] ] = array( |
|
| 87 | + $_FILES[$matches[2]] = array( |
|
| 88 | 88 | 'error'=>0, |
| 89 | 89 | 'name'=>$filename, |
| 90 | 90 | 'tmp_name'=>$tmp_name, |
| 91 | - 'size'=>strlen( $body ), |
|
| 91 | + 'size'=>strlen($body), |
|
| 92 | 92 | 'type'=>$value |
| 93 | 93 | ); |
| 94 | 94 | |
@@ -98,12 +98,12 @@ discard block |
||
| 98 | 98 | //Parse Field |
| 99 | 99 | else |
| 100 | 100 | { |
| 101 | - $data[$name] = substr($body, 0, strlen($body) - 2); |
|
| 101 | + $data[$name] = substr($body, 0, strlen($body)-2); |
|
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | } |
| 106 | - $GLOBALS[ '_PUT' ] = $data; |
|
| 106 | + $GLOBALS['_PUT'] = $data; |
|
| 107 | 107 | return $data; |
| 108 | 108 | } |
| 109 | 109 | |
@@ -111,34 +111,34 @@ discard block |
||
| 111 | 111 | * @param string $method |
| 112 | 112 | * @return array |
| 113 | 113 | */ |
| 114 | - public function httpMethodData($method='get') |
|
| 114 | + public function httpMethodData($method = 'get') |
|
| 115 | 115 | { |
| 116 | 116 | $body = []; |
| 117 | 117 | |
| 118 | - if(httpMethod()==$method){ |
|
| 119 | - $rawData = json_decode(request()->getContent(),1); |
|
| 118 | + if (httpMethod()==$method) { |
|
| 119 | + $rawData = json_decode(request()->getContent(), 1); |
|
| 120 | 120 | |
| 121 | 121 | $get = get(); |
| 122 | - if(is_array($get) && count($get)){ |
|
| 122 | + if (is_array($get) && count($get)) { |
|
| 123 | 123 | $body['params'] = get(); |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - if(is_null($rawData)){ |
|
| 126 | + if (is_null($rawData)) { |
|
| 127 | 127 | |
| 128 | 128 | $containerMethod = app()->get(httpMethod()); |
| 129 | 129 | |
| 130 | - if(is_array($containerMethod) && count($containerMethod)){ |
|
| 130 | + if (is_array($containerMethod) && count($containerMethod)) { |
|
| 131 | 131 | $inputData = $containerMethod; |
| 132 | 132 | } |
| 133 | - else{ |
|
| 133 | + else { |
|
| 134 | 134 | $inputData = $this->getInputData(); |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - if(!is_null($inputData)){ |
|
| 137 | + if (!is_null($inputData)) { |
|
| 138 | 138 | $body['body']['form-data'] = $inputData; |
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | - else{ |
|
| 141 | + else { |
|
| 142 | 142 | $body['body']['raw-data'] = $rawData; |
| 143 | 143 | } |
| 144 | 144 | } |
@@ -19,8 +19,9 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | /* Read the data 1 KB at a time |
| 21 | 21 | and write to the file */ |
| 22 | - while ($chunk = fread($putdata, 1024)) |
|
| 23 | - $raw_data .= $chunk; |
|
| 22 | + while ($chunk = fread($putdata, 1024)) {
|
|
| 23 | + $raw_data .= $chunk; |
|
| 24 | + } |
|
| 24 | 25 | |
| 25 | 26 | /* Close the streams */ |
| 26 | 27 | fclose($putdata); |
@@ -40,7 +41,9 @@ discard block |
||
| 40 | 41 | |
| 41 | 42 | foreach ($parts as $part) { |
| 42 | 43 | // If this is the last part, break |
| 43 | - if ($part == "--\r\n") break; |
|
| 44 | + if ($part == "--\r\n") {
|
|
| 45 | + break; |
|
| 46 | + } |
|
| 44 | 47 | |
| 45 | 48 | // Separate content from headers |
| 46 | 49 | $part = ltrim($part, "\r\n"); |
@@ -129,16 +132,14 @@ discard block |
||
| 129 | 132 | |
| 130 | 133 | if(is_array($containerMethod) && count($containerMethod)){ |
| 131 | 134 | $inputData = $containerMethod; |
| 132 | - } |
|
| 133 | - else{ |
|
| 135 | + } else{ |
|
| 134 | 136 | $inputData = $this->getInputData(); |
| 135 | 137 | } |
| 136 | 138 | |
| 137 | 139 | if(!is_null($inputData)){ |
| 138 | 140 | $body['body']['form-data'] = $inputData; |
| 139 | 141 | } |
| 140 | - } |
|
| 141 | - else{ |
|
| 142 | + } else{ |
|
| 142 | 143 | $body['body']['raw-data'] = $rawData; |
| 143 | 144 | } |
| 144 | 145 | } |
@@ -27,13 +27,13 @@ discard block |
||
| 27 | 27 | //the auto service to be called. |
| 28 | 28 | return ClosureDispatcher::bind($controllerInstance)->call(function() use($controllerInstance){
|
| 29 | 29 | |
| 30 | - if(property_exists($controllerInstance,'response')){
|
|
| 30 | + if (property_exists($controllerInstance, 'response')) {
|
|
| 31 | 31 | return $controllerInstance->response; |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | // if the client wishes, |
| 35 | 35 | // data can be returned in the supported format. |
| 36 | - if(app()->has('clientResponseType')){
|
|
| 36 | + if (app()->has('clientResponseType')) {
|
|
| 37 | 37 | return app()->get('clientResponseType');
|
| 38 | 38 | } |
| 39 | 39 | |
@@ -73,8 +73,7 @@ discard block |
||
| 73 | 73 | {
|
| 74 | 74 | //we get the response type by checking the instanceController object from the router. |
| 75 | 75 | //Each type of response is in the base class in project directory. |
| 76 | - return ($this->getControllerInstance()===null) ? core()->responseType : |
|
| 77 | - $this->appResponseType(); |
|
| 76 | + return ($this->getControllerInstance()===null) ? core()->responseType : $this->appResponseType(); |
|
| 78 | 77 | } |
| 79 | 78 | |
| 80 | 79 | /** |
@@ -85,19 +84,19 @@ discard block |
||
| 85 | 84 | public function handle() |
| 86 | 85 | {
|
| 87 | 86 | //definition for singleton instance |
| 88 | - define ('responseApp',true);
|
|
| 87 | + define('responseApp', true);
|
|
| 89 | 88 | |
| 90 | 89 | //get out putter for response |
| 91 | 90 | $formatter = $this->formatter(); |
| 92 | 91 | |
| 93 | 92 | //if out putter is not null |
| 94 | - if(Utils::isNamespaceExists($formatter)){
|
|
| 93 | + if (Utils::isNamespaceExists($formatter)) {
|
|
| 95 | 94 | |
| 96 | 95 | //We resolve the response via the service container |
| 97 | 96 | //and run the handle method. |
| 98 | 97 | $result = app()->resolve($formatter)->{$this->getResponseKind()}($this->getOutPutter());
|
| 99 | 98 | |
| 100 | - $this->app->register('result',$result);
|
|
| 99 | + $this->app->register('result', $result);
|
|
| 101 | 100 | } |
| 102 | 101 | } |
| 103 | 102 | |
@@ -107,7 +106,7 @@ discard block |
||
| 107 | 106 | * @param array $data |
| 108 | 107 | * @return array |
| 109 | 108 | */ |
| 110 | - public function outputFormatter($data=array(),$outputter='json') |
|
| 109 | + public function outputFormatter($data = array(), $outputter = 'json') |
|
| 111 | 110 | {
|
| 112 | 111 | $dataCapsule = config('response.data');
|
| 113 | 112 | |