@@ -13,5 +13,5 @@ |
||
13 | 13 | /** |
14 | 14 | * @var array |
15 | 15 | */ |
16 | - protected $fillable = ['user_id','token','token_integer','device_agent','device_agent_integer','expire']; |
|
16 | + protected $fillable = ['user_id', 'token', 'token_integer', 'device_agent', 'device_agent_integer', 'expire']; |
|
17 | 17 | } |
@@ -14,7 +14,7 @@ |
||
14 | 14 | * @param $auth |
15 | 15 | * @param $token |
16 | 16 | */ |
17 | - public function __construct($auth,$token) |
|
17 | + public function __construct($auth, $token) |
|
18 | 18 | { |
19 | 19 | parent::__construct($auth); |
20 | 20 |
@@ -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. |
@@ -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 |