@@ -11,7 +11,7 @@ |
||
11 | 11 | * @param $deviceTokenId |
12 | 12 | * @param AuthenticateProvider $auth |
13 | 13 | */ |
14 | - public function __construct($deviceTokenId,$auth) |
|
14 | + public function __construct($deviceTokenId, $auth) |
|
15 | 15 | { |
16 | 16 | parent::__construct($auth); |
17 | 17 |
@@ -9,21 +9,21 @@ discard block |
||
9 | 9 | * @param callable|null $callback |
10 | 10 | * @return mixed|null |
11 | 11 | */ |
12 | - protected function checkParamsViaAvailability($data,callable $callback=null) |
|
12 | + protected function checkParamsViaAvailability($data, callable $callback = null) |
|
13 | 13 | { |
14 | - if(is_callable($data) && is_null($callback)){ |
|
14 | + if (is_callable($data) && is_null($callback)) { |
|
15 | 15 | |
16 | 16 | // if an authenticate is provided via the existing check method, |
17 | 17 | // then we return the value of the data that we are checking for with callback help. |
18 | - if($this->check()){ |
|
18 | + if ($this->check()) { |
|
19 | 19 | return call_user_func($data); |
20 | 20 | } |
21 | 21 | } |
22 | 22 | |
23 | 23 | // if an authenticate is provided via the existing check method, |
24 | 24 | // then we return the value of the data that we are checking for with callback help. |
25 | - if($this->check() && isset($this->params[$data])){ |
|
26 | - return call_user_func_array($callback,[$this->params[$data]]); |
|
25 | + if ($this->check() && isset($this->params[$data])) { |
|
26 | + return call_user_func_array($callback, [$this->params[$data]]); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | return null; |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | |
39 | 39 | // we will determine whether |
40 | 40 | // the http path is correct for this method. |
41 | - if(isset($getHttp[$type]) and $getHttp[$type]!==httpMethod()){ |
|
41 | + if (isset($getHttp[$type]) and $getHttp[$type]!==httpMethod()) { |
|
42 | 42 | $this->getExceptionForHttp($getHttp[$type]); |
43 | 43 | } |
44 | 44 | } |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | { |
51 | 51 | // if there is a token in the headers, |
52 | 52 | // we return the callback. |
53 | - if(!is_null($this->getTokenSentByUser())){ |
|
54 | - return call_user_func_array($callback,[$this->getTokenSentByUser()]); |
|
53 | + if (!is_null($this->getTokenSentByUser())) { |
|
54 | + return call_user_func_array($callback, [$this->getTokenSentByUser()]); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | //token false |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | /** |
8 | 8 | * @var null |
9 | 9 | */ |
10 | - public $credentialHash=null; |
|
10 | + public $credentialHash = null; |
|
11 | 11 | |
12 | 12 | /** |
13 | 13 | * @return string |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | { |
17 | 17 | // the absolute params property must be present |
18 | 18 | // in the object and the params value must be the builder key. |
19 | - if(property_exists($this,'params') and isset($this->params['builder'])){ |
|
19 | + if (property_exists($this, 'params') and isset($this->params['builder'])) { |
|
20 | 20 | |
21 | 21 | // a real token will be generated after |
22 | 22 | // you get the first method of the query builder value. |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | |
25 | 25 | // we refer to the token closure feature on the config to enable |
26 | 26 | // the creation of user-based tokens on the application side. |
27 | - return $this->getTokenFromProvider($authData,function() use($authData){ |
|
27 | + return $this->getTokenFromProvider($authData, function() use($authData){ |
|
28 | 28 | return md5(sha1($authData->id.'__'.$this->credentialHash.'__'.time().'__'.fingerPrint())); |
29 | 29 | }); |
30 | 30 | } |
@@ -37,11 +37,11 @@ discard block |
||
37 | 37 | * @param callable $callback |
38 | 38 | * @return mixed |
39 | 39 | */ |
40 | - private function getTokenFromProvider($authData,callable $callback) |
|
40 | + private function getTokenFromProvider($authData, callable $callback) |
|
41 | 41 | { |
42 | 42 | // if the token value is a closure value, |
43 | 43 | // we will run a user-based token closure. |
44 | - if(app()->has('authenticate.token') && is_callable($token = app()->get('authenticate.token'))){ |
|
44 | + if (app()->has('authenticate.token') && is_callable($token = app()->get('authenticate.token'))) { |
|
45 | 45 | return $token($authData); |
46 | 46 | } |
47 | 47 |
@@ -19,19 +19,19 @@ discard block |
||
19 | 19 | * @param $command |
20 | 20 | * @param $args |
21 | 21 | */ |
22 | - public function __construct($app,$command,$args) |
|
22 | + public function __construct($app, $command, $args) |
|
23 | 23 | { |
24 | 24 | parent::__construct($app); |
25 | 25 | |
26 | 26 | $this->arguments[] = 'php'; |
27 | 27 | $this->arguments[] = 'api'; |
28 | - $this->arguments = array_merge($this->arguments,explode(" ",$command)); |
|
28 | + $this->arguments = array_merge($this->arguments, explode(" ", $command)); |
|
29 | 29 | $this->arguments[] = strtolower(app); |
30 | 30 | |
31 | - $argsList = explode(' ',$args); |
|
31 | + $argsList = explode(' ', $args); |
|
32 | 32 | |
33 | 33 | foreach ($argsList as $item) { |
34 | - $this->arguments[] = $item; |
|
34 | + $this->arguments[] = $item; |
|
35 | 35 | } |
36 | 36 | } |
37 | 37 | |
@@ -42,11 +42,11 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function handle() |
44 | 44 | { |
45 | - $process = new ProcessHandler($this->arguments,root.''); |
|
45 | + $process = new ProcessHandler($this->arguments, root.''); |
|
46 | 46 | $process->start(); |
47 | 47 | |
48 | 48 | foreach ($process as $type => $data) { |
49 | - if ($process::OUT !== $type) { |
|
49 | + if ($process::OUT!==$type) { |
|
50 | 50 | return false; |
51 | 51 | } |
52 | 52 | return true; |
@@ -55,7 +55,9 @@ |
||
55 | 55 | |
56 | 56 | $patternCount = $this->getPatternRealCount($pattern); |
57 | 57 | |
58 | - if(count($urlRoute)==0 && count($urlRoute)==0) return array_key_first($patternList); |
|
58 | + if(count($urlRoute)==0 && count($urlRoute)==0) { |
|
59 | + return array_key_first($patternList); |
|
60 | + } |
|
59 | 61 | |
60 | 62 | if(isset($patternCount['optional'])){ |
61 | 63 | $optionalCount = count($patternCount['default']) + count($patternCount['optional']); |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | * @param ApplicationContracts $app |
19 | 19 | * @param null|object $route |
20 | 20 | */ |
21 | - public function __construct(ApplicationContracts $app, $route=null) |
|
21 | + public function __construct(ApplicationContracts $app, $route = null) |
|
22 | 22 | { |
23 | 23 | parent::__construct($app); |
24 | 24 | |
@@ -34,53 +34,53 @@ discard block |
||
34 | 34 | { |
35 | 35 | $routes = $this->route->getRoutes(); |
36 | 36 | |
37 | - if(!isset($routes['pattern'])){ |
|
37 | + if (!isset($routes['pattern'])) { |
|
38 | 38 | return []; |
39 | 39 | } |
40 | 40 | |
41 | 41 | $patterns = $routes['pattern']; |
42 | - $urlRoute = array_filter(route(),'strlen'); |
|
42 | + $urlRoute = array_filter(route(), 'strlen'); |
|
43 | 43 | |
44 | 44 | $patternList = []; |
45 | 45 | |
46 | - foreach($routes['data'] as $patternKey=>$routeData){ |
|
47 | - if($routeData['http']==httpMethod()){ |
|
48 | - $patternList[$patternKey]=$patterns[$patternKey]; |
|
46 | + foreach ($routes['data'] as $patternKey=>$routeData) { |
|
47 | + if ($routeData['http']==httpMethod()) { |
|
48 | + $patternList[$patternKey] = $patterns[$patternKey]; |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | |
52 | 52 | $scoredList = []; |
53 | 53 | |
54 | - foreach ($patternList as $key=>$pattern){ |
|
54 | + foreach ($patternList as $key=>$pattern) { |
|
55 | 55 | |
56 | 56 | $patternCount = $this->getPatternRealCount($pattern); |
57 | 57 | |
58 | - if(count($urlRoute)==0 && count($urlRoute)==0) return array_key_first($patternList); |
|
58 | + if (count($urlRoute)==0 && count($urlRoute)==0) return array_key_first($patternList); |
|
59 | 59 | |
60 | - if(isset($patternCount['optional'])){ |
|
61 | - $optionalCount = count($patternCount['default']) + count($patternCount['optional']); |
|
60 | + if (isset($patternCount['optional'])) { |
|
61 | + $optionalCount = count($patternCount['default'])+count($patternCount['optional']); |
|
62 | 62 | } |
63 | 63 | |
64 | - if(count($urlRoute) == count($patternCount['default']) || |
|
64 | + if (count($urlRoute)==count($patternCount['default']) || |
|
65 | 65 | (isset($optionalCount) && count($urlRoute)>count($patternCount['default']) && $optionalCount>=count($urlRoute)) |
66 | - ){ |
|
66 | + ) { |
|
67 | 67 | |
68 | - foreach ($pattern as $pkey=>$item){ |
|
68 | + foreach ($pattern as $pkey=>$item) { |
|
69 | 69 | |
70 | - if($this->route->isMatchVaribleRegexPattern($item)===false){ |
|
71 | - if(isset($urlRoute[$pkey]) && $urlRoute[$pkey]==$item){ |
|
70 | + if ($this->route->isMatchVaribleRegexPattern($item)===false) { |
|
71 | + if (isset($urlRoute[$pkey]) && $urlRoute[$pkey]==$item) { |
|
72 | 72 | $scoredList[$key][] = 3; |
73 | 73 | } |
74 | 74 | } |
75 | 75 | |
76 | - if($this->route->isMatchVaribleRegexPattern($item) && !$this->route->isOptionalVaribleRegexPattern($item)){ |
|
77 | - if(isset($urlRoute[$pkey])){ |
|
76 | + if ($this->route->isMatchVaribleRegexPattern($item) && !$this->route->isOptionalVaribleRegexPattern($item)) { |
|
77 | + if (isset($urlRoute[$pkey])) { |
|
78 | 78 | $scoredList[$key][] = 2; |
79 | 79 | } |
80 | 80 | } |
81 | 81 | |
82 | - if($this->route->isMatchVaribleRegexPattern($item) && $this->route->isOptionalVaribleRegexPattern($item)){ |
|
83 | - if(isset($urlRoute[$pkey])){ |
|
82 | + if ($this->route->isMatchVaribleRegexPattern($item) && $this->route->isOptionalVaribleRegexPattern($item)) { |
|
83 | + if (isset($urlRoute[$pkey])) { |
|
84 | 84 | $scoredList[$key][] = 1; |
85 | 85 | } |
86 | 86 | } |
@@ -104,14 +104,14 @@ discard block |
||
104 | 104 | $list = []; |
105 | 105 | $list['default'] = []; |
106 | 106 | |
107 | - foreach ($pattern as $key=>$value){ |
|
108 | - if(($this->route->isMatchVaribleRegexPattern($value)===false) || ($this->route->isMatchVaribleRegexPattern($value) |
|
109 | - && !$this->route->isOptionalVaribleRegexPattern($value))){ |
|
107 | + foreach ($pattern as $key=>$value) { |
|
108 | + if (($this->route->isMatchVaribleRegexPattern($value)===false) || ($this->route->isMatchVaribleRegexPattern($value) |
|
109 | + && !$this->route->isOptionalVaribleRegexPattern($value))) { |
|
110 | 110 | $list['default'][$key] = $value; |
111 | 111 | } |
112 | 112 | |
113 | - if(($this->route->isMatchVaribleRegexPattern($value) |
|
114 | - && $this->route->isOptionalVaribleRegexPattern($value))){ |
|
113 | + if (($this->route->isMatchVaribleRegexPattern($value) |
|
114 | + && $this->route->isOptionalVaribleRegexPattern($value))) { |
|
115 | 115 | $list['optional'][] = true; |
116 | 116 | } |
117 | 117 | } |
@@ -125,19 +125,19 @@ discard block |
||
125 | 125 | * @param array $scoredList |
126 | 126 | * @return false|int|string |
127 | 127 | */ |
128 | - private function showKeyAccordingToScoredList($scoredList=array()) |
|
128 | + private function showKeyAccordingToScoredList($scoredList = array()) |
|
129 | 129 | { |
130 | 130 | $scored = []; |
131 | 131 | |
132 | - foreach($scoredList as $key=>$item){ |
|
132 | + foreach ($scoredList as $key=>$item) { |
|
133 | 133 | $scored[$key] = array_sum($item); |
134 | 134 | } |
135 | 135 | |
136 | - if(count($scored)){ |
|
136 | + if (count($scored)) { |
|
137 | 137 | $arrayCountValues = array_count_values($scored); |
138 | 138 | |
139 | - if($arrayCountValues[max($scored)]==1){ |
|
140 | - return array_search(max($scored),$scored); |
|
139 | + if ($arrayCountValues[max($scored)]==1) { |
|
140 | + return array_search(max($scored), $scored); |
|
141 | 141 | } |
142 | 142 | } |
143 | 143 | |
@@ -156,8 +156,8 @@ discard block |
||
156 | 156 | $route = route(); |
157 | 157 | |
158 | 158 | foreach ($pattern as $key=>$item) { |
159 | - if($this->route->isMatchVaribleRegexPattern($item)===false){ |
|
160 | - if(isset($route[$key]) && $item!==$route[$key]){ |
|
159 | + if ($this->route->isMatchVaribleRegexPattern($item)===false) { |
|
160 | + if (isset($route[$key]) && $item!==$route[$key]) { |
|
161 | 161 | return false; |
162 | 162 | } |
163 | 163 | } |
@@ -36,11 +36,11 @@ discard block |
||
36 | 36 | * @param null|string $method |
37 | 37 | * @return array |
38 | 38 | */ |
39 | - public static function getRoutes($method=null) : array |
|
39 | + public static function getRoutes($method = null) : array |
|
40 | 40 | { |
41 | 41 | // it collects and |
42 | 42 | // executes route data in an array. |
43 | - if(is_null($method)){ |
|
43 | + if (is_null($method)) { |
|
44 | 44 | return static::$routes; |
45 | 45 | } |
46 | 46 | |
@@ -48,16 +48,16 @@ discard block |
||
48 | 48 | |
49 | 49 | $routes = self::getRoutes(); |
50 | 50 | |
51 | - if(isset($routes['data'])){ |
|
52 | - foreach ($routes['data'] as $key=>$item){ |
|
53 | - if($item['http']==httpMethod()){ |
|
51 | + if (isset($routes['data'])) { |
|
52 | + foreach ($routes['data'] as $key=>$item) { |
|
53 | + if ($item['http']==httpMethod()) { |
|
54 | 54 | $httpRouteList['data'][$key] = $item; |
55 | 55 | } |
56 | 56 | } |
57 | 57 | } |
58 | 58 | |
59 | - if(isset($routes['pattern'],$httpRouteList['data'])){ |
|
60 | - foreach ($httpRouteList['data'] as $key=>$item){ |
|
59 | + if (isset($routes['pattern'], $httpRouteList['data'])) { |
|
60 | + foreach ($httpRouteList['data'] as $key=>$item) { |
|
61 | 61 | $httpRouteList['pattern'][$key] = $routes['pattern'][$key]; |
62 | 62 | } |
63 | 63 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | { |
75 | 75 | // detects where the route path is coming from |
76 | 76 | // and returns this data in the static path. |
77 | - $trace = Utils::trace(2,'file'); |
|
77 | + $trace = Utils::trace(2, 'file'); |
|
78 | 78 | |
79 | 79 | // the trace is returned if the variable is available |
80 | 80 | // in the path data, otherwise it returns null. |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | foreach ($array as $values) { |
46 | 46 | if ($values instanceof Collection) { |
47 | 47 | $values = $values->all(); |
48 | - } elseif (! is_array($values)) { |
|
48 | + } elseif (!is_array($values)) { |
|
49 | 49 | continue; |
50 | 50 | } |
51 | 51 | $results = array_merge($results, $values); |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | { |
95 | 95 | $results = []; |
96 | 96 | foreach ($array as $key => $value) { |
97 | - if (is_array($value) && ! empty($value)) { |
|
97 | + if (is_array($value) && !empty($value)) { |
|
98 | 98 | $results = array_merge($results, static::dot($value, $prepend.$key.'.')); |
99 | 99 | } else { |
100 | 100 | $results[$prepend.$key] = $value; |
@@ -180,12 +180,12 @@ discard block |
||
180 | 180 | $result = []; |
181 | 181 | foreach ($array as $item) { |
182 | 182 | $item = $item instanceof Collection ? $item->all() : $item; |
183 | - if (! is_array($item)) { |
|
183 | + if (!is_array($item)) { |
|
184 | 184 | $result[] = $item; |
185 | - } elseif ($depth === 1) { |
|
185 | + } elseif ($depth===1) { |
|
186 | 186 | $result = array_merge($result, array_values($item)); |
187 | 187 | } else { |
188 | - $result = array_merge($result, static::flatten($item, $depth - 1)); |
|
188 | + $result = array_merge($result, static::flatten($item, $depth-1)); |
|
189 | 189 | } |
190 | 190 | } |
191 | 191 | return $result; |
@@ -200,8 +200,8 @@ discard block |
||
200 | 200 | public static function forget(&$array, $keys) |
201 | 201 | { |
202 | 202 | $original = &$array; |
203 | - $keys = (array) $keys; |
|
204 | - if (count($keys) === 0) { |
|
203 | + $keys = (array)$keys; |
|
204 | + if (count($keys)===0) { |
|
205 | 205 | return; |
206 | 206 | } |
207 | 207 | foreach ($keys as $key) { |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | $parts = explode('.', $key); |
214 | 214 | // clean up before each pass |
215 | 215 | $array = &$original; |
216 | - while (count($parts) > 1) { |
|
216 | + while (count($parts)>1) { |
|
217 | 217 | $part = array_shift($parts); |
218 | 218 | if (isset($array[$part]) && is_array($array[$part])) { |
219 | 219 | $array = &$array[$part]; |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | */ |
235 | 235 | public static function get($array, $key, $default = null) |
236 | 236 | { |
237 | - if (! static::accessible($array)) { |
|
237 | + if (!static::accessible($array)) { |
|
238 | 238 | return value($default); |
239 | 239 | } |
240 | 240 | if (is_null($key)) { |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | if (static::exists($array, $key)) { |
244 | 244 | return $array[$key]; |
245 | 245 | } |
246 | - if (strpos($key, '.') === false) { |
|
246 | + if (strpos($key, '.')===false) { |
|
247 | 247 | return $array[$key] ?? value($default); |
248 | 248 | } |
249 | 249 | foreach (explode('.', $key) as $segment) { |
@@ -267,11 +267,11 @@ discard block |
||
267 | 267 | if (is_null($keys)) { |
268 | 268 | return false; |
269 | 269 | } |
270 | - $keys = (array) $keys; |
|
271 | - if (! $array) { |
|
270 | + $keys = (array)$keys; |
|
271 | + if (!$array) { |
|
272 | 272 | return false; |
273 | 273 | } |
274 | - if ($keys === []) { |
|
274 | + if ($keys===[]) { |
|
275 | 275 | return false; |
276 | 276 | } |
277 | 277 | foreach ($keys as $key) { |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | public static function isAssoc(array $array) |
301 | 301 | { |
302 | 302 | $keys = array_keys($array); |
303 | - return array_keys($keys) !== $keys; |
|
303 | + return array_keys($keys)!==$keys; |
|
304 | 304 | } |
305 | 305 | /** |
306 | 306 | * Get a subset of the items from the given array. |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | */ |
312 | 312 | public static function only($array, $keys) |
313 | 313 | { |
314 | - return array_intersect_key($array, array_flip((array) $keys)); |
|
314 | + return array_intersect_key($array, array_flip((array)$keys)); |
|
315 | 315 | } |
316 | 316 | /** |
317 | 317 | * Pluck an array of values from an array. |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | } else { |
336 | 336 | $itemKey = data_get($item, $key); |
337 | 337 | if (is_object($itemKey) && method_exists($itemKey, '__toString')) { |
338 | - $itemKey = (string) $itemKey; |
|
338 | + $itemKey = (string)$itemKey; |
|
339 | 339 | } |
340 | 340 | $results[$itemKey] = $itemValue; |
341 | 341 | } |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | if (is_null($key)) { |
369 | 369 | array_unshift($array, $value); |
370 | 370 | } else { |
371 | - $array = [$key => $value] + $array; |
|
371 | + $array = [$key => $value]+$array; |
|
372 | 372 | } |
373 | 373 | return $array; |
374 | 374 | } |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | { |
400 | 400 | $requested = is_null($number) ? 1 : $number; |
401 | 401 | $count = count($array); |
402 | - if ($requested > $count) { |
|
402 | + if ($requested>$count) { |
|
403 | 403 | throw new InvalidArgumentException( |
404 | 404 | "You requested {$requested} items, but there are only {$count} items available." |
405 | 405 | ); |
@@ -407,12 +407,12 @@ discard block |
||
407 | 407 | if (is_null($number)) { |
408 | 408 | return $array[array_rand($array)]; |
409 | 409 | } |
410 | - if ((int) $number === 0) { |
|
410 | + if ((int)$number===0) { |
|
411 | 411 | return []; |
412 | 412 | } |
413 | 413 | $keys = array_rand($array, $number); |
414 | 414 | $results = []; |
415 | - foreach ((array) $keys as $key) { |
|
415 | + foreach ((array)$keys as $key) { |
|
416 | 416 | $results[] = $array[$key]; |
417 | 417 | } |
418 | 418 | return $results; |
@@ -433,12 +433,12 @@ discard block |
||
433 | 433 | return $array = $value; |
434 | 434 | } |
435 | 435 | $keys = explode('.', $key); |
436 | - while (count($keys) > 1) { |
|
436 | + while (count($keys)>1) { |
|
437 | 437 | $key = array_shift($keys); |
438 | 438 | // If the key doesn't exist at this depth, we will just create an empty array |
439 | 439 | // to hold the next value, allowing us to create the arrays to hold final |
440 | 440 | // values at the correct depth. Then we'll keep digging into the array. |
441 | - if (! isset($array[$key]) || ! is_array($array[$key])) { |
|
441 | + if (!isset($array[$key]) || !is_array($array[$key])) { |
|
442 | 442 | $array[$key] = []; |
443 | 443 | } |
444 | 444 | $array = &$array[$key]; |
@@ -459,7 +459,7 @@ discard block |
||
459 | 459 | shuffle($array); |
460 | 460 | } else { |
461 | 461 | srand($seed); |
462 | - usort($array, function () { |
|
462 | + usort($array, function() { |
|
463 | 463 | return rand(-1, 1); |
464 | 464 | }); |
465 | 465 | } |
@@ -536,16 +536,16 @@ discard block |
||
536 | 536 | * @param array $referenceArray |
537 | 537 | * @return array |
538 | 538 | */ |
539 | - public static function removeSameValues($removeArray=array(),$referenceArray=array()) |
|
539 | + public static function removeSameValues($removeArray = array(), $referenceArray = array()) |
|
540 | 540 | { |
541 | 541 | $list = []; |
542 | 542 | |
543 | - foreach ($removeArray as $remove){ |
|
544 | - if(!in_array($remove,$referenceArray)){ |
|
545 | - $list[]=$remove; |
|
543 | + foreach ($removeArray as $remove) { |
|
544 | + if (!in_array($remove, $referenceArray)) { |
|
545 | + $list[] = $remove; |
|
546 | 546 | } |
547 | 547 | } |
548 | - return array_merge($referenceArray,$list); |
|
548 | + return array_merge($referenceArray, $list); |
|
549 | 549 | } |
550 | 550 | |
551 | 551 | /** |
@@ -553,9 +553,9 @@ discard block |
||
553 | 553 | * @param $key |
554 | 554 | * @return null |
555 | 555 | */ |
556 | - public static function isset($array,$key) |
|
556 | + public static function isset($array, $key) |
|
557 | 557 | { |
558 | - if(isset($array[$key])){ |
|
558 | + if (isset($array[$key])) { |
|
559 | 559 | return $array[$key]; |
560 | 560 | } |
561 | 561 | return null; |
@@ -566,13 +566,13 @@ discard block |
||
566 | 566 | * @param null $withKey |
567 | 567 | * @return bool |
568 | 568 | */ |
569 | - public static function isArrayWithCount($array,$withKey=null) |
|
569 | + public static function isArrayWithCount($array, $withKey = null) |
|
570 | 570 | { |
571 | - if($withKey===null){ |
|
571 | + if ($withKey===null) { |
|
572 | 572 | return is_array($array) && count($array); |
573 | 573 | } |
574 | 574 | |
575 | - return isset($array[$withKey]) && self::isArrayWithCount($array[$withKey],null); |
|
575 | + return isset($array[$withKey]) && self::isArrayWithCount($array[$withKey], null); |
|
576 | 576 | } |
577 | 577 | |
578 | 578 | /** |
@@ -580,12 +580,12 @@ discard block |
||
580 | 580 | * @param $array2 |
581 | 581 | * @return int |
582 | 582 | */ |
583 | - public static function arrayDiffKey($array1,$array2) |
|
583 | + public static function arrayDiffKey($array1, $array2) |
|
584 | 584 | { |
585 | - $forArray1 = array_diff_key($array1,$array2); |
|
586 | - $forArray2 = array_diff_key($array2,$array1); |
|
585 | + $forArray1 = array_diff_key($array1, $array2); |
|
586 | + $forArray2 = array_diff_key($array2, $array1); |
|
587 | 587 | |
588 | - if(count($forArray1)=="0" && count($forArray2)=="0"){ |
|
588 | + if (count($forArray1)=="0" && count($forArray2)=="0") { |
|
589 | 589 | return true; |
590 | 590 | } |
591 | 591 | return false; |
@@ -597,12 +597,12 @@ discard block |
||
597 | 597 | * @param $original |
598 | 598 | * @param array $overwrite |
599 | 599 | */ |
600 | - public static function overwriteWith($original,$overwrite=array()) |
|
600 | + public static function overwriteWith($original, $overwrite = array()) |
|
601 | 601 | { |
602 | - foreach ($original as $key=>$item){ |
|
602 | + foreach ($original as $key=>$item) { |
|
603 | 603 | |
604 | - if(array_key_exists($key,$overwrite)){ |
|
605 | - array_splice($original,$key,0,$overwrite[$key]); |
|
604 | + if (array_key_exists($key, $overwrite)) { |
|
605 | + array_splice($original, $key, 0, $overwrite[$key]); |
|
606 | 606 | } |
607 | 607 | } |
608 | 608 | |
@@ -616,12 +616,12 @@ discard block |
||
616 | 616 | * @param array $remove |
617 | 617 | * @return array |
618 | 618 | */ |
619 | - public static function removeKey($data,$remove=array()) |
|
619 | + public static function removeKey($data, $remove = array()) |
|
620 | 620 | { |
621 | 621 | $list = []; |
622 | 622 | |
623 | - foreach($data as $key=>$value){ |
|
624 | - if(!in_array($key,$remove)){ |
|
623 | + foreach ($data as $key=>$value) { |
|
624 | + if (!in_array($key, $remove)) { |
|
625 | 625 | $list[$key] = $value; |
626 | 626 | } |
627 | 627 | } |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | |
54 | 54 | // with query we bind the returned values to the params property of the auth object. |
55 | 55 | // and so the auth object will make a final return with these values. |
56 | - $this->paramValues('check',$query); |
|
56 | + $this->paramValues('check', $query); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | /** |
@@ -66,16 +66,16 @@ discard block |
||
66 | 66 | { |
67 | 67 | // using the driver object we write the query builder statement. |
68 | 68 | // we do the values of the query with the credentials that are sent. |
69 | - if(!is_null($provider = $this->auth->provider('login'))){ |
|
69 | + if (!is_null($provider = $this->auth->provider('login'))) { |
|
70 | 70 | $query = $provider($credentials->get()); |
71 | 71 | } |
72 | - else{ |
|
72 | + else { |
|
73 | 73 | $query = $this->setQuery($credentials); |
74 | 74 | } |
75 | 75 | |
76 | 76 | // with query we bind the returned values to the params property of the auth object. |
77 | 77 | // and so the auth object will make a final return with these values. |
78 | - $this->paramValues('login',$query); |
|
78 | + $this->paramValues('login', $query); |
|
79 | 79 | |
80 | 80 | // we assign the credential hash value |
81 | 81 | // to the global of the authenticate object. |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | // we update the token value. |
86 | 86 | $this->updateToken(); |
87 | 87 | |
88 | - if(isset($this->auth->params['authToken'])){ |
|
88 | + if (isset($this->auth->params['authToken'])) { |
|
89 | 89 | $this->saveDeviceToken(); |
90 | 90 | } |
91 | 91 | } |
@@ -104,18 +104,18 @@ discard block |
||
104 | 104 | |
105 | 105 | // with query we bind the returned values to the params property of the auth object. |
106 | 106 | // and so the auth object will make a final return with these values. |
107 | - $this->paramValues('logout',$query); |
|
107 | + $this->paramValues('logout', $query); |
|
108 | 108 | |
109 | 109 | //token updating as null |
110 | - if(isset($this->auth->params['authToken'])){ |
|
111 | - if(!$this->deleteDeviceToken()){ |
|
110 | + if (isset($this->auth->params['authToken'])) { |
|
111 | + if (!$this->deleteDeviceToken()) { |
|
112 | 112 | $this->auth->params['status'] = 0; |
113 | 113 | $this->auth->params['exception'] = 'logoutInternal'; |
114 | 114 | return false; |
115 | 115 | } |
116 | 116 | } |
117 | 117 | |
118 | - if($this->auth->params['status']===0){ |
|
118 | + if ($this->auth->params['status']===0) { |
|
119 | 119 | $this->auth->params['exception'] = 'logoutException'; |
120 | 120 | } |
121 | 121 | } |
@@ -68,8 +68,7 @@ |
||
68 | 68 | // we do the values of the query with the credentials that are sent. |
69 | 69 | if(!is_null($provider = $this->auth->provider('login'))){ |
70 | 70 | $query = $provider($credentials->get()); |
71 | - } |
|
72 | - else{ |
|
71 | + } else{ |
|
73 | 72 | $query = $this->setQuery($credentials); |
74 | 73 | } |
75 | 74 |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | { |
52 | 52 | $userId = $manager->getAuth()->params['userId']; |
53 | 53 | |
54 | - return DeviceToken::where('user_id',$userId)->get(); |
|
54 | + return DeviceToken::where('user_id', $userId)->get(); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | /** |
@@ -64,8 +64,8 @@ discard block |
||
64 | 64 | return DeviceToken::where(function($query) use($token) { |
65 | 65 | |
66 | 66 | //where query for token |
67 | - $query->where('token_integer',crc32(md5($token))); |
|
68 | - $query->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT']))); |
|
67 | + $query->where('token_integer', crc32(md5($token))); |
|
68 | + $query->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT']))); |
|
69 | 69 | }); |
70 | 70 | } |
71 | 71 | |
@@ -79,8 +79,8 @@ discard block |
||
79 | 79 | return DeviceToken::where(function($query) use($token) { |
80 | 80 | |
81 | 81 | //where query for token |
82 | - $query->where('token_integer',crc32(md5($token))); |
|
83 | - $query->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT']))); |
|
82 | + $query->where('token_integer', crc32(md5($token))); |
|
83 | + $query->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT']))); |
|
84 | 84 | |
85 | 85 | }); |
86 | 86 | } |
@@ -91,23 +91,23 @@ discard block |
||
91 | 91 | * @param null|object $query |
92 | 92 | * @return mixed |
93 | 93 | */ |
94 | - protected function checkPasswordVerify($query=null) |
|
94 | + protected function checkPasswordVerify($query = null) |
|
95 | 95 | { |
96 | - if(is_null($query) && isset($this->credentials['password'])){ |
|
97 | - if(!is_null($password = $this->auth->provider('password')) |
|
98 | - && $password($this->credentials['password'])=='verify'){ |
|
96 | + if (is_null($query) && isset($this->credentials['password'])) { |
|
97 | + if (!is_null($password = $this->auth->provider('password')) |
|
98 | + && $password($this->credentials['password'])=='verify') { |
|
99 | 99 | |
100 | 100 | $this->password = $this->credentials['password']; |
101 | 101 | $this->passwordVerify = true; |
102 | - $this->credentials = Arr::removeKey($this->credentials,['password']); |
|
102 | + $this->credentials = Arr::removeKey($this->credentials, ['password']); |
|
103 | 103 | |
104 | 104 | return null; |
105 | 105 | } |
106 | 106 | } |
107 | 107 | |
108 | - if(is_object($query) && $query->count()){ |
|
108 | + if (is_object($query) && $query->count()) { |
|
109 | 109 | $password = $query->first()->password; |
110 | - if(password_verify($this->password,$password)){ |
|
110 | + if (password_verify($this->password, $password)) { |
|
111 | 111 | return $query; |
112 | 112 | } |
113 | 113 | } |
@@ -137,24 +137,24 @@ discard block |
||
137 | 137 | |
138 | 138 | // with the callback method (eloquent model) |
139 | 139 | // we write the where clause. |
140 | - foreach ($this->credentials as $credential=>$credentialValue){ |
|
140 | + foreach ($this->credentials as $credential=>$credentialValue) { |
|
141 | 141 | |
142 | - if(!is_null($provider = $this->auth->provider($credential))){ |
|
143 | - $query->where($credential,$provider($credentialValue)); |
|
142 | + if (!is_null($provider = $this->auth->provider($credential))) { |
|
143 | + $query->where($credential, $provider($credentialValue)); |
|
144 | 144 | } |
145 | - else{ |
|
146 | - $query->where($credential,$credentialValue); |
|
145 | + else { |
|
146 | + $query->where($credential, $credentialValue); |
|
147 | 147 | } |
148 | 148 | } |
149 | 149 | |
150 | 150 | // for the authenticate query, |
151 | 151 | // the user can add additional queries by the service provider. |
152 | - if(!is_null($addQuery = $this->auth->provider('addQuery'))){ |
|
152 | + if (!is_null($addQuery = $this->auth->provider('addQuery'))) { |
|
153 | 153 | $addQuery($query); |
154 | 154 | } |
155 | 155 | }); |
156 | 156 | |
157 | - if(false === $this->passwordVerify){ |
|
157 | + if (false===$this->passwordVerify) { |
|
158 | 158 | return $query; |
159 | 159 | } |
160 | 160 | |
@@ -164,10 +164,10 @@ discard block |
||
164 | 164 | /** |
165 | 165 | * @return void|mixed |
166 | 166 | */ |
167 | - protected function updateToken($token=null) |
|
167 | + protected function updateToken($token = null) |
|
168 | 168 | { |
169 | 169 | //if query status value is true |
170 | - if($this->auth->params['status']){ |
|
170 | + if ($this->auth->params['status']) { |
|
171 | 171 | |
172 | 172 | // we go to the method that produces |
173 | 173 | // the classical token value and get the token value. |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | // if there is no update, we reset the status value to 0. |
178 | 178 | $update = $this->auth->params['builder']->update(['token'=>$this->auth->params['token']]); |
179 | 179 | |
180 | - if(!$update){ |
|
180 | + if (!$update) { |
|
181 | 181 | $this->auth->params['status'] = 0; |
182 | 182 | $this->auth->params['exception'] = 'update'; |
183 | 183 | } |
@@ -193,10 +193,10 @@ discard block |
||
193 | 193 | { |
194 | 194 | $token_integer = crc32(md5($this->auth->params['token'])); |
195 | 195 | |
196 | - if(!is_null($token_integer)){ |
|
196 | + if (!is_null($token_integer)) { |
|
197 | 197 | |
198 | - if(DeviceToken::where('user_id',$this->auth->params['authId']) |
|
199 | - ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))->count()==0){ |
|
198 | + if (DeviceToken::where('user_id', $this->auth->params['authId']) |
|
199 | + ->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])))->count()==0) { |
|
200 | 200 | |
201 | 201 | return DeviceToken::create([ |
202 | 202 | 'user_id' => $this->auth->params['authId'], |
@@ -207,10 +207,10 @@ discard block |
||
207 | 207 | 'expire' => $this->auth->getExpire(), |
208 | 208 | ]); |
209 | 209 | } |
210 | - else{ |
|
210 | + else { |
|
211 | 211 | |
212 | - return DeviceToken::where('user_id',$this->auth->params['authId']) |
|
213 | - ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT']))) |
|
212 | + return DeviceToken::where('user_id', $this->auth->params['authId']) |
|
213 | + ->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT']))) |
|
214 | 214 | ->update([ |
215 | 215 | 'token' => $this->auth->params['token'], |
216 | 216 | 'token_integer' => $token_integer |
@@ -230,11 +230,11 @@ discard block |
||
230 | 230 | { |
231 | 231 | $token_integer = crc32(md5($this->auth->getTokenSentByUser())); |
232 | 232 | |
233 | - if(!is_null($token_integer)){ |
|
233 | + if (!is_null($token_integer)) { |
|
234 | 234 | |
235 | - DeviceToken::where('token_integer',$token_integer)->delete(); |
|
235 | + DeviceToken::where('token_integer', $token_integer)->delete(); |
|
236 | 236 | |
237 | - return (DeviceToken::where('token_integer',$token_integer)->count()) ? false : true; |
|
237 | + return (DeviceToken::where('token_integer', $token_integer)->count()) ? false : true; |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | } |
@@ -141,8 +141,7 @@ discard block |
||
141 | 141 | |
142 | 142 | if(!is_null($provider = $this->auth->provider($credential))){ |
143 | 143 | $query->where($credential,$provider($credentialValue)); |
144 | - } |
|
145 | - else{ |
|
144 | + } else{ |
|
146 | 145 | $query->where($credential,$credentialValue); |
147 | 146 | } |
148 | 147 | } |
@@ -206,8 +205,7 @@ discard block |
||
206 | 205 | 'device_agent_integer' => crc32(md5($_SERVER['HTTP_USER_AGENT'])), |
207 | 206 | 'expire' => $this->auth->getExpire(), |
208 | 207 | ]); |
209 | - } |
|
210 | - else{ |
|
208 | + } else{ |
|
211 | 209 | |
212 | 210 | return DeviceToken::where('user_id',$this->auth->params['authId']) |
213 | 211 | ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT']))) |