@@ -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 | } |
@@ -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"); |
@@ -38,26 +38,26 @@ discard block |
||
38 | 38 | */ |
39 | 39 | public function resolve() |
40 | 40 | { |
41 | - if($this->app->has('clientReset')){ |
|
41 | + if ($this->app->has('clientReset')) { |
|
42 | 42 | $this->app->terminate('clientReset'); |
43 | 43 | return []; |
44 | 44 | } |
45 | 45 | |
46 | 46 | $inputs = $this->app->get($this->method); |
47 | 47 | |
48 | - $content = json_decode($this->app['request']->getContent(),1); |
|
48 | + $content = json_decode($this->app['request']->getContent(), 1); |
|
49 | 49 | |
50 | - if(is_array($inputs) && count($inputs)){ |
|
50 | + if (is_array($inputs) && count($inputs)) { |
|
51 | 51 | |
52 | - if(isset($inputs[$this->client->getClientName()])){ |
|
52 | + if (isset($inputs[$this->client->getClientName()])) { |
|
53 | 53 | return $inputs[$this->client->getClientName()]; |
54 | 54 | } |
55 | 55 | return $inputs; |
56 | 56 | } |
57 | 57 | |
58 | - if(is_array($content)){ |
|
58 | + if (is_array($content)) { |
|
59 | 59 | |
60 | - if(isset($content[$this->client->getClientName()])){ |
|
60 | + if (isset($content[$this->client->getClientName()])) { |
|
61 | 61 | return $content[$this->client->getClientName()]; |
62 | 62 | } |
63 | 63 | return $content; |
@@ -65,8 +65,8 @@ discard block |
||
65 | 65 | |
66 | 66 | $this->inputVars(); |
67 | 67 | |
68 | - if(is_array($GLOBALS[ '_PUT' ])){ |
|
69 | - return $GLOBALS[ '_PUT' ]; |
|
68 | + if (is_array($GLOBALS['_PUT'])) { |
|
69 | + return $GLOBALS['_PUT']; |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | return []; |
@@ -96,9 +96,9 @@ discard block |
||
96 | 96 | // Fetch content and determine boundary |
97 | 97 | $boundary = substr($raw_data, 0, strpos($raw_data, "\r\n")); |
98 | 98 | |
99 | - if(empty($boundary)){ |
|
100 | - parse_str($raw_data,$data); |
|
101 | - $GLOBALS[ '_PUT' ] = $data; |
|
99 | + if (empty($boundary)) { |
|
100 | + parse_str($raw_data, $data); |
|
101 | + $GLOBALS['_PUT'] = $data; |
|
102 | 102 | return; |
103 | 103 | } |
104 | 104 | |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | |
109 | 109 | foreach ($parts as $part) { |
110 | 110 | // If this is the last part, break |
111 | - if ($part == "--\r\n") break; |
|
111 | + if ($part=="--\r\n") break; |
|
112 | 112 | |
113 | 113 | // Separate content from headers |
114 | 114 | $part = ltrim($part, "\r\n"); |
@@ -135,10 +135,10 @@ discard block |
||
135 | 135 | list(, $type, $name) = $matches; |
136 | 136 | |
137 | 137 | //Parse File |
138 | - if( isset($matches[4]) ) |
|
138 | + if (isset($matches[4])) |
|
139 | 139 | { |
140 | 140 | //if labeled the same as previous, skip |
141 | - if( isset( $_FILES[ $matches[ 2 ] ] ) ) |
|
141 | + if (isset($_FILES[$matches[2]])) |
|
142 | 142 | { |
143 | 143 | continue; |
144 | 144 | } |
@@ -147,16 +147,16 @@ discard block |
||
147 | 147 | $filename = $matches[4]; |
148 | 148 | |
149 | 149 | //get tmp name |
150 | - $filename_parts = pathinfo( $filename ); |
|
151 | - $tmp_name = tempnam( ini_get('upload_tmp_dir'), $filename_parts['filename']); |
|
150 | + $filename_parts = pathinfo($filename); |
|
151 | + $tmp_name = tempnam(ini_get('upload_tmp_dir'), $filename_parts['filename']); |
|
152 | 152 | |
153 | 153 | //populate $_FILES with information, size may be off in multibyte situation |
154 | 154 | /** @noinspection PhpUndefinedVariableInspection */ |
155 | - $_FILES[ $matches[ 2 ] ] = array( |
|
155 | + $_FILES[$matches[2]] = array( |
|
156 | 156 | 'error'=>0, |
157 | 157 | 'name'=>$filename, |
158 | 158 | 'tmp_name'=>$tmp_name, |
159 | - 'size'=>strlen( $body ), |
|
159 | + 'size'=>strlen($body), |
|
160 | 160 | 'type'=>$value |
161 | 161 | ); |
162 | 162 | |
@@ -166,12 +166,12 @@ discard block |
||
166 | 166 | //Parse Field |
167 | 167 | else |
168 | 168 | { |
169 | - $data[$name] = substr($body, 0, strlen($body) - 2); |
|
169 | + $data[$name] = substr($body, 0, strlen($body)-2); |
|
170 | 170 | } |
171 | 171 | } |
172 | 172 | |
173 | 173 | } |
174 | - $GLOBALS[ '_PUT' ] = $data; |
|
174 | + $GLOBALS['_PUT'] = $data; |
|
175 | 175 | return; |
176 | 176 | } |
177 | 177 |
@@ -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 | } |
@@ -39,8 +39,7 @@ discard block |
||
39 | 39 | { |
40 | 40 | if($this->app->has('exceptiontrace')) { |
41 | 41 | $this->data['status'] = (int)$this->app['exceptiontrace']['callNamespace']->getCode(); |
42 | - } |
|
43 | - else { |
|
42 | + } else { |
|
44 | 43 | $this->data['status'] = (int)$this->exception::exceptionTypeCodes($this->data['errType']); |
45 | 44 | } |
46 | 45 | } |
@@ -82,8 +81,7 @@ discard block |
||
82 | 81 | |
83 | 82 | //set as the success object is false |
84 | 83 | $this->data['appExceptionSuccess'] = []; |
85 | - } |
|
86 | - else{ |
|
84 | + } else{ |
|
87 | 85 | |
88 | 86 | //set as the success object is false |
89 | 87 | $this->data['appExceptionSuccess'] = ['success'=>(bool)false,'status'=>$this->data['status']]; |
@@ -186,13 +184,11 @@ discard block |
||
186 | 184 | $this->app->register('responseStatus',500); |
187 | 185 | |
188 | 186 | |
189 | - } |
|
190 | - else{ |
|
187 | + } else{ |
|
191 | 188 | |
192 | 189 | if($this->data['status']=='500' && $environment=='production'){ |
193 | 190 | $externalMessage = 'An unexpected external error has occurred'; |
194 | - } |
|
195 | - else{ |
|
191 | + } else{ |
|
196 | 192 | $externalMessage = $this->data['errStrReal']; |
197 | 193 | } |
198 | 194 | |
@@ -237,16 +233,14 @@ discard block |
||
237 | 233 | |
238 | 234 | $responseType = $this->app->get('clientResponseType'); |
239 | 235 | echo app()->resolve($this->app->get('out')->formatter())->{$responseType}($lastResult); |
240 | - } |
|
241 | - else{ |
|
236 | + } else{ |
|
242 | 237 | |
243 | 238 | $defaultResponseType = (is_null(config('app.response'))) ? 'json' : config('app.response'); |
244 | 239 | echo app()->resolve($this->app->get('out')->formatter())->{$defaultResponseType}($lastResult); |
245 | 240 | } |
246 | 241 | |
247 | 242 | |
248 | - } |
|
249 | - else{ |
|
243 | + } else{ |
|
250 | 244 | echo $restaOutHandle; |
251 | 245 | } |
252 | 246 |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | */ |
38 | 38 | private function getStatusAccordingToExceptionTrace() |
39 | 39 | { |
40 | - if($this->app->has('exceptiontrace')) { |
|
40 | + if ($this->app->has('exceptiontrace')) { |
|
41 | 41 | $this->data['status'] = (int)$this->app['exceptiontrace']['callNamespace']->getCode(); |
42 | 42 | } |
43 | 43 | else { |
@@ -54,21 +54,21 @@ discard block |
||
54 | 54 | |
55 | 55 | $this->app->terminate('responseSuccess'); |
56 | 56 | $this->app->terminate('responseStatus'); |
57 | - $this->app->register('responseSuccess',(bool)false); |
|
58 | - $this->app->register('responseStatus',$this->data['status']); |
|
57 | + $this->app->register('responseSuccess', (bool)false); |
|
58 | + $this->app->register('responseStatus', $this->data['status']); |
|
59 | 59 | |
60 | 60 | |
61 | - $optionalException = str_replace("\\","\\\\",$this->app->namespace()->exception()); |
|
61 | + $optionalException = str_replace("\\", "\\\\", $this->app->namespace()->exception()); |
|
62 | 62 | |
63 | - if(preg_match('@'.$optionalException.'@is',$this->data['errType'])){ |
|
63 | + if (preg_match('@'.$optionalException.'@is', $this->data['errType'])) { |
|
64 | 64 | |
65 | 65 | //trace pattern |
66 | 66 | $trace = $this->data['errContext']['trace']; |
67 | - if(preg_match('@Stack trace:\n#0(.*)\n#1@is',$trace,$traceArray)){ |
|
67 | + if (preg_match('@Stack trace:\n#0(.*)\n#1@is', $trace, $traceArray)) { |
|
68 | 68 | |
69 | - $traceFile = str_replace(root,'',$traceArray[1]); |
|
69 | + $traceFile = str_replace(root, '', $traceArray[1]); |
|
70 | 70 | |
71 | - if(preg_match('@(.*)\((\d+)\)@is',$traceFile,$traceResolve)){ |
|
71 | + if (preg_match('@(.*)\((\d+)\)@is', $traceFile, $traceResolve)) { |
|
72 | 72 | $this->data['errFile'] = $traceResolve[1]; |
73 | 73 | $this->data['errLine'] = (int)$traceResolve[2]; |
74 | 74 | } |
@@ -78,15 +78,15 @@ discard block |
||
78 | 78 | $this->data['errType'] = class_basename($this->data['errType']); |
79 | 79 | } |
80 | 80 | |
81 | - if(is_array($meta = config('response.meta'))){ |
|
81 | + if (is_array($meta = config('response.meta'))) { |
|
82 | 82 | |
83 | 83 | //set as the success object is false |
84 | 84 | $this->data['appExceptionSuccess'] = []; |
85 | 85 | } |
86 | - else{ |
|
86 | + else { |
|
87 | 87 | |
88 | 88 | //set as the success object is false |
89 | - $this->data['appExceptionSuccess'] = ['success'=>(bool)false,'status'=>$this->data['status']]; |
|
89 | + $this->data['appExceptionSuccess'] = ['success'=>(bool)false, 'status'=>$this->data['status']]; |
|
90 | 90 | } |
91 | 91 | } |
92 | 92 | |
@@ -108,13 +108,13 @@ discard block |
||
108 | 108 | //This function can be used for defining your own way of handling errors during runtime, |
109 | 109 | //for example in applications in which you need to do cleanup of data/files when a critical error happens, |
110 | 110 | //or when you need to trigger an error under certain conditions (using trigger_error()). |
111 | - set_error_handler([$this,'setErrorHandler']); |
|
111 | + set_error_handler([$this, 'setErrorHandler']); |
|
112 | 112 | |
113 | 113 | //Registers a callback to be executed after script execution finishes or exit() is called. |
114 | 114 | //Multiple calls to register_shutdown_function() can be made, and each will be called in the same order as |
115 | 115 | //they were registered. If you call exit() within one registered shutdown function, |
116 | 116 | //processing will stop completely and no other registered shutdown functions will be called. |
117 | - register_shutdown_function([$this,'fatalErrorShutdownHandler']); |
|
117 | + register_shutdown_function([$this, 'fatalErrorShutdownHandler']); |
|
118 | 118 | |
119 | 119 | } |
120 | 120 | |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | * @param null|string $errLine |
128 | 128 | * @param null|string $errContext |
129 | 129 | */ |
130 | - public function setErrorHandler($errNo=null, $errStr=null, $errFile=null, $errLine=null, $errContext=null) |
|
130 | + public function setErrorHandler($errNo = null, $errStr = null, $errFile = null, $errLine = null, $errContext = null) |
|
131 | 131 | { |
132 | 132 | // in case of a deficiency, |
133 | 133 | // we need to boot our general needs to be needed for the exception. |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | //get lang message for exception |
155 | 155 | $this->getLangMessageForException(); |
156 | 156 | |
157 | - if($this->app->has('exceptiontrace')){ |
|
157 | + if ($this->app->has('exceptiontrace')) { |
|
158 | 158 | |
159 | 159 | $customExceptionTrace = $this->app['exceptiontrace']; |
160 | 160 | $this->data['errFile'] = $customExceptionTrace['file']; |
@@ -163,40 +163,39 @@ discard block |
||
163 | 163 | |
164 | 164 | $environment = $this->app->environment(); |
165 | 165 | |
166 | - $vendorDirectory = str_replace(root.''.DIRECTORY_SEPARATOR.'','',$this->data['errFile']); |
|
166 | + $vendorDirectory = str_replace(root.''.DIRECTORY_SEPARATOR.'', '', $this->data['errFile']); |
|
167 | 167 | |
168 | - if(preg_match('@vendor.*\.php@is',$vendorDirectory,$vd)){ |
|
168 | + if (preg_match('@vendor.*\.php@is', $vendorDirectory, $vd)) { |
|
169 | 169 | $vendorDirectory = $vd[0]; |
170 | 170 | } |
171 | 171 | |
172 | - if(Str::startsWith($vendorDirectory,'vendor') |
|
173 | - && Str::startsWith($vendorDirectory,'vendor/php-resta')===false) |
|
172 | + if (Str::startsWith($vendorDirectory, 'vendor') |
|
173 | + && Str::startsWith($vendorDirectory, 'vendor/php-resta')===false) |
|
174 | 174 | { |
175 | 175 | |
176 | 176 | $externalMessage = ($environment==="production") ? |
177 | - 'An unexpected external error has occurred' : |
|
178 | - $this->data['errStrReal']; |
|
177 | + 'An unexpected external error has occurred' : $this->data['errStrReal']; |
|
179 | 178 | |
180 | - $this->result = $this->getAppException($environment,$externalMessage); |
|
179 | + $this->result = $this->getAppException($environment, $externalMessage); |
|
181 | 180 | |
182 | 181 | |
183 | 182 | //Get or Set the HTTP response code |
184 | 183 | http_response_code(500); |
185 | 184 | $this->app->terminate('responseStatus'); |
186 | - $this->app->register('responseStatus',500); |
|
185 | + $this->app->register('responseStatus', 500); |
|
187 | 186 | |
188 | 187 | |
189 | 188 | } |
190 | - else{ |
|
189 | + else { |
|
191 | 190 | |
192 | - if($this->data['status']=='500' && $environment=='production'){ |
|
191 | + if ($this->data['status']=='500' && $environment=='production') { |
|
193 | 192 | $externalMessage = 'An unexpected external error has occurred'; |
194 | 193 | } |
195 | - else{ |
|
194 | + else { |
|
196 | 195 | $externalMessage = $this->data['errStrReal']; |
197 | 196 | } |
198 | 197 | |
199 | - $this->result = $this->getAppException($environment,$externalMessage); |
|
198 | + $this->result = $this->getAppException($environment, $externalMessage); |
|
200 | 199 | |
201 | 200 | //Get or Set the HTTP response code |
202 | 201 | http_response_code($this->data['status']); |
@@ -206,39 +205,39 @@ discard block |
||
206 | 205 | // that is presented as an extra to the exception result set. |
207 | 206 | $this->result = $this->getExceptionExtender(); |
208 | 207 | |
209 | - if($environment==="production"){ |
|
210 | - $productionLogMessage = $this->getAppException('local',$this->data['errStrReal']); |
|
211 | - $productionLogMessage = array_merge($this->result,$productionLogMessage); |
|
212 | - $this->app->register('productionLogMessage',$this->app->get('out')->outputFormatter($productionLogMessage)); |
|
208 | + if ($environment==="production") { |
|
209 | + $productionLogMessage = $this->getAppException('local', $this->data['errStrReal']); |
|
210 | + $productionLogMessage = array_merge($this->result, $productionLogMessage); |
|
211 | + $this->app->register('productionLogMessage', $this->app->get('out')->outputFormatter($productionLogMessage)); |
|
213 | 212 | } |
214 | 213 | |
215 | 214 | //set json app exception |
216 | - $this->app->register('routerResult',$this->result); |
|
215 | + $this->app->register('routerResult', $this->result); |
|
217 | 216 | |
218 | - if($this->app->has('exceptionResponse')){ |
|
217 | + if ($this->app->has('exceptionResponse')) { |
|
219 | 218 | $exceptionResponse = $this->app->get('exceptionResponse'); |
220 | - $exceptionResponse((isset($productionLogMessage)) ? $productionLogMessage : $this->result,$this->data['status']); |
|
219 | + $exceptionResponse((isset($productionLogMessage)) ? $productionLogMessage : $this->result, $this->data['status']); |
|
221 | 220 | } |
222 | 221 | |
223 | 222 | $restaOutHandle = null; |
224 | 223 | |
225 | - if(!defined('responseApp')){ |
|
224 | + if (!defined('responseApp')) { |
|
226 | 225 | $restaOutHandle = $this->app->get('out')->handle(); |
227 | 226 | } |
228 | 227 | |
229 | 228 | header("HTTP/1.1 ".$this->data['status']); |
230 | 229 | |
231 | - if($restaOutHandle===null){ |
|
230 | + if ($restaOutHandle===null) { |
|
232 | 231 | |
233 | 232 | //header set and symfony response call |
234 | 233 | $lastResult = $this->app->get('out')->outputFormatter($this->result); |
235 | 234 | |
236 | - if($this->app->has('clientResponseType')){ |
|
235 | + if ($this->app->has('clientResponseType')) { |
|
237 | 236 | |
238 | 237 | $responseType = $this->app->get('clientResponseType'); |
239 | 238 | echo app()->resolve($this->app->get('out')->formatter())->{$responseType}($lastResult); |
240 | 239 | } |
241 | - else{ |
|
240 | + else { |
|
242 | 241 | |
243 | 242 | $defaultResponseType = (is_null(config('app.response'))) ? 'json' : config('app.response'); |
244 | 243 | echo app()->resolve($this->app->get('out')->formatter())->{$defaultResponseType}($lastResult); |
@@ -246,7 +245,7 @@ discard block |
||
246 | 245 | |
247 | 246 | |
248 | 247 | } |
249 | - else{ |
|
248 | + else { |
|
250 | 249 | echo $restaOutHandle; |
251 | 250 | } |
252 | 251 | |
@@ -257,7 +256,7 @@ discard block |
||
257 | 256 | * @param $environment |
258 | 257 | * @return mixed |
259 | 258 | */ |
260 | - private function getAppException($environment,$message) |
|
259 | + private function getAppException($environment, $message) |
|
261 | 260 | { |
262 | 261 | return $this->data['appExceptionSuccess']+$this->data['exception']::$environment( |
263 | 262 | $this->data['errNo'], |
@@ -277,7 +276,7 @@ discard block |
||
277 | 276 | private function getExceptionExtender() |
278 | 277 | { |
279 | 278 | return $this->app->resolve( |
280 | - $this->app->get('macro')->call('exceptionExtender',function(){ |
|
279 | + $this->app->get('macro')->call('exceptionExtender', function() { |
|
281 | 280 | return ExceptionExtender::class; |
282 | 281 | }), |
283 | 282 | ['result'=>$this->result])->getResult(); |
@@ -295,13 +294,13 @@ discard block |
||
295 | 294 | |
296 | 295 | $this->inStackTrace($last_error); |
297 | 296 | |
298 | - if(!is_null($last_error)){ |
|
297 | + if (!is_null($last_error)) { |
|
299 | 298 | |
300 | - if(!defined('methodName')){ |
|
301 | - define('methodName',null); |
|
299 | + if (!defined('methodName')) { |
|
300 | + define('methodName', null); |
|
302 | 301 | } |
303 | 302 | |
304 | - if($this->app->has('exceptionFile')){ |
|
303 | + if ($this->app->has('exceptionFile')) { |
|
305 | 304 | $last_error['file'] = $this->app['exceptionFile']; |
306 | 305 | $last_error['line'] = $this->app['exceptionLine']; |
307 | 306 | } |
@@ -321,13 +320,13 @@ discard block |
||
321 | 320 | */ |
322 | 321 | public function inStackTrace($error) |
323 | 322 | { |
324 | - if($this->app->has('urlComponent') && isset($error['file'])){ |
|
325 | - if(!preg_match('@'.$this->app['urlComponent']['project'].'@',$error['file']) |
|
326 | - && !$this->app->has('exceptionFile')){ |
|
327 | - if(preg_match('@ in\s(.*?)\n@is',$error['message'],$result)){ |
|
328 | - $errorMessage = explode(":",$result[1]); |
|
329 | - $this->app->register('exceptionFile',$errorMessage[0]); |
|
330 | - $this->app->register('exceptionLine',$errorMessage[1]); |
|
323 | + if ($this->app->has('urlComponent') && isset($error['file'])) { |
|
324 | + if (!preg_match('@'.$this->app['urlComponent']['project'].'@', $error['file']) |
|
325 | + && !$this->app->has('exceptionFile')) { |
|
326 | + if (preg_match('@ in\s(.*?)\n@is', $error['message'], $result)) { |
|
327 | + $errorMessage = explode(":", $result[1]); |
|
328 | + $this->app->register('exceptionFile', $errorMessage[0]); |
|
329 | + $this->app->register('exceptionLine', $errorMessage[1]); |
|
331 | 330 | } |
332 | 331 | } |
333 | 332 | } |
@@ -340,33 +339,33 @@ discard block |
||
340 | 339 | { |
341 | 340 | $clone = clone $this; |
342 | 341 | |
343 | - if($this->app->has('exceptionTranslate')){ |
|
342 | + if ($this->app->has('exceptionTranslate')) { |
|
344 | 343 | |
345 | 344 | $langMessage = trans('exception.'.$this->app->get('exceptionTranslate')); |
346 | 345 | |
347 | - if(!is_null($langMessage) && $this->app->has('exceptionTranslateParams')){ |
|
346 | + if (!is_null($langMessage) && $this->app->has('exceptionTranslateParams')) { |
|
348 | 347 | |
349 | - if(count($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']])){ |
|
350 | - foreach ($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']] as $key=>$value){ |
|
348 | + if (count($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']])) { |
|
349 | + foreach ($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']] as $key=>$value) { |
|
351 | 350 | |
352 | 351 | $valueLangName = !is_null(trans('default.'.$value)) ? trans('default.'.$value) : $value; |
353 | - $langMessage = preg_replace('@\('.$key.'\)@is',$valueLangName,$langMessage); |
|
352 | + $langMessage = preg_replace('@\('.$key.'\)@is', $valueLangName, $langMessage); |
|
354 | 353 | } |
355 | 354 | } |
356 | 355 | } |
357 | 356 | |
358 | - if($langMessage!==null){ |
|
357 | + if ($langMessage!==null) { |
|
359 | 358 | $this->data['errStrReal'] = $langMessage; |
360 | 359 | } |
361 | 360 | } |
362 | 361 | |
363 | - if(class_exists($this->data['errorClassNamespace']) |
|
362 | + if (class_exists($this->data['errorClassNamespace']) |
|
364 | 363 | && |
365 | - (Str::startsWith($this->data['errorClassNamespace'],'App') |
|
366 | - || Str::startsWith($this->data['errorClassNamespace'],__NAMESPACE__))){ |
|
364 | + (Str::startsWith($this->data['errorClassNamespace'], 'App') |
|
365 | + || Str::startsWith($this->data['errorClassNamespace'], __NAMESPACE__))) { |
|
367 | 366 | |
368 | 367 | ClosureDispatcher::bind($this->data['errorClassNamespace'])->call(function() use ($clone) { |
369 | - if(property_exists($this,'lang')){ |
|
368 | + if (property_exists($this, 'lang')) { |
|
370 | 369 | $clone->setLang($this->lang); |
371 | 370 | } |
372 | 371 | }); |
@@ -376,7 +375,7 @@ discard block |
||
376 | 375 | |
377 | 376 | $langMessage = (!is_null($this->data['lang'])) ? trans('exception.'.$this->data['lang']) : null; |
378 | 377 | |
379 | - if($langMessage!==null){ |
|
378 | + if ($langMessage!==null) { |
|
380 | 379 | $this->data['errStrReal'] = $langMessage; |
381 | 380 | } |
382 | 381 | } |
@@ -390,14 +389,14 @@ discard block |
||
390 | 389 | { |
391 | 390 | // catch exception via preg match |
392 | 391 | // and then clear the Uncaught statement from inside. |
393 | - if(preg_match('@(.*?):@is',$this->data['errStrReal'],$errArr)){ |
|
392 | + if (preg_match('@(.*?):@is', $this->data['errStrReal'], $errArr)) { |
|
394 | 393 | |
395 | - $this->data['errType'] = trim(str_replace('Uncaught','',$errArr[1])); |
|
394 | + $this->data['errType'] = trim(str_replace('Uncaught', '', $errArr[1])); |
|
396 | 395 | $this->data['errorClassNamespace'] = $this->data['errType']; |
397 | 396 | } |
398 | 397 | |
399 | - if(preg_match('@Uncaught@is',$this->data['errStrReal']) |
|
400 | - && preg_match('@(.*?):(.*?)\sin\s@is',$this->data['errStrReal'],$errStrRealArray)){ |
|
398 | + if (preg_match('@Uncaught@is', $this->data['errStrReal']) |
|
399 | + && preg_match('@(.*?):(.*?)\sin\s@is', $this->data['errStrReal'], $errStrRealArray)) { |
|
401 | 400 | $this->data['errStrReal'] = trim($errStrRealArray[2]); |
402 | 401 | } |
403 | 402 | |
@@ -417,7 +416,7 @@ discard block |
||
417 | 416 | /** |
418 | 417 | * @param null|string $lang |
419 | 418 | */ |
420 | - public function setLang($lang=null) |
|
419 | + public function setLang($lang = null) |
|
421 | 420 | { |
422 | 421 | $this->lang = $lang; |
423 | 422 | } |
@@ -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 | } |
@@ -634,7 +634,7 @@ discard block |
||
634 | 634 | * @param $key |
635 | 635 | * @param $value |
636 | 636 | */ |
637 | - public static function setNested($data=array(),$key,$value) |
|
637 | + public static function setNested($data = array(), $key, $value) |
|
638 | 638 | { |
639 | 639 | dd($data); |
640 | 640 | } |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | * |
16 | 16 | * @param array $data |
17 | 17 | */ |
18 | - public function __construct( array $data = [] ) |
|
18 | + public function __construct(array $data = []) |
|
19 | 19 | { |
20 | 20 | $this->data = $data; |
21 | 21 | } |
@@ -26,16 +26,16 @@ discard block |
||
26 | 26 | * |
27 | 27 | * @return array|mixed|null |
28 | 28 | */ |
29 | - public function safeGet( array $target, $indices ) |
|
29 | + public function safeGet(array $target, $indices) |
|
30 | 30 | { |
31 | 31 | $movingTarget = $target; |
32 | 32 | |
33 | - foreach ( $indices as $index ) |
|
33 | + foreach ($indices as $index) |
|
34 | 34 | { |
35 | - $isArray = is_array( $movingTarget ) || $movingTarget instanceof ArrayAccess; |
|
36 | - if ( ! $isArray || ! isset( $movingTarget[ $index ] ) ) return NULL; |
|
35 | + $isArray = is_array($movingTarget) || $movingTarget instanceof ArrayAccess; |
|
36 | + if (!$isArray || !isset($movingTarget[$index])) return NULL; |
|
37 | 37 | |
38 | - $movingTarget = $movingTarget[ $index ]; |
|
38 | + $movingTarget = $movingTarget[$index]; |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | return $movingTarget; |
@@ -46,9 +46,9 @@ discard block |
||
46 | 46 | * |
47 | 47 | * @return array|mixed|null |
48 | 48 | */ |
49 | - public function getKeys( array $keys ) |
|
49 | + public function getKeys(array $keys) |
|
50 | 50 | { |
51 | - return static::safeGet( $this->data, $keys ); |
|
51 | + return static::safeGet($this->data, $keys); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |
@@ -60,9 +60,9 @@ discard block |
||
60 | 60 | * |
61 | 61 | * @return array|mixed|null |
62 | 62 | */ |
63 | - public function get( $accessString ) |
|
63 | + public function get($accessString) |
|
64 | 64 | { |
65 | - return $this->getKeys( $this->parseDotNotation( $accessString ) ); |
|
65 | + return $this->getKeys($this->parseDotNotation($accessString)); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | /** |
@@ -71,29 +71,29 @@ discard block |
||
71 | 71 | * |
72 | 72 | * @return $this |
73 | 73 | */ |
74 | - public function set( $propString, $value ) |
|
74 | + public function set($propString, $value) |
|
75 | 75 | { |
76 | 76 | $movingTarget = &$this->data; |
77 | - $keys = $this->parseDotNotation( $propString ); |
|
78 | - $length = count( $keys ); |
|
77 | + $keys = $this->parseDotNotation($propString); |
|
78 | + $length = count($keys); |
|
79 | 79 | |
80 | - foreach ( $keys as $i => $key ) |
|
80 | + foreach ($keys as $i => $key) |
|
81 | 81 | { |
82 | - $lastKey = $i === $length - 1; |
|
83 | - $isset = isset( $movingTarget[ $key ] ); |
|
82 | + $lastKey = $i===$length-1; |
|
83 | + $isset = isset($movingTarget[$key]); |
|
84 | 84 | |
85 | - if ( $isset && ! $lastKey && ! is_array( $movingTarget[ $key ] ) ) |
|
85 | + if ($isset && !$lastKey && !is_array($movingTarget[$key])) |
|
86 | 86 | { |
87 | - throw new InvalidArgumentException( sprintf( |
|
87 | + throw new InvalidArgumentException(sprintf( |
|
88 | 88 | "Attempted to set/access the property %s like an array, but is of type: %s", |
89 | 89 | $key, |
90 | - gettype( $movingTarget[ $key ] ) |
|
91 | - ) ); |
|
90 | + gettype($movingTarget[$key]) |
|
91 | + )); |
|
92 | 92 | } |
93 | 93 | |
94 | - if ( ! $isset || ! is_array( $movingTarget[ $key ] ) ) $movingTarget[ $key ] = []; |
|
94 | + if (!$isset || !is_array($movingTarget[$key])) $movingTarget[$key] = []; |
|
95 | 95 | |
96 | - $movingTarget = &$movingTarget[ $key ]; |
|
96 | + $movingTarget = &$movingTarget[$key]; |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | $movingTarget = $value; |
@@ -106,9 +106,9 @@ discard block |
||
106 | 106 | * |
107 | 107 | * @return array |
108 | 108 | */ |
109 | - protected function parseDotNotation( $string ) |
|
109 | + protected function parseDotNotation($string) |
|
110 | 110 | { |
111 | - return explode( '.', strval( $string ) ); |
|
111 | + return explode('.', strval($string)); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
@@ -125,9 +125,9 @@ discard block |
||
125 | 125 | * |
126 | 126 | * @return string |
127 | 127 | */ |
128 | - public function toJson( $options = 0, $depth = 512 ) |
|
128 | + public function toJson($options = 0, $depth = 512) |
|
129 | 129 | { |
130 | - return json_encode( $this, $options, $depth ); |
|
130 | + return json_encode($this, $options, $depth); |
|
131 | 131 | } |
132 | 132 | |
133 | 133 | /** |
@@ -135,9 +135,9 @@ discard block |
||
135 | 135 | * |
136 | 136 | * @return static |
137 | 137 | */ |
138 | - public static function newFromArray( array $data ) |
|
138 | + public static function newFromArray(array $data) |
|
139 | 139 | { |
140 | - return new static( $data ); |
|
140 | + return new static($data); |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | /** |
@@ -145,9 +145,9 @@ discard block |
||
145 | 145 | * |
146 | 146 | * @return static |
147 | 147 | */ |
148 | - public static function newFromStdObject( \stdClass $data ) |
|
148 | + public static function newFromStdObject(\stdClass $data) |
|
149 | 149 | { |
150 | - return new static( json_decode( json_encode( $data ), TRUE ) ); |
|
150 | + return new static(json_decode(json_encode($data), TRUE)); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | /** |
@@ -176,17 +176,17 @@ discard block |
||
176 | 176 | * The return value will be casted to boolean if non-boolean was returned. |
177 | 177 | * @since 5.0.0 |
178 | 178 | */ |
179 | - public function offsetExists( $offset ) |
|
179 | + public function offsetExists($offset) |
|
180 | 180 | { |
181 | 181 | $movingTarget = $this->data; |
182 | 182 | |
183 | - foreach ( $this->parseDotNotation( $offset ) as $i ) |
|
183 | + foreach ($this->parseDotNotation($offset) as $i) |
|
184 | 184 | { |
185 | - if ( ! isset( $movingTarget[ $i ] ) ) return FALSE; |
|
186 | - $movingTarget = $movingTarget[ $i ]; |
|
185 | + if (!isset($movingTarget[$i])) return FALSE; |
|
186 | + $movingTarget = $movingTarget[$i]; |
|
187 | 187 | } |
188 | 188 | |
189 | - return isset( $movingTarget ); |
|
189 | + return isset($movingTarget); |
|
190 | 190 | } |
191 | 191 | |
192 | 192 | /** |
@@ -200,9 +200,9 @@ discard block |
||
200 | 200 | * @return mixed Can return all value types. |
201 | 201 | * @since 5.0.0 |
202 | 202 | */ |
203 | - public function offsetGet( $offset ) |
|
203 | + public function offsetGet($offset) |
|
204 | 204 | { |
205 | - return $this->get( $offset ); |
|
205 | + return $this->get($offset); |
|
206 | 206 | } |
207 | 207 | |
208 | 208 | /** |
@@ -219,9 +219,9 @@ discard block |
||
219 | 219 | * @return void |
220 | 220 | * @since 5.0.0 |
221 | 221 | */ |
222 | - public function offsetSet( $offset, $value ) |
|
222 | + public function offsetSet($offset, $value) |
|
223 | 223 | { |
224 | - $this->set( $offset, $value ); |
|
224 | + $this->set($offset, $value); |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | /** |
@@ -235,21 +235,21 @@ discard block |
||
235 | 235 | * @return void |
236 | 236 | * @since 5.0.0 |
237 | 237 | */ |
238 | - public function offsetUnset( $offset ) |
|
238 | + public function offsetUnset($offset) |
|
239 | 239 | { |
240 | 240 | $movingTarget = &$this->data; |
241 | - $keys = $this->parseDotNotation( $offset ); |
|
242 | - $length = count( $keys ); |
|
241 | + $keys = $this->parseDotNotation($offset); |
|
242 | + $length = count($keys); |
|
243 | 243 | |
244 | - foreach ( $keys as $i => $key ) |
|
244 | + foreach ($keys as $i => $key) |
|
245 | 245 | { |
246 | - if ( $i === $length - 1 ) |
|
246 | + if ($i===$length-1) |
|
247 | 247 | { |
248 | - unset( $movingTarget[ $key ] ); |
|
248 | + unset($movingTarget[$key]); |
|
249 | 249 | } |
250 | 250 | else |
251 | 251 | { |
252 | - $movingTarget = &$movingTarget[ $key ]; |
|
252 | + $movingTarget = &$movingTarget[$key]; |
|
253 | 253 | } |
254 | 254 | } |
255 | 255 | } |
@@ -259,6 +259,6 @@ discard block |
||
259 | 259 | */ |
260 | 260 | public function __toString() |
261 | 261 | { |
262 | - return json_encode( $this ); |
|
262 | + return json_encode($this); |
|
263 | 263 | } |
264 | 264 | } |
265 | 265 | \ No newline at end of file |
@@ -33,7 +33,9 @@ discard block |
||
33 | 33 | foreach ( $indices as $index ) |
34 | 34 | { |
35 | 35 | $isArray = is_array( $movingTarget ) || $movingTarget instanceof ArrayAccess; |
36 | - if ( ! $isArray || ! isset( $movingTarget[ $index ] ) ) return NULL; |
|
36 | + if ( ! $isArray || ! isset( $movingTarget[ $index ] ) ) { |
|
37 | + return NULL; |
|
38 | + } |
|
37 | 39 | |
38 | 40 | $movingTarget = $movingTarget[ $index ]; |
39 | 41 | } |
@@ -91,7 +93,9 @@ discard block |
||
91 | 93 | ) ); |
92 | 94 | } |
93 | 95 | |
94 | - if ( ! $isset || ! is_array( $movingTarget[ $key ] ) ) $movingTarget[ $key ] = []; |
|
96 | + if ( ! $isset || ! is_array( $movingTarget[ $key ] ) ) { |
|
97 | + $movingTarget[ $key ] = []; |
|
98 | + } |
|
95 | 99 | |
96 | 100 | $movingTarget = &$movingTarget[ $key ]; |
97 | 101 | } |
@@ -182,7 +186,9 @@ discard block |
||
182 | 186 | |
183 | 187 | foreach ( $this->parseDotNotation( $offset ) as $i ) |
184 | 188 | { |
185 | - if ( ! isset( $movingTarget[ $i ] ) ) return FALSE; |
|
189 | + if ( ! isset( $movingTarget[ $i ] ) ) { |
|
190 | + return FALSE; |
|
191 | + } |
|
186 | 192 | $movingTarget = $movingTarget[ $i ]; |
187 | 193 | } |
188 | 194 | |
@@ -246,8 +252,7 @@ discard block |
||
246 | 252 | if ( $i === $length - 1 ) |
247 | 253 | { |
248 | 254 | unset( $movingTarget[ $key ] ); |
249 | - } |
|
250 | - else |
|
255 | + } else |
|
251 | 256 | { |
252 | 257 | $movingTarget = &$movingTarget[ $key ]; |
253 | 258 | } |
@@ -18,11 +18,11 @@ discard block |
||
18 | 18 | */ |
19 | 19 | private static function checkFile() |
20 | 20 | { |
21 | - $filePortions = explode(DIRECTORY_SEPARATOR,self::$file); |
|
21 | + $filePortions = explode(DIRECTORY_SEPARATOR, self::$file); |
|
22 | 22 | $pop = array_pop($filePortions); |
23 | 23 | |
24 | - if(file_exists(implode(DIRECTORY_SEPARATOR,$filePortions)) |
|
25 | - && preg_match('@[a-zA-Z0-9]+\.json@',$pop)){ |
|
24 | + if (file_exists(implode(DIRECTORY_SEPARATOR, $filePortions)) |
|
25 | + && preg_match('@[a-zA-Z0-9]+\.json@', $pop)) { |
|
26 | 26 | return self::$file; |
27 | 27 | } |
28 | 28 | |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | { |
39 | 39 | $file = self::checkFile(); |
40 | 40 | |
41 | - if(!file_exists($file)){ |
|
42 | - files()->put($file,self::encode([])); |
|
41 | + if (!file_exists($file)) { |
|
42 | + files()->put($file, self::encode([])); |
|
43 | 43 | } |
44 | 44 | } |
45 | 45 | |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | */ |
52 | 52 | public static function decode($data) |
53 | 53 | { |
54 | - return json_decode($data,1); |
|
54 | + return json_decode($data, 1); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | /** |
@@ -63,26 +63,26 @@ discard block |
||
63 | 63 | * |
64 | 64 | * @throws FileNotFoundException |
65 | 65 | */ |
66 | - public static function delete($key,$arrayKey=null) |
|
66 | + public static function delete($key, $arrayKey = null) |
|
67 | 67 | { |
68 | 68 | $data = self::get(); |
69 | 69 | |
70 | - if(is_null($arrayKey)){ |
|
70 | + if (is_null($arrayKey)) { |
|
71 | 71 | |
72 | - if(isset($data[$key])){ |
|
72 | + if (isset($data[$key])) { |
|
73 | 73 | unset($data[$key]); |
74 | - files()->put(self::checkFile(),self::encode($data),true); |
|
74 | + files()->put(self::checkFile(), self::encode($data), true); |
|
75 | 75 | return true; |
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
79 | 79 | // if the data to be deleted |
80 | 80 | // in json data contains a nested array data. |
81 | - if(!is_null($arrayKey) && is_string($arrayKey)){ |
|
81 | + if (!is_null($arrayKey) && is_string($arrayKey)) { |
|
82 | 82 | |
83 | - if(isset($data[$key][$arrayKey])){ |
|
83 | + if (isset($data[$key][$arrayKey])) { |
|
84 | 84 | unset($data[$key][$arrayKey]); |
85 | - files()->put(self::checkFile(),self::encode($data),true); |
|
85 | + files()->put(self::checkFile(), self::encode($data), true); |
|
86 | 86 | return true; |
87 | 87 | } |
88 | 88 | } |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | */ |
99 | 99 | public static function encode($data) |
100 | 100 | { |
101 | - return json_encode($data,JSON_PRETTY_PRINT); |
|
101 | + return json_encode($data, JSON_PRETTY_PRINT); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | /** |
@@ -109,13 +109,13 @@ discard block |
||
109 | 109 | * |
110 | 110 | * @throws FileNotFoundException |
111 | 111 | */ |
112 | - public static function get($key=null) |
|
112 | + public static function get($key = null) |
|
113 | 113 | { |
114 | 114 | self::createIfNotFileExist(); |
115 | 115 | |
116 | 116 | $data = self::decode(files()->get(self::checkFile())); |
117 | 117 | |
118 | - if(is_null($key)){ |
|
118 | + if (is_null($key)) { |
|
119 | 119 | return $data; |
120 | 120 | } |
121 | 121 | |
@@ -132,27 +132,27 @@ discard block |
||
132 | 132 | * |
133 | 133 | * @throws FileNotFoundException |
134 | 134 | */ |
135 | - public static function set($key,$value) |
|
135 | + public static function set($key, $value) |
|
136 | 136 | { |
137 | 137 | self::createIfNotFileExist(); |
138 | 138 | |
139 | 139 | $file = self::get(); |
140 | 140 | |
141 | - $dotted = explode('.',$key); |
|
141 | + $dotted = explode('.', $key); |
|
142 | 142 | |
143 | - if(count($dotted)>1){ |
|
143 | + if (count($dotted)>1) { |
|
144 | 144 | $arrayInstance = new ArraySafe(self::get()); |
145 | - $nestedArray = $arrayInstance->set($key,$value)->toArray(); |
|
146 | - files()->put(self::checkFile(),self::encode($nestedArray)); |
|
145 | + $nestedArray = $arrayInstance->set($key, $value)->toArray(); |
|
146 | + files()->put(self::checkFile(), self::encode($nestedArray)); |
|
147 | 147 | } |
148 | - else{ |
|
148 | + else { |
|
149 | 149 | |
150 | - if(isset($file[$key]) && is_array($value)){ |
|
151 | - $file[$key] = array_merge($file[$key],$value); |
|
152 | - files()->put(self::checkFile(),self::encode($file)); |
|
150 | + if (isset($file[$key]) && is_array($value)) { |
|
151 | + $file[$key] = array_merge($file[$key], $value); |
|
152 | + files()->put(self::checkFile(), self::encode($file)); |
|
153 | 153 | } |
154 | - else{ |
|
155 | - files()->put(self::checkFile(),self::encode(array_merge($file,[$key=>$value]))); |
|
154 | + else { |
|
155 | + files()->put(self::checkFile(), self::encode(array_merge($file, [$key=>$value]))); |
|
156 | 156 | } |
157 | 157 | } |
158 | 158 |
@@ -144,14 +144,12 @@ |
||
144 | 144 | $arrayInstance = new ArraySafe(self::get()); |
145 | 145 | $nestedArray = $arrayInstance->set($key,$value)->toArray(); |
146 | 146 | files()->put(self::checkFile(),self::encode($nestedArray)); |
147 | - } |
|
148 | - else{ |
|
147 | + } else{ |
|
149 | 148 | |
150 | 149 | if(isset($file[$key]) && is_array($value)){ |
151 | 150 | $file[$key] = array_merge($file[$key],$value); |
152 | 151 | files()->put(self::checkFile(),self::encode($file)); |
153 | - } |
|
154 | - else{ |
|
152 | + } else{ |
|
155 | 153 | files()->put(self::checkFile(),self::encode(array_merge($file,[$key=>$value]))); |
156 | 154 | } |
157 | 155 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | /** |
26 | 26 | * @var array |
27 | 27 | */ |
28 | - protected $stubList=array(); |
|
28 | + protected $stubList = array(); |
|
29 | 29 | |
30 | 30 | /** |
31 | 31 | * FileProcess constructor. |
@@ -41,10 +41,10 @@ discard block |
||
41 | 41 | * @param $data |
42 | 42 | * @return bool |
43 | 43 | */ |
44 | - public function dumpFile($file,$data) |
|
44 | + public function dumpFile($file, $data) |
|
45 | 45 | { |
46 | 46 | try { |
47 | - $this->fs->dumpFile($file,$data); |
|
47 | + $this->fs->dumpFile($file, $data); |
|
48 | 48 | return true; |
49 | 49 | } catch (IOExceptionInterface $exception) { |
50 | 50 | return false; |
@@ -56,21 +56,21 @@ discard block |
||
56 | 56 | * @param bool $status |
57 | 57 | * @return mixed |
58 | 58 | */ |
59 | - public function makeDirectory($data,$status=false) |
|
59 | + public function makeDirectory($data, $status = false) |
|
60 | 60 | { |
61 | - if($data->type=="project" && file_exists($data->project)){ |
|
61 | + if ($data->type=="project" && file_exists($data->project)) { |
|
62 | 62 | throw new \LogicException('This Project Is Already Available'); |
63 | 63 | } |
64 | - if(false===$status){ |
|
64 | + if (false===$status) { |
|
65 | 65 | |
66 | - if($data->type!=="project" && !file_exists($data->project)){ |
|
66 | + if ($data->type!=="project" && !file_exists($data->project)) { |
|
67 | 67 | throw new \LogicException('Project No'); |
68 | 68 | } |
69 | 69 | } |
70 | - foreach ($data->directory as $directory){ |
|
70 | + foreach ($data->directory as $directory) { |
|
71 | 71 | try { |
72 | - $this->fs->mkdir($directory,'0777'); |
|
73 | - chmod($directory,0777); |
|
72 | + $this->fs->mkdir($directory, '0777'); |
|
73 | + chmod($directory, 0777); |
|
74 | 74 | } catch (IOExceptionInterface $e) { |
75 | 75 | return "An error occurred while creating your directory at ".$e->getPath(); |
76 | 76 | } |
@@ -102,25 +102,25 @@ discard block |
||
102 | 102 | * @param $data |
103 | 103 | * @param array $complex |
104 | 104 | */ |
105 | - public function touch($data,$complex=array()) |
|
105 | + public function touch($data, $complex = array()) |
|
106 | 106 | { |
107 | - $this->data=$data; |
|
107 | + $this->data = $data; |
|
108 | 108 | |
109 | - if(isset($complex['stub']) && isset($this->data->argument['stub'])){ |
|
109 | + if (isset($complex['stub']) && isset($this->data->argument['stub'])) { |
|
110 | 110 | |
111 | 111 | $this->stubManager($complex); |
112 | 112 | } |
113 | 113 | |
114 | - $execArray=(count($this->stubList)) ? $this->stubList : $this->data->touch; |
|
114 | + $execArray = (count($this->stubList)) ? $this->stubList : $this->data->touch; |
|
115 | 115 | |
116 | - foreach ($execArray as $execution=>$touch){ |
|
116 | + foreach ($execArray as $execution=>$touch) { |
|
117 | 117 | |
118 | - if(!file_exists($touch) && $touch!==null){ |
|
118 | + if (!file_exists($touch) && $touch!==null) { |
|
119 | 119 | touch($touch); |
120 | 120 | |
121 | - $executionPath=$this->stubPath.'/'.$execution.'.stub'; |
|
122 | - if(file_exists($executionPath)){ |
|
123 | - $this->fopenprocess($executionPath,$touch,$data); |
|
121 | + $executionPath = $this->stubPath.'/'.$execution.'.stub'; |
|
122 | + if (file_exists($executionPath)) { |
|
123 | + $this->fopenprocess($executionPath, $touch, $data); |
|
124 | 124 | } |
125 | 125 | } |
126 | 126 | } |
@@ -129,37 +129,37 @@ discard block |
||
129 | 129 | /** |
130 | 130 | * @param array $complex |
131 | 131 | */ |
132 | - private function stubManager($complex=array()) |
|
132 | + private function stubManager($complex = array()) |
|
133 | 133 | { |
134 | - $stubStructure = explode("_",$complex['stub']); |
|
134 | + $stubStructure = explode("_", $complex['stub']); |
|
135 | 135 | $stubStructure[] = $this->data->argument['stub']; |
136 | 136 | |
137 | - $stubberDirectoryList=path()->stubs(); |
|
137 | + $stubberDirectoryList = path()->stubs(); |
|
138 | 138 | |
139 | - foreach ($stubStructure as $stubberDirectory){ |
|
139 | + foreach ($stubStructure as $stubberDirectory) { |
|
140 | 140 | |
141 | 141 | $stubberDirectoryList = $stubberDirectoryList.'/'.$stubberDirectory; |
142 | 142 | |
143 | 143 | $this->setDirectory($stubberDirectoryList); |
144 | 144 | } |
145 | 145 | |
146 | - foreach ($this->data->touch as $execution=>$executionFile){ |
|
146 | + foreach ($this->data->touch as $execution=>$executionFile) { |
|
147 | 147 | |
148 | - $executionArray=explode("/",$execution); |
|
148 | + $executionArray = explode("/", $execution); |
|
149 | 149 | |
150 | 150 | $executionStub = end($executionArray).''; |
151 | 151 | $this->stubList[$executionStub] = $executionFile; |
152 | 152 | $stubberFile = $stubberDirectoryList.'/'.$executionStub.'.stub'; |
153 | 153 | |
154 | - $originalPath=$this->stubPath.'/'.$execution.'.stub'; |
|
154 | + $originalPath = $this->stubPath.'/'.$execution.'.stub'; |
|
155 | 155 | |
156 | - if(!file_exists($stubberFile)){ |
|
156 | + if (!file_exists($stubberFile)) { |
|
157 | 157 | |
158 | - $this->fs->copy($originalPath,$stubberFile); |
|
158 | + $this->fs->copy($originalPath, $stubberFile); |
|
159 | 159 | } |
160 | 160 | } |
161 | 161 | |
162 | - $this->stubPath=$stubberDirectoryList; |
|
162 | + $this->stubPath = $stubberDirectoryList; |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | |
@@ -169,16 +169,16 @@ discard block |
||
169 | 169 | * @param $param |
170 | 170 | * @return bool |
171 | 171 | */ |
172 | - public function fopenprocess($executionPath,$path,$param) |
|
172 | + public function fopenprocess($executionPath, $path, $param) |
|
173 | 173 | { |
174 | 174 | $dt = fopen($executionPath, "r"); |
175 | 175 | $content = fread($dt, filesize($executionPath)); |
176 | 176 | fclose($dt); |
177 | 177 | |
178 | - foreach ($param->argument as $key=>$value){ |
|
178 | + foreach ($param->argument as $key=>$value) { |
|
179 | 179 | |
180 | - $content=str_replace("__".$key."__",$value,$content); |
|
181 | - $content=str_replace("__".$key."-low__",strtolower($value),$content); |
|
180 | + $content = str_replace("__".$key."__", $value, $content); |
|
181 | + $content = str_replace("__".$key."-low__", strtolower($value), $content); |
|
182 | 182 | } |
183 | 183 | |
184 | 184 | $dt = fopen($path, "w"); |
@@ -194,14 +194,14 @@ discard block |
||
194 | 194 | * @param $param |
195 | 195 | * @return bool |
196 | 196 | */ |
197 | - public function stubCopy($executionPath,$path,$param) |
|
197 | + public function stubCopy($executionPath, $path, $param) |
|
198 | 198 | { |
199 | 199 | $dt = fopen($executionPath, "r"); |
200 | 200 | $content = fread($dt, filesize($executionPath)); |
201 | 201 | fclose($dt); |
202 | 202 | |
203 | - foreach ($param->argument as $key=>$value){ |
|
204 | - $content=str_replace("__".$key."__",$value,$content); |
|
203 | + foreach ($param->argument as $key=>$value) { |
|
204 | + $content = str_replace("__".$key."__", $value, $content); |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | $dt = fopen($path, "w"); |
@@ -215,9 +215,9 @@ discard block |
||
215 | 215 | * @param null $file |
216 | 216 | * @return mixed|null |
217 | 217 | */ |
218 | - public function callFile($file=null) |
|
218 | + public function callFile($file = null) |
|
219 | 219 | { |
220 | - if(file_exists($file)){ |
|
220 | + if (file_exists($file)) { |
|
221 | 221 | return require_once($file); |
222 | 222 | } |
223 | 223 | return null; |
@@ -229,9 +229,9 @@ discard block |
||
229 | 229 | * @param null|string $file |
230 | 230 | * @param null|string $data |
231 | 231 | */ |
232 | - public function writeFile($file=null,$data=null) |
|
232 | + public function writeFile($file = null, $data = null) |
|
233 | 233 | { |
234 | - if(!is_null($file) && !is_null($data)){ |
|
234 | + if (!is_null($file) && !is_null($data)) { |
|
235 | 235 | |
236 | 236 | $dt = fopen($file, "r"); |
237 | 237 | $content = fread($dt, filesize($file)); |
@@ -46,11 +46,11 @@ discard block |
||
46 | 46 | /** |
47 | 47 | * @return void |
48 | 48 | */ |
49 | - public function create(){ |
|
49 | + public function create() { |
|
50 | 50 | |
51 | 51 | $schedulePath = app()->path()->schedule(); |
52 | 52 | |
53 | - if(!file_exists($schedulePath)){ |
|
53 | + if (!file_exists($schedulePath)) { |
|
54 | 54 | $this->directory['schedule'] = $schedulePath; |
55 | 55 | $this->file->makeDirectory($this); |
56 | 56 | } |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | $this->argument['scheduleClass'] = ucfirst($this->argument['schedule']).''; |
60 | 60 | $this->argument['projectName'] = strtolower($this->projectName()); |
61 | 61 | |
62 | - $this->touch['schedule/schedule']= $schedulePath.'/'.$this->argument['schedule'].'.php'; |
|
62 | + $this->touch['schedule/schedule'] = $schedulePath.'/'.$this->argument['schedule'].'.php'; |
|
63 | 63 | |
64 | 64 | |
65 | 65 | $this->file->touch($this); |
@@ -76,39 +76,39 @@ discard block |
||
76 | 76 | { |
77 | 77 | $this->scheduleJsonFile(); |
78 | 78 | $this->clear(); |
79 | - foreach (JsonHandler::get() as $schedule=>$items){ |
|
80 | - if($schedule!==$this->argument['schedule']){ |
|
81 | - app()->command('schedule register','schedule:'.$schedule); |
|
79 | + foreach (JsonHandler::get() as $schedule=>$items) { |
|
80 | + if ($schedule!==$this->argument['schedule']) { |
|
81 | + app()->command('schedule register', 'schedule:'.$schedule); |
|
82 | 82 | } |
83 | 83 | } |
84 | 84 | } |
85 | 85 | |
86 | 86 | public function list() |
87 | 87 | { |
88 | - exec('crontab -l',$list); |
|
88 | + exec('crontab -l', $list); |
|
89 | 89 | |
90 | - $this->table->setHeaders(['no','minute','hour','day','month','week','schedule','description']); |
|
90 | + $this->table->setHeaders(['no', 'minute', 'hour', 'day', 'month', 'week', 'schedule', 'description']); |
|
91 | 91 | |
92 | 92 | |
93 | - foreach ($list as $key=>$item){ |
|
93 | + foreach ($list as $key=>$item) { |
|
94 | 94 | |
95 | - if(preg_match('@.*php api schedule run '.strtolower($this->projectName()).'.*@is',$item,$result)){ |
|
96 | - if(isset($result[0])){ |
|
95 | + if (preg_match('@.*php api schedule run '.strtolower($this->projectName()).'.*@is', $item, $result)) { |
|
96 | + if (isset($result[0])) { |
|
97 | 97 | |
98 | 98 | $cron = []; |
99 | 99 | |
100 | - if(preg_match('@(.*)\scd@',$result[0],$cron)){ |
|
101 | - $cron = (isset($cron[1])) ? explode(' ',$cron[1]) : ''; |
|
100 | + if (preg_match('@(.*)\scd@', $result[0], $cron)) { |
|
101 | + $cron = (isset($cron[1])) ? explode(' ', $cron[1]) : ''; |
|
102 | 102 | |
103 | 103 | } |
104 | 104 | |
105 | 105 | $scheduleName = ''; |
106 | 106 | |
107 | - if(preg_match('@schedule\:(.*?)\s@',$result[0],$scheduler)){ |
|
107 | + if (preg_match('@schedule\:(.*?)\s@', $result[0], $scheduler)) { |
|
108 | 108 | $scheduleName = (isset($scheduler[1])) ? $scheduler[1] : ''; |
109 | 109 | |
110 | 110 | $schedulerInstance = $this->scheduleInstance(ucfirst($scheduleName)); |
111 | - $description = ClosureDispatcher::bind($schedulerInstance)->call(function(){ |
|
111 | + $description = ClosureDispatcher::bind($schedulerInstance)->call(function() { |
|
112 | 112 | return $this->description; |
113 | 113 | }); |
114 | 114 | |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | $schedules = Utils::glob(app()->path()->schedule()); |
140 | 140 | |
141 | 141 | |
142 | - if(isset($schedules[$this->argument['schedule']])){ |
|
142 | + if (isset($schedules[$this->argument['schedule']])) { |
|
143 | 143 | |
144 | 144 | $scheduleNamespace = Utils::getNamespace($schedules[$this->argument['schedule']]); |
145 | 145 | $scheduleInstance = app()->resolve($scheduleNamespace); |
@@ -147,20 +147,20 @@ discard block |
||
147 | 147 | $scheduleManager = new ScheduleManager(); |
148 | 148 | $scheduleInstance->when($scheduleManager); |
149 | 149 | |
150 | - $cronScheduler = implode(' ',$scheduleManager->getCronScheduler()); |
|
150 | + $cronScheduler = implode(' ', $scheduleManager->getCronScheduler()); |
|
151 | 151 | |
152 | 152 | $command = $cronScheduler.' cd '.root.' && php api schedule run munch schedule:'.lcfirst($this->argument['schedule']).' >> /dev/null 2>&1'; |
153 | 153 | |
154 | - if($this->cronjob_exists($command)===false){ |
|
154 | + if ($this->cronjob_exists($command)===false) { |
|
155 | 155 | |
156 | 156 | $output = shell_exec('crontab -l'); |
157 | 157 | file_put_contents('/tmp/crontab.txt', $output.''.$command.''.PHP_EOL); |
158 | 158 | exec('crontab /tmp/crontab.txt'); |
159 | 159 | |
160 | 160 | $this->scheduleJsonFile(); |
161 | - JsonHandler::set($this->argument['schedule'].'.namespace',$scheduleNamespace); |
|
162 | - JsonHandler::set($this->argument['schedule'].'.date',date('Y-m-d H:i:s')); |
|
163 | - JsonHandler::set($this->argument['schedule'].'.command',$cronScheduler); |
|
161 | + JsonHandler::set($this->argument['schedule'].'.namespace', $scheduleNamespace); |
|
162 | + JsonHandler::set($this->argument['schedule'].'.date', date('Y-m-d H:i:s')); |
|
163 | + JsonHandler::set($this->argument['schedule'].'.command', $cronScheduler); |
|
164 | 164 | |
165 | 165 | echo $this->info('Cron has been added'); |
166 | 166 | } |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | { |
175 | 175 | $schedules = Utils::glob(app()->path()->schedule()); |
176 | 176 | |
177 | - if(isset($schedules[$this->argument['schedule']])){ |
|
177 | + if (isset($schedules[$this->argument['schedule']])) { |
|
178 | 178 | $scheduleNamespace = Utils::getNamespace($schedules[$this->argument['schedule']]); |
179 | 179 | $scheduleInstance = app()->resolve($scheduleNamespace); |
180 | 180 | |
@@ -186,25 +186,25 @@ discard block |
||
186 | 186 | { |
187 | 187 | $this->clear(); |
188 | 188 | $this->scheduleJsonFile(); |
189 | - foreach (JsonHandler::get() as $schedule=>$items){ |
|
190 | - app()->command('schedule register','schedule:'.lcfirst($schedule)); |
|
189 | + foreach (JsonHandler::get() as $schedule=>$items) { |
|
190 | + app()->command('schedule register', 'schedule:'.lcfirst($schedule)); |
|
191 | 191 | } |
192 | 192 | } |
193 | 193 | |
194 | - private function cronjob_exists($command){ |
|
194 | + private function cronjob_exists($command) { |
|
195 | 195 | |
196 | - $cronjob_exists=false; |
|
196 | + $cronjob_exists = false; |
|
197 | 197 | |
198 | 198 | exec('crontab -l', $crontab); |
199 | 199 | |
200 | 200 | |
201 | - if(isset($crontab)&&is_array($crontab)){ |
|
201 | + if (isset($crontab) && is_array($crontab)) { |
|
202 | 202 | |
203 | 203 | $crontab = array_flip($crontab); |
204 | 204 | |
205 | - if(isset($crontab[$command])){ |
|
205 | + if (isset($crontab[$command])) { |
|
206 | 206 | |
207 | - $cronjob_exists=true; |
|
207 | + $cronjob_exists = true; |
|
208 | 208 | |
209 | 209 | } |
210 | 210 | |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | { |
221 | 221 | $schedules = Utils::glob(app()->path()->schedule()); |
222 | 222 | |
223 | - if(isset($schedules[$schedule])){ |
|
223 | + if (isset($schedules[$schedule])) { |
|
224 | 224 | $scheduleNamespace = Utils::getNamespace($schedules[$schedule]); |
225 | 225 | return $scheduleInstance = app()->resolve($scheduleNamespace); |
226 | 226 | } |