@@ -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()) |
|
109 | + public function outputFormatter($data = array()) |
|
111 | 110 | { |
112 | 111 | $dataCapsule = config('response.data'); |
113 | 112 |
@@ -72,8 +72,7 @@ discard block |
||
72 | 72 | //catch exception |
73 | 73 | exception($this->exceptionParams[$key]['name'],$keyParams) |
74 | 74 | ->unexpectedValue($this->exceptionParams[$key]['name'].' input value is not valid as format ('.$data.')'); |
75 | - } |
|
76 | - else{ |
|
75 | + } else{ |
|
77 | 76 | //catch exception |
78 | 77 | exception()->unexpectedValue($key.' input value is not valid as format ('.$data.')'); |
79 | 78 | } |
@@ -136,16 +135,14 @@ discard block |
||
136 | 135 | } |
137 | 136 | } |
138 | 137 | |
139 | - } |
|
140 | - else{ |
|
138 | + } else{ |
|
141 | 139 | if(!preg_match('@'.$regex[1].'@is',$this->inputsValue)){ |
142 | 140 | $this->catchException($key,$regex[1]); |
143 | 141 | } |
144 | 142 | } |
145 | 143 | |
146 | 144 | } |
147 | - } |
|
148 | - else{ |
|
145 | + } else{ |
|
149 | 146 | |
150 | 147 | // we control the regex rule that evaluates when only string arrives. |
151 | 148 | if(!preg_match('@'.$regex[1].'@is',$this->inputs[$key])){ |
@@ -194,8 +191,7 @@ discard block |
||
194 | 191 | } |
195 | 192 | } |
196 | 193 | } |
197 | - } |
|
198 | - else{ |
|
194 | + } else{ |
|
199 | 195 | |
200 | 196 | foreach ($this->inputs[$key] as $key=>$input){ |
201 | 197 | |
@@ -208,8 +204,7 @@ discard block |
||
208 | 204 | } |
209 | 205 | } |
210 | 206 | } |
211 | - } |
|
212 | - else{ |
|
207 | + } else{ |
|
213 | 208 | |
214 | 209 | foreach ($input as $ikey=>$item){ |
215 | 210 | foreach($rules as $rule){ |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | * @param ApplicationContracts $app |
22 | 22 | * @param $request |
23 | 23 | */ |
24 | - public function __construct(ApplicationContracts $app,$request) |
|
24 | + public function __construct(ApplicationContracts $app, $request) |
|
25 | 25 | { |
26 | 26 | parent::__construct($app); |
27 | 27 | |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | * @param $key |
38 | 38 | * @return mixed|void |
39 | 39 | */ |
40 | - public function annotation($method,$key) |
|
40 | + public function annotation($method, $key) |
|
41 | 41 | { |
42 | 42 | //set annotation value with getting reflection |
43 | 43 | $reflection = $this->getReflection('reflection')->reflectionMethodParams($method); |
@@ -62,18 +62,18 @@ discard block |
||
62 | 62 | * @param string $key |
63 | 63 | * @param null|string $data |
64 | 64 | */ |
65 | - private function catchException($key,$data) |
|
65 | + private function catchException($key, $data) |
|
66 | 66 | { |
67 | - if(isset($this->exceptionParams[$key])){ |
|
67 | + if (isset($this->exceptionParams[$key])) { |
|
68 | 68 | |
69 | 69 | //get key params for exception params |
70 | 70 | $keyParams = ($this->exceptionParams[$key]['params']) ?? []; |
71 | 71 | |
72 | 72 | //catch exception |
73 | - exception($this->exceptionParams[$key]['name'],$keyParams) |
|
73 | + exception($this->exceptionParams[$key]['name'], $keyParams) |
|
74 | 74 | ->unexpectedValue($this->exceptionParams[$key]['name'].' input value is not valid as format ('.$data.')'); |
75 | 75 | } |
76 | - else{ |
|
76 | + else { |
|
77 | 77 | //catch exception |
78 | 78 | exception()->unexpectedValue($key.' input value is not valid as format ('.$data.')'); |
79 | 79 | } |
@@ -86,23 +86,23 @@ discard block |
||
86 | 86 | */ |
87 | 87 | private function getException($key) |
88 | 88 | { |
89 | - if(preg_match('@exception\((.*?)\)\r\n@is',$this->annotation,$exception)){ |
|
89 | + if (preg_match('@exception\((.*?)\)\r\n@is', $this->annotation, $exception)) { |
|
90 | 90 | |
91 | - $exceptionSpaceExplode = explode(" ",$exception[1]); |
|
91 | + $exceptionSpaceExplode = explode(" ", $exception[1]); |
|
92 | 92 | |
93 | - foreach ($exceptionSpaceExplode as $exceptions){ |
|
94 | - $exceptionsDotExplode = explode(":",$exceptions); |
|
93 | + foreach ($exceptionSpaceExplode as $exceptions) { |
|
94 | + $exceptionsDotExplode = explode(":", $exceptions); |
|
95 | 95 | $this->exceptionParams[$key][$exceptionsDotExplode[0]] = $exceptionsDotExplode[1]; |
96 | 96 | } |
97 | 97 | |
98 | - if(isset($this->exceptionParams[$key]['params'])){ |
|
98 | + if (isset($this->exceptionParams[$key]['params'])) { |
|
99 | 99 | |
100 | - $paramsCommaExplode = explode(",",$this->exceptionParams[$key]['params']); |
|
100 | + $paramsCommaExplode = explode(",", $this->exceptionParams[$key]['params']); |
|
101 | 101 | unset($this->exceptionParams[$key]['params']); |
102 | 102 | |
103 | - foreach ($paramsCommaExplode as $params){ |
|
104 | - $paramsEqualExplode = explode("=",$params); |
|
105 | - if(isset($paramsEqualExplode[0]) && isset($paramsEqualExplode[1])){ |
|
103 | + foreach ($paramsCommaExplode as $params) { |
|
104 | + $paramsEqualExplode = explode("=", $params); |
|
105 | + if (isset($paramsEqualExplode[0]) && isset($paramsEqualExplode[1])) { |
|
106 | 106 | $this->exceptionParams[$key]['params'][$paramsEqualExplode[0]] = $paramsEqualExplode[1]; |
107 | 107 | } |
108 | 108 | } |
@@ -119,37 +119,37 @@ discard block |
||
119 | 119 | { |
120 | 120 | // with the method based regex annotation, |
121 | 121 | // we check the rule definition for our requests. |
122 | - if(preg_match('@regex\((.*?)\)\r\n@is',$this->annotation,$regex)){ |
|
123 | - if(isset($this->inputs[$key])){ |
|
122 | + if (preg_match('@regex\((.*?)\)\r\n@is', $this->annotation, $regex)) { |
|
123 | + if (isset($this->inputs[$key])) { |
|
124 | 124 | |
125 | 125 | // for the definition of rules, |
126 | 126 | // our inputs can be array and in this case we offer array option for user comfort. |
127 | - if(is_array($this->inputs[$key])){ |
|
127 | + if (is_array($this->inputs[$key])) { |
|
128 | 128 | |
129 | - foreach ($this->inputs[$key] as $this->inputsKey => $this->inputsValue){ |
|
129 | + foreach ($this->inputs[$key] as $this->inputsKey => $this->inputsValue) { |
|
130 | 130 | |
131 | - if(is_array($this->inputsValue)){ |
|
131 | + if (is_array($this->inputsValue)) { |
|
132 | 132 | |
133 | - foreach ($this->inputsValue as $inputsValueKey => $inputsValueItem){ |
|
134 | - if(!preg_match('@'.$regex[1].'@is',$inputsValueItem)){ |
|
135 | - $this->catchException($key,$regex[1]); |
|
133 | + foreach ($this->inputsValue as $inputsValueKey => $inputsValueItem) { |
|
134 | + if (!preg_match('@'.$regex[1].'@is', $inputsValueItem)) { |
|
135 | + $this->catchException($key, $regex[1]); |
|
136 | 136 | } |
137 | 137 | } |
138 | 138 | |
139 | 139 | } |
140 | - else{ |
|
141 | - if(!preg_match('@'.$regex[1].'@is',$this->inputsValue)){ |
|
142 | - $this->catchException($key,$regex[1]); |
|
140 | + else { |
|
141 | + if (!preg_match('@'.$regex[1].'@is', $this->inputsValue)) { |
|
142 | + $this->catchException($key, $regex[1]); |
|
143 | 143 | } |
144 | 144 | } |
145 | 145 | |
146 | 146 | } |
147 | 147 | } |
148 | - else{ |
|
148 | + else { |
|
149 | 149 | |
150 | 150 | // we control the regex rule that evaluates when only string arrives. |
151 | - if(!preg_match('@'.$regex[1].'@is',$this->inputs[$key])){ |
|
152 | - $this->catchException($key,$regex[1]); |
|
151 | + if (!preg_match('@'.$regex[1].'@is', $this->inputs[$key])) { |
|
152 | + $this->catchException($key, $regex[1]); |
|
153 | 153 | } |
154 | 154 | } |
155 | 155 | } |
@@ -164,9 +164,9 @@ discard block |
||
164 | 164 | */ |
165 | 165 | private function getRemove($key) |
166 | 166 | { |
167 | - if(preg_match('@remove\((.*?)\)\r\n@is',$this->annotation,$remove)){ |
|
168 | - if(isset($this->inputs[$key])){ |
|
169 | - if(preg_match('@'.$remove[1].'@is',$this->inputs[$key])){ |
|
167 | + if (preg_match('@remove\((.*?)\)\r\n@is', $this->annotation, $remove)) { |
|
168 | + if (isset($this->inputs[$key])) { |
|
169 | + if (preg_match('@'.$remove[1].'@is', $this->inputs[$key])) { |
|
170 | 170 | unset($this->inputs[$key]); |
171 | 171 | } |
172 | 172 | } |
@@ -180,42 +180,42 @@ discard block |
||
180 | 180 | */ |
181 | 181 | private function getRules($key) |
182 | 182 | { |
183 | - if(preg_match('@rule\((.*?)\)|rule\((.*?)\)\r\n@is',$this->annotation,$rule)){ |
|
183 | + if (preg_match('@rule\((.*?)\)|rule\((.*?)\)\r\n@is', $this->annotation, $rule)) { |
|
184 | 184 | |
185 | 185 | $requestRules = $this->getReflection('rules'); |
186 | 186 | |
187 | - $rules = explode(":",$rule[1]); |
|
188 | - if(isset($this->inputs[$key]) && !is_array($this->inputs[$key])){ |
|
189 | - foreach($rules as $rule){ |
|
190 | - if(isset($requestRules[$rule])){ |
|
191 | - if(!preg_match('@'.$requestRules[$rule].'@',$this->inputs[$key])){ |
|
192 | - exception($rule,['key'=>$key]) |
|
187 | + $rules = explode(":", $rule[1]); |
|
188 | + if (isset($this->inputs[$key]) && !is_array($this->inputs[$key])) { |
|
189 | + foreach ($rules as $rule) { |
|
190 | + if (isset($requestRules[$rule])) { |
|
191 | + if (!preg_match('@'.$requestRules[$rule].'@', $this->inputs[$key])) { |
|
192 | + exception($rule, ['key'=>$key]) |
|
193 | 193 | ->invalidArgument($this->inputs[$key].' input value is not valid for '.$rule.' request rule'); |
194 | 194 | } |
195 | 195 | } |
196 | 196 | } |
197 | 197 | } |
198 | - else{ |
|
198 | + else { |
|
199 | 199 | |
200 | - foreach ($this->inputs[$key] as $key=>$input){ |
|
200 | + foreach ($this->inputs[$key] as $key=>$input) { |
|
201 | 201 | |
202 | - if(!is_array($input)){ |
|
203 | - foreach($rules as $rule){ |
|
204 | - if(isset($requestRules[$rule])){ |
|
205 | - if(!preg_match('@'.$requestRules[$rule].'@',$input)){ |
|
206 | - exception($rule,['key'=>$key]) |
|
202 | + if (!is_array($input)) { |
|
203 | + foreach ($rules as $rule) { |
|
204 | + if (isset($requestRules[$rule])) { |
|
205 | + if (!preg_match('@'.$requestRules[$rule].'@', $input)) { |
|
206 | + exception($rule, ['key'=>$key]) |
|
207 | 207 | ->invalidArgument($input.' input value is not valid for '.$rule.' request rule'); |
208 | 208 | } |
209 | 209 | } |
210 | 210 | } |
211 | 211 | } |
212 | - else{ |
|
212 | + else { |
|
213 | 213 | |
214 | - foreach ($input as $ikey=>$item){ |
|
215 | - foreach($rules as $rule){ |
|
216 | - if(isset($requestRules[$rule])){ |
|
217 | - if(!preg_match('@'.$requestRules[$rule].'@',$item)){ |
|
218 | - exception($rule,['key'=>$ikey]) |
|
214 | + foreach ($input as $ikey=>$item) { |
|
215 | + foreach ($rules as $rule) { |
|
216 | + if (isset($requestRules[$rule])) { |
|
217 | + if (!preg_match('@'.$requestRules[$rule].'@', $item)) { |
|
218 | + exception($rule, ['key'=>$ikey]) |
|
219 | 219 | ->invalidArgument($item.' input value is not valid for '.$rule.' request rule'); |
220 | 220 | } |
221 | 221 | } |
@@ -8,89 +8,89 @@ |
||
8 | 8 | * @param null|string $msg |
9 | 9 | * @return mixed |
10 | 10 | */ |
11 | - public function accessDeniedHttpException($msg=null); |
|
11 | + public function accessDeniedHttpException($msg = null); |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * @param null|string $msg |
15 | 15 | * @return mixed |
16 | 16 | */ |
17 | - public function invalidArgument($msg=null); |
|
17 | + public function invalidArgument($msg = null); |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * @param null|string $msg |
21 | 21 | * @return mixed |
22 | 22 | */ |
23 | - public function badFunctionCall($msg=null); |
|
23 | + public function badFunctionCall($msg = null); |
|
24 | 24 | |
25 | 25 | /** |
26 | 26 | * @param null|string $msg |
27 | 27 | * @return mixed |
28 | 28 | */ |
29 | - public function badMethodCall($msg=null); |
|
29 | + public function badMethodCall($msg = null); |
|
30 | 30 | |
31 | 31 | /** |
32 | 32 | * @param null|string $msg |
33 | 33 | * @return mixed |
34 | 34 | */ |
35 | - public function domain($msg=null); |
|
35 | + public function domain($msg = null); |
|
36 | 36 | |
37 | 37 | /** |
38 | 38 | * @param null|string $msg |
39 | 39 | * @return mixed |
40 | 40 | */ |
41 | - public function length($msg=null); |
|
41 | + public function length($msg = null); |
|
42 | 42 | |
43 | 43 | /** |
44 | 44 | * @param null|string $msg |
45 | 45 | * @return mixed |
46 | 46 | */ |
47 | - public function logic($msg=null); |
|
47 | + public function logic($msg = null); |
|
48 | 48 | |
49 | 49 | /** |
50 | 50 | * @param null|string $msg |
51 | 51 | * @return mixed |
52 | 52 | */ |
53 | - public function notFoundException($msg=null); |
|
53 | + public function notFoundException($msg = null); |
|
54 | 54 | |
55 | 55 | /** |
56 | 56 | * @param null|string $msg |
57 | 57 | * @return mixed |
58 | 58 | */ |
59 | - public function fileNotFoundException($msg=null); |
|
59 | + public function fileNotFoundException($msg = null); |
|
60 | 60 | |
61 | 61 | /** |
62 | 62 | * @param null|string $msg |
63 | 63 | * @return mixed |
64 | 64 | */ |
65 | - public function outOfRange($msg=null); |
|
65 | + public function outOfRange($msg = null); |
|
66 | 66 | |
67 | 67 | /** |
68 | 68 | * @param null|string $msg |
69 | 69 | * @return mixed |
70 | 70 | */ |
71 | - public function overflow($msg=null); |
|
71 | + public function overflow($msg = null); |
|
72 | 72 | |
73 | 73 | /** |
74 | 74 | * @param null|string $msg |
75 | 75 | * @return mixed |
76 | 76 | */ |
77 | - public function range($msg=null); |
|
77 | + public function range($msg = null); |
|
78 | 78 | |
79 | 79 | /** |
80 | 80 | * @param null|string $msg |
81 | 81 | * @return mixed |
82 | 82 | */ |
83 | - public function runtime($msg=null); |
|
83 | + public function runtime($msg = null); |
|
84 | 84 | |
85 | 85 | /** |
86 | 86 | * @param null|string $msg |
87 | 87 | * @return mixed |
88 | 88 | */ |
89 | - public function underflow($msg=null); |
|
89 | + public function underflow($msg = null); |
|
90 | 90 | |
91 | 91 | /** |
92 | 92 | * @param null|string $msg |
93 | 93 | * @return mixed |
94 | 94 | */ |
95 | - public function unexpectedValue($msg=null); |
|
95 | + public function unexpectedValue($msg = null); |
|
96 | 96 | } |
97 | 97 | \ No newline at end of file |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * @return null |
30 | 30 | * |
31 | 31 | */ |
32 | - public function accessDeniedHttpException($msg=null) |
|
32 | + public function accessDeniedHttpException($msg = null) |
|
33 | 33 | { |
34 | 34 | return $this->accessDeniedHttp($msg); |
35 | 35 | } |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | * |
40 | 40 | * @param null|string $msg |
41 | 41 | */ |
42 | - public function invalidArgument($msg=null) |
|
42 | + public function invalidArgument($msg = null) |
|
43 | 43 | { |
44 | 44 | throw new InvalidArgumentException($msg); |
45 | 45 | } |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | * |
50 | 50 | * @param null|string $msg |
51 | 51 | */ |
52 | - public function badFunctionCall($msg=null) |
|
52 | + public function badFunctionCall($msg = null) |
|
53 | 53 | { |
54 | 54 | throw new BadFunctionCallException($msg); |
55 | 55 | } |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | * |
60 | 60 | * @param null|string $msg |
61 | 61 | */ |
62 | - public function badMethodCall($msg=null) |
|
62 | + public function badMethodCall($msg = null) |
|
63 | 63 | { |
64 | 64 | throw new BadMethodCallException($msg); |
65 | 65 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * |
70 | 70 | * @param null|string $msg |
71 | 71 | */ |
72 | - public function domain($msg=null) |
|
72 | + public function domain($msg = null) |
|
73 | 73 | { |
74 | 74 | throw new DomainException($msg); |
75 | 75 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * |
80 | 80 | * @param null|string $msg |
81 | 81 | */ |
82 | - public function length($msg=null) |
|
82 | + public function length($msg = null) |
|
83 | 83 | { |
84 | 84 | throw new LengthException($msg); |
85 | 85 | } |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | * |
90 | 90 | * @param null|string $msg |
91 | 91 | */ |
92 | - public function logic($msg=null) |
|
92 | + public function logic($msg = null) |
|
93 | 93 | { |
94 | 94 | throw new LogicException($msg); |
95 | 95 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * @return null |
102 | 102 | * |
103 | 103 | */ |
104 | - public function notFoundException($msg=null) |
|
104 | + public function notFoundException($msg = null) |
|
105 | 105 | { |
106 | 106 | return $this->notFound($msg); |
107 | 107 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | * @return mixed|void |
114 | 114 | * |
115 | 115 | */ |
116 | - public function fileNotFoundException($msg=null) |
|
116 | + public function fileNotFoundException($msg = null) |
|
117 | 117 | { |
118 | 118 | return $this->fileNotFound($msg); |
119 | 119 | } |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | * |
124 | 124 | * @param null|string $msg |
125 | 125 | */ |
126 | - public function outOfRange($msg=null) |
|
126 | + public function outOfRange($msg = null) |
|
127 | 127 | { |
128 | 128 | throw new OutOfRangeException($msg); |
129 | 129 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | * |
134 | 134 | * @param null|string $msg |
135 | 135 | */ |
136 | - public function overflow($msg=null) |
|
136 | + public function overflow($msg = null) |
|
137 | 137 | { |
138 | 138 | throw new OverflowException($msg); |
139 | 139 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | * |
144 | 144 | * @param null|string $msg |
145 | 145 | */ |
146 | - public function range($msg=null) |
|
146 | + public function range($msg = null) |
|
147 | 147 | { |
148 | 148 | throw new RangeException($msg); |
149 | 149 | } |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | * |
154 | 154 | * @param null|string $msg |
155 | 155 | */ |
156 | - public function runtime($msg=null) |
|
156 | + public function runtime($msg = null) |
|
157 | 157 | { |
158 | 158 | throw new RuntimeException($msg); |
159 | 159 | } |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | * |
164 | 164 | * @param null|string $msg |
165 | 165 | */ |
166 | - public function underflow($msg=null) |
|
166 | + public function underflow($msg = null) |
|
167 | 167 | { |
168 | 168 | throw new UnderflowException($msg); |
169 | 169 | } |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | * |
174 | 174 | * @param null|string $msg |
175 | 175 | */ |
176 | - public function unexpectedValue($msg=null) |
|
176 | + public function unexpectedValue($msg = null) |
|
177 | 177 | { |
178 | 178 | throw new UnexpectedValueException($msg); |
179 | 179 | } |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | * @param null $default |
21 | 21 | * @return mixed |
22 | 22 | */ |
23 | - public function input($key, $default=null); |
|
23 | + public function input($key, $default = null); |
|
24 | 24 | |
25 | 25 | /** |
26 | 26 | * @param $key |
@@ -45,5 +45,5 @@ discard block |
||
45 | 45 | * @param $value |
46 | 46 | * @return void |
47 | 47 | */ |
48 | - public function set($key,$value); |
|
48 | + public function set($key, $value); |
|
49 | 49 | } |
50 | 50 | \ No newline at end of file |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function handle() |
24 | 24 | { |
25 | - foreach ($this->tableFilters() as $table=>$files){ |
|
25 | + foreach ($this->tableFilters() as $table=>$files) { |
|
26 | 26 | |
27 | 27 | $table = strtolower($table); |
28 | 28 | |
@@ -30,20 +30,20 @@ discard block |
||
30 | 30 | |
31 | 31 | $checkMigrationMain = $this->schema->getConnection()->checkMigrationMain(); |
32 | 32 | |
33 | - if($checkMigrationMain===false && isset($this->tableFilters()['Migrations'][0])){ |
|
34 | - $this->apply($this->tableFilters()['Migrations'][0],'migrations'); |
|
33 | + if ($checkMigrationMain===false && isset($this->tableFilters()['Migrations'][0])) { |
|
34 | + $this->apply($this->tableFilters()['Migrations'][0], 'migrations'); |
|
35 | 35 | } |
36 | 36 | |
37 | - $checkMigration = $this->schema->getConnection()->checkMigration($table,$file); |
|
37 | + $checkMigration = $this->schema->getConnection()->checkMigration($table, $file); |
|
38 | 38 | |
39 | - if(!$checkMigration){ |
|
39 | + if (!$checkMigration) { |
|
40 | 40 | |
41 | - $getClassName = preg_replace('@(\d+)_@is','',$file); |
|
41 | + $getClassName = preg_replace('@(\d+)_@is', '', $file); |
|
42 | 42 | $className = $this->getClassName($getClassName); |
43 | 43 | |
44 | 44 | require_once ($file); |
45 | 45 | |
46 | - $capsule = new SchemaCapsule($this->config,$file,$table); |
|
46 | + $capsule = new SchemaCapsule($this->config, $file, $table); |
|
47 | 47 | |
48 | 48 | $this->list[$table][] = (new $className)->up($capsule); |
49 | 49 | } |
@@ -60,14 +60,14 @@ discard block |
||
60 | 60 | * @param $table |
61 | 61 | * @return mixed|string |
62 | 62 | */ |
63 | - public function apply($file,$table) |
|
63 | + public function apply($file, $table) |
|
64 | 64 | { |
65 | - $getClassName = preg_replace('@(\d+)_@is','',$file); |
|
65 | + $getClassName = preg_replace('@(\d+)_@is', '', $file); |
|
66 | 66 | $className = $this->getClassName($getClassName); |
67 | 67 | |
68 | 68 | require_once ($file); |
69 | 69 | |
70 | - $capsule = new SchemaCapsule($this->config,$file,$table); |
|
70 | + $capsule = new SchemaCapsule($this->config, $file, $table); |
|
71 | 71 | |
72 | 72 | $this->list[$table][] = (new $className)->up($capsule); |
73 | 73 |
@@ -10,16 +10,16 @@ discard block |
||
10 | 10 | * @param $name |
11 | 11 | * @return string |
12 | 12 | */ |
13 | - protected function getNullableValue($nullable,$name) |
|
13 | + protected function getNullableValue($nullable, $name) |
|
14 | 14 | { |
15 | - $nullableValue=''; |
|
15 | + $nullableValue = ''; |
|
16 | 16 | |
17 | - if(isset($nullable[$name])){ |
|
18 | - if($nullable[$name]===false){ |
|
19 | - $nullableValue='NOT NULL'; |
|
17 | + if (isset($nullable[$name])) { |
|
18 | + if ($nullable[$name]===false) { |
|
19 | + $nullableValue = 'NOT NULL'; |
|
20 | 20 | } |
21 | - else{ |
|
22 | - $nullableValue='NULL'; |
|
21 | + else { |
|
22 | + $nullableValue = 'NULL'; |
|
23 | 23 | } |
24 | 24 | } |
25 | 25 | |
@@ -59,22 +59,22 @@ discard block |
||
59 | 59 | */ |
60 | 60 | protected function getValueWithIsset($name) |
61 | 61 | { |
62 | - $nameKey = array_search($name,$this->data['names']); |
|
62 | + $nameKey = array_search($name, $this->data['names']); |
|
63 | 63 | |
64 | 64 | $list = []; |
65 | - $list[] = $this->getNullableValue($this->data['nullable'],$name); |
|
65 | + $list[] = $this->getNullableValue($this->data['nullable'], $name); |
|
66 | 66 | $list[] = (isset($this->data['autoIncrement'][$name])) ? 'AUTO_INCREMENT' : ''; |
67 | 67 | $list[] = (isset($this->data['primaryKey'][$name])) ? 'PRIMARY KEY' : ''; |
68 | 68 | |
69 | - if(isset($this->data['types'][$nameKey])){ |
|
70 | - if($this->data['types'][$nameKey]=='timestamp' && !isset($this->data['default'][$nameKey])){ |
|
69 | + if (isset($this->data['types'][$nameKey])) { |
|
70 | + if ($this->data['types'][$nameKey]=='timestamp' && !isset($this->data['default'][$nameKey])) { |
|
71 | 71 | $this->data['default'][$name] = 'CURRENT_TIMESTAMP'; |
72 | 72 | } |
73 | 73 | |
74 | - if($this->data['types'][$nameKey]!=='timestamp'){ |
|
74 | + if ($this->data['types'][$nameKey]!=='timestamp') { |
|
75 | 75 | $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT "'.$this->data['default'][$name].'"' : ''; |
76 | 76 | } |
77 | - else{ |
|
77 | + else { |
|
78 | 78 | $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT '.$this->data['default'][$name].'' : ''; |
79 | 79 | } |
80 | 80 | |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | |
83 | 83 | } |
84 | 84 | |
85 | - if(count($list)===3){ |
|
85 | + if (count($list)===3) { |
|
86 | 86 | $list[] = ''; |
87 | 87 | $list[] = ''; |
88 | 88 | } |
@@ -99,8 +99,8 @@ discard block |
||
99 | 99 | protected function getUniqueValueList($name) |
100 | 100 | { |
101 | 101 | //get unique |
102 | - if(isset($this->data['unique'][$name])){ |
|
103 | - $this->data['uniqueValueList'][] = 'UNIQUE INDEX '.$this->data['unique'][$name]['value'].' ('.$name.' ASC)'; |
|
102 | + if (isset($this->data['unique'][$name])) { |
|
103 | + $this->data['uniqueValueList'][] = 'UNIQUE INDEX '.$this->data['unique'][$name]['value'].' ('.$name.' ASC)'; |
|
104 | 104 | } |
105 | 105 | } |
106 | 106 | |
@@ -110,8 +110,8 @@ discard block |
||
110 | 110 | protected function getIndexValueList($name) |
111 | 111 | { |
112 | 112 | //get index |
113 | - if(isset($this->data['index'][$name])){ |
|
114 | - $this->data['indexValueList'][] = 'INDEX '.$this->data['index'][$name]['value'].' ('.$name.')'; |
|
113 | + if (isset($this->data['index'][$name])) { |
|
114 | + $this->data['indexValueList'][] = 'INDEX '.$this->data['index'][$name]['value'].' ('.$name.')'; |
|
115 | 115 | } |
116 | 116 | } |
117 | 117 | |
@@ -132,13 +132,13 @@ discard block |
||
132 | 132 | */ |
133 | 133 | protected function getCreateDefaultList() |
134 | 134 | { |
135 | - $list = []; |
|
135 | + $list = []; |
|
136 | 136 | |
137 | 137 | foreach ($this->data['names'] as $key=>$name) |
138 | 138 | { |
139 | 139 | list( |
140 | - $nullableValue,$autoIncrementValue, |
|
141 | - $primaryKeyValue,$defaultValue,$commentValue |
|
140 | + $nullableValue, $autoIncrementValue, |
|
141 | + $primaryKeyValue, $defaultValue, $commentValue |
|
142 | 142 | ) = $this->getValueWithIsset($name); |
143 | 143 | |
144 | 144 | //set index values |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | $types = (isset($this->data['types'][$key])) ? $this->data['types'][$key] : ''; |
148 | 148 | |
149 | - $list[]=''.$name.' '.$types.' '.$nullableValue.' '.$defaultValue.' '.$primaryKeyValue.' '.$autoIncrementValue.' '.$commentValue.''; |
|
149 | + $list[] = ''.$name.' '.$types.' '.$nullableValue.' '.$defaultValue.' '.$primaryKeyValue.' '.$autoIncrementValue.' '.$commentValue.''; |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | return $list; |
@@ -157,18 +157,18 @@ discard block |
||
157 | 157 | */ |
158 | 158 | protected function getKeyList() |
159 | 159 | { |
160 | - $keyList = []; |
|
160 | + $keyList = []; |
|
161 | 161 | |
162 | 162 | //multiple indexes |
163 | - if(isset($this->data['index']['indexes'])){ |
|
163 | + if (isset($this->data['index']['indexes'])) { |
|
164 | 164 | |
165 | - foreach ($this->data['index']['indexes'] as $index_key=>$index_value){ |
|
165 | + foreach ($this->data['index']['indexes'] as $index_key=>$index_value) { |
|
166 | 166 | |
167 | 167 | $indexesCommentValue = (isset($index_value['comment'])) ? 'COMMENT "'.$index_value['comment'].'"' : ''; |
168 | 168 | |
169 | 169 | $keyType = (isset($index_value['type'])) ? ucfirst($index_value['type']) : 'KEY'; |
170 | 170 | |
171 | - $keyList[] = "".$keyType." ".$index_value['name']." (".implode(",",$index_value['value']).") ".$indexesCommentValue; |
|
171 | + $keyList[] = "".$keyType." ".$index_value['name']." (".implode(",", $index_value['value']).") ".$indexesCommentValue; |
|
172 | 172 | } |
173 | 173 | } |
174 | 174 | |
@@ -183,13 +183,13 @@ discard block |
||
183 | 183 | { |
184 | 184 | $list = []; |
185 | 185 | |
186 | - foreach ($reference as $constraint=>$values){ |
|
186 | + foreach ($reference as $constraint=>$values) { |
|
187 | 187 | |
188 | - $list[]=',CONSTRAINT '.$constraint.' FOREIGN KEY ('.$values['key'].') |
|
188 | + $list[] = ',CONSTRAINT '.$constraint.' FOREIGN KEY ('.$values['key'].') |
|
189 | 189 | REFERENCES '.$values['references']['table'].'('.$values['references']['field'].') '.$this->getOnProcess($values); |
190 | 190 | } |
191 | 191 | |
192 | - return implode (" ",$list); |
|
192 | + return implode(" ", $list); |
|
193 | 193 | } |
194 | 194 | |
195 | 195 | /** |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | */ |
198 | 198 | private function getOnProcess($referenceValue) |
199 | 199 | { |
200 | - if(isset($referenceValue['on']) && isset($referenceValue['onOption'])){ |
|
200 | + if (isset($referenceValue['on']) && isset($referenceValue['onOption'])) { |
|
201 | 201 | return ''.$referenceValue['on'].' '.strtoupper($referenceValue['onOption']).''; |
202 | 202 | } |
203 | 203 |
@@ -17,8 +17,7 @@ discard block |
||
17 | 17 | if(isset($nullable[$name])){ |
18 | 18 | if($nullable[$name]===false){ |
19 | 19 | $nullableValue='NOT NULL'; |
20 | - } |
|
21 | - else{ |
|
20 | + } else{ |
|
22 | 21 | $nullableValue='NULL'; |
23 | 22 | } |
24 | 23 | } |
@@ -73,8 +72,7 @@ discard block |
||
73 | 72 | |
74 | 73 | if($this->data['types'][$nameKey]!=='timestamp'){ |
75 | 74 | $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT "'.$this->data['default'][$name].'"' : ''; |
76 | - } |
|
77 | - else{ |
|
75 | + } else{ |
|
78 | 76 | $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT '.$this->data['default'][$name].'' : ''; |
79 | 77 | } |
80 | 78 |
@@ -9,6 +9,6 @@ |
||
9 | 9 | * @param array $uniques |
10 | 10 | * @return mixed |
11 | 11 | */ |
12 | - public function uniques($unique_name,$uniques=array()); |
|
12 | + public function uniques($unique_name, $uniques = array()); |
|
13 | 13 | } |
14 | 14 |
@@ -9,6 +9,6 @@ |
||
9 | 9 | * @param array $indexes |
10 | 10 | * @return mixed |
11 | 11 | */ |
12 | - public function indexes($index_name,$indexes=array()); |
|
12 | + public function indexes($index_name, $indexes = array()); |
|
13 | 13 | } |
14 | 14 |