@@ -29,15 +29,15 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function log() |
31 | 31 | { |
32 | - if(app()->has('track.path')){ |
|
32 | + if (app()->has('track.path')) { |
|
33 | 33 | $trackPath = app()->get('track.path'); |
34 | 34 | $logger = $trackPath($this->argument); |
35 | 35 | } |
36 | - else{ |
|
36 | + else { |
|
37 | 37 | $logger = app()->path()->appLog().''.DIRECTORY_SEPARATOR.''.date('Y').''.DIRECTORY_SEPARATOR.''.date('m').''.DIRECTORY_SEPARATOR.''.date('d').'-access.log'; |
38 | 38 | } |
39 | 39 | |
40 | - if(!file_exists($logger)){ |
|
40 | + if (!file_exists($logger)) { |
|
41 | 41 | echo 'No requests for a log tracker have been detected yet.'; |
42 | 42 | echo PHP_EOL; |
43 | 43 | exit(); |
@@ -53,18 +53,18 @@ discard block |
||
53 | 53 | while (!feof($proc)) |
54 | 54 | { |
55 | 55 | $result = fread($proc, 4096); |
56 | - if(preg_match('@\{(.*)\}@',$result,$output)){ |
|
57 | - $outputArray = json_decode($output[0],1); |
|
56 | + if (preg_match('@\{(.*)\}@', $result, $output)) { |
|
57 | + $outputArray = json_decode($output[0], 1); |
|
58 | 58 | |
59 | 59 | $outputArray['trackNumber'] = ++$number; |
60 | 60 | |
61 | - if(app()->has('track.log')){ |
|
61 | + if (app()->has('track.log')) { |
|
62 | 62 | |
63 | 63 | $track = app()->get('track.log'); |
64 | - echo $track($outputArray,$this->argument); |
|
64 | + echo $track($outputArray, $this->argument); |
|
65 | 65 | } |
66 | 66 | } |
67 | - else{ |
|
67 | + else { |
|
68 | 68 | echo $result; |
69 | 69 | } |
70 | 70 | @ flush(); |
@@ -32,8 +32,7 @@ discard block |
||
32 | 32 | if(app()->has('track.path')){ |
33 | 33 | $trackPath = app()->get('track.path'); |
34 | 34 | $logger = $trackPath($this->argument); |
35 | - } |
|
36 | - else{ |
|
35 | + } else{ |
|
37 | 36 | $logger = app()->path()->appLog().''.DIRECTORY_SEPARATOR.''.date('Y').''.DIRECTORY_SEPARATOR.''.date('m').''.DIRECTORY_SEPARATOR.''.date('d').'-access.log'; |
38 | 37 | } |
39 | 38 | |
@@ -63,8 +62,7 @@ discard block |
||
63 | 62 | $track = app()->get('track.log'); |
64 | 63 | echo $track($outputArray,$this->argument); |
65 | 64 | } |
66 | - } |
|
67 | - else{ |
|
65 | + } else{ |
|
68 | 66 | echo $result; |
69 | 67 | } |
70 | 68 | @ flush(); |
@@ -23,13 +23,13 @@ discard block |
||
23 | 23 | */ |
24 | 24 | private static function checkFile() |
25 | 25 | { |
26 | - if(!is_null(self::$singleton)) return self::$singleton; |
|
26 | + if (!is_null(self::$singleton)) return self::$singleton; |
|
27 | 27 | |
28 | - $filePortions = explode(DIRECTORY_SEPARATOR,self::$file); |
|
28 | + $filePortions = explode(DIRECTORY_SEPARATOR, self::$file); |
|
29 | 29 | $pop = array_pop($filePortions); |
30 | 30 | |
31 | - if(file_exists(implode(DIRECTORY_SEPARATOR,$filePortions)) |
|
32 | - && preg_match('@[a-zA-Z0-9]+\.json@',$pop)){ |
|
31 | + if (file_exists(implode(DIRECTORY_SEPARATOR, $filePortions)) |
|
32 | + && preg_match('@[a-zA-Z0-9]+\.json@', $pop)) { |
|
33 | 33 | self::$singleton = self::$file; |
34 | 34 | return self::$singleton; |
35 | 35 | } |
@@ -46,8 +46,8 @@ discard block |
||
46 | 46 | { |
47 | 47 | $file = self::checkFile(); |
48 | 48 | |
49 | - if(!file_exists($file)){ |
|
50 | - files()->put($file,self::encode([])); |
|
49 | + if (!file_exists($file)) { |
|
50 | + files()->put($file, self::encode([])); |
|
51 | 51 | } |
52 | 52 | } |
53 | 53 | |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | */ |
60 | 60 | public static function decode($data) |
61 | 61 | { |
62 | - return json_decode($data,1); |
|
62 | + return json_decode($data, 1); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
@@ -71,26 +71,26 @@ discard block |
||
71 | 71 | * |
72 | 72 | * @throws FileNotFoundException |
73 | 73 | */ |
74 | - public static function delete($key,$arrayKey=null) |
|
74 | + public static function delete($key, $arrayKey = null) |
|
75 | 75 | { |
76 | 76 | $data = self::get(); |
77 | 77 | |
78 | - if(is_null($arrayKey)){ |
|
78 | + if (is_null($arrayKey)) { |
|
79 | 79 | |
80 | - if(isset($data[$key])){ |
|
80 | + if (isset($data[$key])) { |
|
81 | 81 | unset($data[$key]); |
82 | - files()->put(self::checkFile(),self::encode($data),true); |
|
82 | + files()->put(self::checkFile(), self::encode($data), true); |
|
83 | 83 | return true; |
84 | 84 | } |
85 | 85 | } |
86 | 86 | |
87 | 87 | // if the data to be deleted |
88 | 88 | // in json data contains a nested array data. |
89 | - if(!is_null($arrayKey) && is_string($arrayKey)){ |
|
89 | + if (!is_null($arrayKey) && is_string($arrayKey)) { |
|
90 | 90 | |
91 | - if(isset($data[$key][$arrayKey])){ |
|
91 | + if (isset($data[$key][$arrayKey])) { |
|
92 | 92 | unset($data[$key][$arrayKey]); |
93 | - files()->put(self::checkFile(),self::encode($data),true); |
|
93 | + files()->put(self::checkFile(), self::encode($data), true); |
|
94 | 94 | return true; |
95 | 95 | } |
96 | 96 | } |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | */ |
107 | 107 | public static function encode($data) |
108 | 108 | { |
109 | - return json_encode($data,JSON_PRETTY_PRINT); |
|
109 | + return json_encode($data, JSON_PRETTY_PRINT); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | /** |
@@ -132,18 +132,18 @@ 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 | - if(isset($file[$key]) && is_array($value)){ |
|
142 | - $file[$key] = array_merge($file[$key],$value); |
|
143 | - files()->put(self::checkFile(),self::encode($file)); |
|
141 | + if (isset($file[$key]) && is_array($value)) { |
|
142 | + $file[$key] = array_merge($file[$key], $value); |
|
143 | + files()->put(self::checkFile(), self::encode($file)); |
|
144 | 144 | } |
145 | - else{ |
|
146 | - files()->put(self::checkFile(),self::encode(array_merge($file,[$key=>$value]))); |
|
145 | + else { |
|
146 | + files()->put(self::checkFile(), self::encode(array_merge($file, [$key=>$value]))); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | return self::get(); |
@@ -23,7 +23,9 @@ discard block |
||
23 | 23 | */ |
24 | 24 | private static function checkFile() |
25 | 25 | { |
26 | - if(!is_null(self::$singleton)) return self::$singleton; |
|
26 | + if(!is_null(self::$singleton)) { |
|
27 | + return self::$singleton; |
|
28 | + } |
|
27 | 29 | |
28 | 30 | $filePortions = explode(DIRECTORY_SEPARATOR,self::$file); |
29 | 31 | $pop = array_pop($filePortions); |
@@ -141,8 +143,7 @@ discard block |
||
141 | 143 | if(isset($file[$key]) && is_array($value)){ |
142 | 144 | $file[$key] = array_merge($file[$key],$value); |
143 | 145 | files()->put(self::checkFile(),self::encode($file)); |
144 | - } |
|
145 | - else{ |
|
146 | + } else{ |
|
146 | 147 | files()->put(self::checkFile(),self::encode(array_merge($file,[$key=>$value]))); |
147 | 148 | } |
148 | 149 |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | */ |
17 | 17 | public static function getInstance() |
18 | 18 | { |
19 | - if(is_null(self::$singleton)){ |
|
19 | + if (is_null(self::$singleton)) { |
|
20 | 20 | self::$singleton = new Serializer(); |
21 | 21 | } |
22 | 22 | |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | |
31 | 31 | public static function set($data) |
32 | 32 | { |
33 | - if(is_callable($data)){ |
|
33 | + if (is_callable($data)) { |
|
34 | 34 | return self::getInstance()->serialize($data); |
35 | 35 | } |
36 | 36 | return self::getInstance()->serialize(function() use ($data){ |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | use Resta\Contracts\ApplicationContracts; |
10 | 10 | use Resta\Exception\FileNotFoundException; |
11 | 11 | |
12 | -class Container implements ContainerContracts,\ArrayAccess |
|
12 | +class Container implements ContainerContracts, \ArrayAccess |
|
13 | 13 | { |
14 | 14 | /** |
15 | 15 | * @var bool |
@@ -51,12 +51,12 @@ discard block |
||
51 | 51 | * @param array $bind |
52 | 52 | * @return array |
53 | 53 | */ |
54 | - public function applicationProviderBinding($make,$bind=array()) |
|
54 | + public function applicationProviderBinding($make, $bind = array()) |
|
55 | 55 | { |
56 | 56 | //service container is an automatic application provider |
57 | 57 | //that we can bind to the special class di in the dependency condition. |
58 | 58 | //This method is automatically added to the classes resolved by the entire make bind method. |
59 | - return array_merge($bind,['app'=>$make]); |
|
59 | + return array_merge($bind, ['app'=>$make]); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
@@ -68,16 +68,16 @@ discard block |
||
68 | 68 | * @throws DependencyException |
69 | 69 | * @throws NotFoundException |
70 | 70 | */ |
71 | - public function bind($object=null,$callback=null,$alias=null) |
|
71 | + public function bind($object = null, $callback = null, $alias = null) |
|
72 | 72 | { |
73 | - if(!is_null($alias)){ |
|
73 | + if (!is_null($alias)) { |
|
74 | 74 | $object = $alias; |
75 | 75 | } |
76 | 76 | |
77 | 77 | //If the bind method does not have parameters object and callback, the value is directly assigned to the kernel object. |
78 | 78 | //Otherwise, when the bind object and callback are sent, the closure class inherits |
79 | 79 | //the applicationProvider object and the resolve method is called |
80 | - return $this->make($object,$callback,'container'); |
|
80 | + return $this->make($object, $callback, 'container'); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | /** |
@@ -89,16 +89,16 @@ discard block |
||
89 | 89 | * @throws DependencyException |
90 | 90 | * @throws NotFoundException |
91 | 91 | */ |
92 | - private function build($object,$callback,$sync=false) |
|
92 | + private function build($object, $callback, $sync = false) |
|
93 | 93 | { |
94 | 94 | //If the console object returns true, |
95 | 95 | //we do not cancel binding operations |
96 | 96 | //We are getting what applies to console with consoleKernelObject. |
97 | - if($sync===false) return $this->consoleKernelObjectChecker($object,$callback); |
|
97 | + if ($sync===false) return $this->consoleKernelObjectChecker($object, $callback); |
|
98 | 98 | |
99 | 99 | //the value corresponding to the bind value for the global object is assigned and |
100 | 100 | //the resolve method is called for the dependency injection. |
101 | - $this->kernelAssigner()->setKernelObject($object,$callback); |
|
101 | + $this->kernelAssigner()->setKernelObject($object, $callback); |
|
102 | 102 | |
103 | 103 | //return kernel object |
104 | 104 | return $this->kernel(); |
@@ -113,11 +113,11 @@ discard block |
||
113 | 113 | * @throws DependencyException |
114 | 114 | * @throws NotFoundException |
115 | 115 | */ |
116 | - private function consoleKernelObject($object,$callback,$container=false) |
|
116 | + private function consoleKernelObject($object, $callback, $container = false) |
|
117 | 117 | { |
118 | 118 | //we use the console bindings class to specify the classes to be preloaded in the console application. |
119 | 119 | //Thus, classes that can not be bound with http are called without closure in global loaders directory. |
120 | - $this->resolve(ConsoleBindings::class)->console($object,$callback,$container); |
|
120 | + $this->resolve(ConsoleBindings::class)->console($object, $callback, $container); |
|
121 | 121 | |
122 | 122 | //The console application must always return the kernel method. |
123 | 123 | return $this->kernel(); |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | * @throws DependencyException |
133 | 133 | * @throws NotFoundException |
134 | 134 | */ |
135 | - private function consoleKernelObjectChecker($object,$callback,$container=false) |
|
135 | + private function consoleKernelObjectChecker($object, $callback, $container = false) |
|
136 | 136 | { |
137 | 137 | //we check whether the callback value is a callable function. |
138 | 138 | $isCallableForCallback = is_callable($callback); |
@@ -140,10 +140,10 @@ discard block |
||
140 | 140 | //If the console object returns true, |
141 | 141 | //we do not cancel binding operations |
142 | 142 | //We are getting what applies to console with consoleKernelObject. |
143 | - if($this->console() AND $isCallableForCallback) return $this->consoleKernelObject($object,$callback,$container); |
|
143 | + if ($this->console() AND $isCallableForCallback) return $this->consoleKernelObject($object, $callback, $container); |
|
144 | 144 | |
145 | 145 | //If the application is not a console operation, we re-bind to existing methods synchronously. |
146 | - return ($container) ? $this->containerBuild($object,$callback,true) : $this->build($object,$callback,true); |
|
146 | + return ($container) ? $this->containerBuild($object, $callback, true) : $this->build($object, $callback, true); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | /** |
@@ -153,11 +153,11 @@ discard block |
||
153 | 153 | * @throws DependencyException |
154 | 154 | * @throws NotFoundException |
155 | 155 | */ |
156 | - private function consoleShared($object,$callback) |
|
156 | + private function consoleShared($object, $callback) |
|
157 | 157 | { |
158 | 158 | //The console share is evaluated as a true variable to be assigned as the 3rd parameter in the classes to be bound. |
159 | 159 | //The work to be done here is to bind the classes to be included in the console share privately. |
160 | - $this->kernelAssigner()->consoleShared($object,$callback); |
|
160 | + $this->kernelAssigner()->consoleShared($object, $callback); |
|
161 | 161 | } |
162 | 162 | |
163 | 163 | /** |
@@ -169,12 +169,12 @@ discard block |
||
169 | 169 | * @throws DependencyException |
170 | 170 | * @throws NotFoundException |
171 | 171 | */ |
172 | - public function containerBuild($object,$callback,$sync=false) |
|
172 | + public function containerBuild($object, $callback, $sync = false) |
|
173 | 173 | { |
174 | 174 | //If the console object returns true, |
175 | 175 | //we do not cancel binding operations |
176 | 176 | //We are getting what applies to console with consoleKernelObject. |
177 | - if($sync===false) return $this->consoleKernelObjectChecker($object,$callback,true); |
|
177 | + if ($sync===false) return $this->consoleKernelObjectChecker($object, $callback, true); |
|
178 | 178 | |
179 | 179 | //Since the objects that come to the build method are objects from the container method, |
180 | 180 | //we need to automatically create a kernel object named serviceContainer in this method. |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | |
183 | 183 | //the value corresponding to the bind value for the global object is assigned and |
184 | 184 | //the resolve method is called for the dependency method. |
185 | - $this->kernelAssigner()->setKernelObject($object,$callback,'serviceContainer'); |
|
185 | + $this->kernelAssigner()->setKernelObject($object, $callback, 'serviceContainer'); |
|
186 | 186 | |
187 | 187 | //return kernel object |
188 | 188 | return $this->kernel(); |
@@ -192,11 +192,11 @@ discard block |
||
192 | 192 | * @param $class |
193 | 193 | * @param $bind |
194 | 194 | */ |
195 | - private function contextualBindCleaner($class,$bind) |
|
195 | + private function contextualBindCleaner($class, $bind) |
|
196 | 196 | { |
197 | 197 | //the context bind objects are checked again and the bind sequence submitted by |
198 | 198 | //the user is checked and forced to re-instantiate the object. |
199 | - if(isset(self::$instance[$class]) && self::$bindParams[$class]!==$bind){ |
|
199 | + if (isset(self::$instance[$class]) && self::$bindParams[$class]!==$bind) { |
|
200 | 200 | unset(self::$instance[$class]); |
201 | 201 | unset(self::$bindParams[$class]); |
202 | 202 | } |
@@ -219,13 +219,13 @@ discard block |
||
219 | 219 | |
220 | 220 | // the has method can have a dotted string value so |
221 | 221 | // we need to be able to control the string or array within the container. |
222 | - foreach (explode(".",$abstract) as $item){ |
|
223 | - if(isset($container[$item])){ |
|
222 | + foreach (explode(".", $abstract) as $item) { |
|
223 | + if (isset($container[$item])) { |
|
224 | 224 | $container = $container[$item]; |
225 | 225 | } |
226 | - else{ |
|
226 | + else { |
|
227 | 227 | $containerClosureResolver[] = $item; |
228 | - $container = ContainerClosureResolver::get(implode('.',$containerClosureResolver)); |
|
228 | + $container = ContainerClosureResolver::get(implode('.', $containerClosureResolver)); |
|
229 | 229 | } |
230 | 230 | } |
231 | 231 | |
@@ -251,22 +251,22 @@ discard block |
||
251 | 251 | |
252 | 252 | // the has method can have a dotted string value so |
253 | 253 | // we need to be able to control the string or array within the container. |
254 | - foreach (explode(".",$abstract) as $item){ |
|
254 | + foreach (explode(".", $abstract) as $item) { |
|
255 | 255 | |
256 | 256 | // this blog will work |
257 | 257 | // if the data in the container loop points to an array. |
258 | - if(!is_array($container)){ |
|
258 | + if (!is_array($container)) { |
|
259 | 259 | |
260 | 260 | // we are querying the value of |
261 | 261 | // the items corresponding to the dotted value in the container. |
262 | 262 | // the control result is transferred to the bools array. |
263 | 263 | $container = $container[$item]; |
264 | 264 | |
265 | - if(is_null($container)){ |
|
265 | + if (is_null($container)) { |
|
266 | 266 | $containerClosureResolver[] = $item; |
267 | - $container = ContainerClosureResolver::get(implode('.',$containerClosureResolver)); |
|
267 | + $container = ContainerClosureResolver::get(implode('.', $containerClosureResolver)); |
|
268 | 268 | |
269 | - if(is_callable($container)){ |
|
269 | + if (is_callable($container)) { |
|
270 | 270 | $bools = []; |
271 | 271 | $container = true; |
272 | 272 | } |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | |
275 | 275 | $bools[] = is_null($container) ? false : true; |
276 | 276 | } |
277 | - else{ |
|
277 | + else { |
|
278 | 278 | // if the container array corresponds to a string, |
279 | 279 | // the bools array is filled with the isset control directly. |
280 | 280 | $bools[] = isset($container[$item]) ? true : false; |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | |
284 | 284 | // the method returns false if the bools sequence is false, |
285 | 285 | // otherwise it will return true. |
286 | - return in_array(false,$bools) ? false : true; |
|
286 | + return in_array(false, $bools) ? false : true; |
|
287 | 287 | } |
288 | 288 | |
289 | 289 | /** |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | * @throws DependencyException |
334 | 334 | * @throws NotFoundException |
335 | 335 | */ |
336 | - public function make($object=null,$callback=null,$container=false) |
|
336 | + public function make($object = null, $callback = null, $container = false) |
|
337 | 337 | { |
338 | 338 | //we check whether the boolean value of the singleton variable used |
339 | 339 | //for booting does not reset every time the object variable to be assigned to the kernel variable is true |
@@ -341,8 +341,8 @@ discard block |
||
341 | 341 | |
342 | 342 | //The console share is evaluated as a true variable to be assigned as the 3rd parameter in the classes to be bound. |
343 | 343 | //The work to be done here is to bind the classes to be included in the console share privately. |
344 | - if($container){ |
|
345 | - $this->consoleShared($object,$callback); |
|
344 | + if ($container) { |
|
345 | + $this->consoleShared($object, $callback); |
|
346 | 346 | } |
347 | 347 | |
348 | 348 | //If the third parameter passed to the bind method carries a container value, |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | //If the bind method does not have parameters object and callback, the value is directly assigned to the kernel object. |
353 | 353 | //Otherwise, when the bind object and callback are sent, the closure class inherits |
354 | 354 | //the applicationProvider object and the resolve method is called |
355 | - return ($object===null) ? $this->kernel() : $this->{$makeBuild}($object,$callback); |
|
355 | + return ($object===null) ? $this->kernel() : $this->{$makeBuild}($object, $callback); |
|
356 | 356 | } |
357 | 357 | |
358 | 358 | /** |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | */ |
373 | 373 | public function offsetGet($offset) { |
374 | 374 | |
375 | - return $this->resolve($this->instances['containerInstanceResolve'],[ |
|
375 | + return $this->resolve($this->instances['containerInstanceResolve'], [ |
|
376 | 376 | 'instances' => $this->instances |
377 | 377 | ])->{$offset}(); |
378 | 378 | } |
@@ -396,7 +396,7 @@ discard block |
||
396 | 396 | * @param null $concrete |
397 | 397 | * @return bool|mixed |
398 | 398 | */ |
399 | - public function register($key,$object,$concrete=null) |
|
399 | + public function register($key, $object, $concrete = null) |
|
400 | 400 | { |
401 | 401 | // we assign the values required |
402 | 402 | // for register to the global value variable. |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | |
407 | 407 | // If there is an instance of the application class, |
408 | 408 | // the register method is saved both in this example and in the global. |
409 | - if(defined('appInstance')){ |
|
409 | + if (defined('appInstance')) { |
|
410 | 410 | |
411 | 411 | // where we will assign both the global instance |
412 | 412 | // and the registered application object. |
@@ -425,19 +425,19 @@ discard block |
||
425 | 425 | * @param bool $withConcrete |
426 | 426 | * @return bool |
427 | 427 | */ |
428 | - private function registerProcess($instance,$withConcrete=false) |
|
428 | + private function registerProcess($instance, $withConcrete = false) |
|
429 | 429 | { |
430 | 430 | // values recorded without concrete. |
431 | 431 | // or values deleted |
432 | - if(false===$withConcrete){ |
|
432 | + if (false===$withConcrete) { |
|
433 | 433 | |
434 | 434 | //values registered without concrete |
435 | - $instance->{$this->values['key']}=$this->values['object']; |
|
435 | + $instance->{$this->values['key']} = $this->values['object']; |
|
436 | 436 | return false; |
437 | 437 | } |
438 | 438 | |
439 | 439 | //values registered with concrete |
440 | - $instance->{$this->values['key']}[$this->values['object']]=$this->values['concrete']; |
|
440 | + $instance->{$this->values['key']}[$this->values['object']] = $this->values['concrete']; |
|
441 | 441 | } |
442 | 442 | |
443 | 443 | /** |
@@ -448,22 +448,22 @@ discard block |
||
448 | 448 | * @throws DependencyException |
449 | 449 | * @throws NotFoundException |
450 | 450 | */ |
451 | - public function resolve($class,$bind=array()) |
|
451 | + public function resolve($class, $bind = array()) |
|
452 | 452 | { |
453 | 453 | //the context bind objects are checked again and the bind sequence submitted by |
454 | 454 | //the user is checked and forced to re-instantiate the object. |
455 | - $this->contextualBindCleaner($class,$bind); |
|
455 | + $this->contextualBindCleaner($class, $bind); |
|
456 | 456 | |
457 | 457 | //We do an instance check to get the static instance values of |
458 | 458 | //the classes to be resolved with the make bind method. |
459 | - if(!isset(self::$instance[$class])){ |
|
459 | + if (!isset(self::$instance[$class])) { |
|
460 | 460 | |
461 | 461 | //bind params object |
462 | 462 | self::$bindParams[$class] = $bind; |
463 | 463 | |
464 | 464 | //By singleton checking, we solve the dependency injection of the given class. |
465 | 465 | //Thus, each class can be called together with its dependency. |
466 | - self::$instance[$class] = DIContainerManager::make($class,$this->applicationProviderBinding($this,self::$bindParams[$class])); |
|
466 | + self::$instance[$class] = DIContainerManager::make($class, $this->applicationProviderBinding($this, self::$bindParams[$class])); |
|
467 | 467 | $this->singleton()->resolved[$class] = self::$instance[$class]; |
468 | 468 | |
469 | 469 | //return resolve class |
@@ -481,9 +481,9 @@ discard block |
||
481 | 481 | * @param $class |
482 | 482 | * @return mixed |
483 | 483 | */ |
484 | - public function resolved($class){ |
|
484 | + public function resolved($class) { |
|
485 | 485 | |
486 | - if(isset($this['resolved'][$class])){ |
|
486 | + if (isset($this['resolved'][$class])) { |
|
487 | 487 | return $this['resolved'][$class]; |
488 | 488 | } |
489 | 489 | |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | * @throws DependencyException |
499 | 499 | * @throws NotFoundException |
500 | 500 | */ |
501 | - public function share($object=null,$callback=null) |
|
501 | + public function share($object = null, $callback = null) |
|
502 | 502 | { |
503 | 503 | //we check whether the boolean value of the singleton variable used |
504 | 504 | //for booting does not reset every time the object variable to be assigned to the kernel variable is true |
@@ -506,12 +506,12 @@ discard block |
||
506 | 506 | |
507 | 507 | //The console share is evaluated as a true variable to be assigned as the 3rd parameter in the classes to be bound. |
508 | 508 | //The work to be done here is to bind the classes to be included in the console share privately. |
509 | - $this->consoleShared($object,$callback); |
|
509 | + $this->consoleShared($object, $callback); |
|
510 | 510 | |
511 | 511 | //If the bind method does not have parameters object and callback, the value is directly assigned to the kernel object. |
512 | 512 | //Otherwise, when the bind object and callback are sent, the closure class inherits |
513 | 513 | //the applicationProvider object and the resolve method is called |
514 | - return ($object===null) ? $this->kernel() : $this->build($object,$callback); |
|
514 | + return ($object===null) ? $this->kernel() : $this->build($object, $callback); |
|
515 | 515 | |
516 | 516 | } |
517 | 517 | |
@@ -531,7 +531,7 @@ discard block |
||
531 | 531 | */ |
532 | 532 | public function singleton() |
533 | 533 | { |
534 | - if($this->singleton===false){ |
|
534 | + if ($this->singleton===false) { |
|
535 | 535 | |
536 | 536 | //after first initializing, the singleton variable is set to true, |
537 | 537 | //and subsequent incoming classes can inherit the loaded object. |
@@ -552,12 +552,12 @@ discard block |
||
552 | 552 | // for application instance |
553 | 553 | // if the values to be saved are to be saved without the concrete, |
554 | 554 | // if it is an array. |
555 | - if($this->values['concrete']===null) { |
|
555 | + if ($this->values['concrete']===null) { |
|
556 | 556 | |
557 | 557 | // Without concrete, |
558 | 558 | // the saved value will be saved |
559 | 559 | // if the it does not exist in application instance. |
560 | - if(!isset($instance->{$this->values['key']})) { |
|
560 | + if (!isset($instance->{$this->values['key']})) { |
|
561 | 561 | $this->registerProcess($instance); |
562 | 562 | } |
563 | 563 | return false; |
@@ -565,7 +565,7 @@ discard block |
||
565 | 565 | |
566 | 566 | // We send concrete values to be recorded with concrete as true. |
567 | 567 | // these values will be recorded as a array. |
568 | - $this->registerProcess($instance,true); |
|
568 | + $this->registerProcess($instance, true); |
|
569 | 569 | } |
570 | 570 | |
571 | 571 | /** |
@@ -573,11 +573,11 @@ discard block |
||
573 | 573 | * @param null|string $object |
574 | 574 | * @return mixed |
575 | 575 | */ |
576 | - public function terminate($key,$object=null) |
|
576 | + public function terminate($key, $object = null) |
|
577 | 577 | { |
578 | 578 | // object null is |
579 | 579 | // sent to just terminate a key. |
580 | - if($object===null){ |
|
580 | + if ($object===null) { |
|
581 | 581 | unset(core()->{$key}); |
582 | 582 | unset($this->singleton()->{$key}); |
583 | 583 | return false; |
@@ -94,7 +94,9 @@ discard block |
||
94 | 94 | //If the console object returns true, |
95 | 95 | //we do not cancel binding operations |
96 | 96 | //We are getting what applies to console with consoleKernelObject. |
97 | - if($sync===false) return $this->consoleKernelObjectChecker($object,$callback); |
|
97 | + if($sync===false) { |
|
98 | + return $this->consoleKernelObjectChecker($object,$callback); |
|
99 | + } |
|
98 | 100 | |
99 | 101 | //the value corresponding to the bind value for the global object is assigned and |
100 | 102 | //the resolve method is called for the dependency injection. |
@@ -140,7 +142,9 @@ discard block |
||
140 | 142 | //If the console object returns true, |
141 | 143 | //we do not cancel binding operations |
142 | 144 | //We are getting what applies to console with consoleKernelObject. |
143 | - if($this->console() AND $isCallableForCallback) return $this->consoleKernelObject($object,$callback,$container); |
|
145 | + if($this->console() AND $isCallableForCallback) { |
|
146 | + return $this->consoleKernelObject($object,$callback,$container); |
|
147 | + } |
|
144 | 148 | |
145 | 149 | //If the application is not a console operation, we re-bind to existing methods synchronously. |
146 | 150 | return ($container) ? $this->containerBuild($object,$callback,true) : $this->build($object,$callback,true); |
@@ -174,7 +178,9 @@ discard block |
||
174 | 178 | //If the console object returns true, |
175 | 179 | //we do not cancel binding operations |
176 | 180 | //We are getting what applies to console with consoleKernelObject. |
177 | - if($sync===false) return $this->consoleKernelObjectChecker($object,$callback,true); |
|
181 | + if($sync===false) { |
|
182 | + return $this->consoleKernelObjectChecker($object,$callback,true); |
|
183 | + } |
|
178 | 184 | |
179 | 185 | //Since the objects that come to the build method are objects from the container method, |
180 | 186 | //we need to automatically create a kernel object named serviceContainer in this method. |
@@ -222,8 +228,7 @@ discard block |
||
222 | 228 | foreach (explode(".",$abstract) as $item){ |
223 | 229 | if(isset($container[$item])){ |
224 | 230 | $container = $container[$item]; |
225 | - } |
|
226 | - else{ |
|
231 | + } else{ |
|
227 | 232 | $containerClosureResolver[] = $item; |
228 | 233 | $container = ContainerClosureResolver::get(implode('.',$containerClosureResolver)); |
229 | 234 | } |
@@ -273,8 +278,7 @@ discard block |
||
273 | 278 | } |
274 | 279 | |
275 | 280 | $bools[] = is_null($container) ? false : true; |
276 | - } |
|
277 | - else{ |
|
281 | + } else{ |
|
278 | 282 | // if the container array corresponds to a string, |
279 | 283 | // the bools array is filled with the isset control directly. |
280 | 284 | $bools[] = isset($container[$item]) ? true : false; |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | * @param $credentials |
32 | 32 | * @param null|AuthLoginManager $manager |
33 | 33 | */ |
34 | - public function __construct($credentials,$manager) |
|
34 | + public function __construct($credentials, $manager) |
|
35 | 35 | { |
36 | 36 | //get credentials as default |
37 | 37 | $this->credentials = $credentials; |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | //get credential hash |
43 | 43 | $this->setCredentialHash(); |
44 | 44 | |
45 | - if($this->manager->getUsing()===false){ |
|
45 | + if ($this->manager->getUsing()===false) { |
|
46 | 46 | |
47 | 47 | // the request object will help you process |
48 | 48 | // the credentials and get them correctly. |
@@ -92,13 +92,13 @@ discard block |
||
92 | 92 | */ |
93 | 93 | public function getRequest() |
94 | 94 | { |
95 | - if(!is_null($clientProvider = $this->manager->getAuth()->provider('client'))){ |
|
95 | + if (!is_null($clientProvider = $this->manager->getAuth()->provider('client'))) { |
|
96 | 96 | return $clientProvider(); |
97 | 97 | } |
98 | 98 | |
99 | 99 | $request = $this->manager->getAuth()->getRequest(); |
100 | 100 | |
101 | - if($request=='Default'){ |
|
101 | + if ($request=='Default') { |
|
102 | 102 | return new AuthenticateRequest($this); |
103 | 103 | } |
104 | 104 | |
@@ -126,8 +126,8 @@ discard block |
||
126 | 126 | private function setCredentialHash() |
127 | 127 | { |
128 | 128 | //set credential hash |
129 | - if(count($this->credentials)){ |
|
130 | - $this->credentialHash = md5(sha1(implode("|",$this->credentials))); |
|
129 | + if (count($this->credentials)) { |
|
130 | + $this->credentialHash = md5(sha1(implode("|", $this->credentials))); |
|
131 | 131 | } |
132 | 132 | } |
133 | 133 | } |
134 | 134 | \ No newline at end of file |
@@ -44,7 +44,7 @@ |
||
44 | 44 | $this->credentials = $credentials; |
45 | 45 | |
46 | 46 | //credentials loop for expected property |
47 | - foreach ($this->credentials->get() as $credential){ |
|
47 | + foreach ($this->credentials->get() as $credential) { |
|
48 | 48 | $this->capsule[] = $credential; |
49 | 49 | $this->expected[] = $credential; |
50 | 50 | } |
@@ -320,8 +320,7 @@ discard block |
||
320 | 320 | $this->inputs[$generator] = $this->{$generatorMethodName}(); |
321 | 321 | $this->generatorList[] = $generator; |
322 | 322 | } |
323 | - } |
|
324 | - else { |
|
323 | + } else { |
|
325 | 324 | |
326 | 325 | if($this->checkProperties('auto_generators_dont_overwrite') |
327 | 326 | && in_array($generator,$this->getAutoGeneratorsDontOverwrite())){ |
@@ -511,8 +510,7 @@ discard block |
||
511 | 510 | $keyMethod = $this->{$method}(); |
512 | 511 | $this->inputs[$key][] = $keyMethod; |
513 | 512 | } |
514 | - } |
|
515 | - else{ |
|
513 | + } else{ |
|
516 | 514 | if(isset($this->inputs[$key])){ |
517 | 515 | $keyMethod = $this->{$method}(); |
518 | 516 | $this->inputs[$key] = $keyMethod; |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * |
69 | 69 | * @throws ReflectionExceptionAlias |
70 | 70 | */ |
71 | - public function __construct($clientData=null) |
|
71 | + public function __construct($clientData = null) |
|
72 | 72 | { |
73 | 73 | //reflection process |
74 | 74 | $this->reflection = app()['reflection']($this); |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | $this->setClientName(); |
78 | 78 | |
79 | 79 | //get http method via request http manager class |
80 | - $this->requestHttp = app()->resolve(ClientHttpManager::class,['client'=>$this]); |
|
80 | + $this->requestHttp = app()->resolve(ClientHttpManager::class, ['client'=>$this]); |
|
81 | 81 | |
82 | 82 | //get request client data |
83 | 83 | $this->clientData = ($clientData===null) ? $this->requestHttp->resolve() : $clientData; |
@@ -94,9 +94,9 @@ discard block |
||
94 | 94 | private function autoValidate($validate) |
95 | 95 | { |
96 | 96 | //we get the values to auto-validate. |
97 | - foreach ($this->{$validate} as $object=>$datas){ |
|
97 | + foreach ($this->{$validate} as $object=>$datas) { |
|
98 | 98 | |
99 | - if(false===Utils::isNamespaceExists($object)){ |
|
99 | + if (false===Utils::isNamespaceExists($object)) { |
|
100 | 100 | return; |
101 | 101 | } |
102 | 102 | |
@@ -106,15 +106,15 @@ discard block |
||
106 | 106 | |
107 | 107 | // we get the index values, |
108 | 108 | // which are called methods of the auto-validate value that represents the class. |
109 | - foreach ($datas as $dataKey=>$data){ |
|
109 | + foreach ($datas as $dataKey=>$data) { |
|
110 | 110 | |
111 | 111 | // if the methods of the auto-validate class resolved by the container resolve method apply, |
112 | 112 | // the process of auto-validate automatic implementation will be completed. |
113 | - if(is_numeric($dataKey) && method_exists($getObjectInstance,$data) && isset($this->origin[$data])){ |
|
114 | - if(!is_array($this->origin[$data])){ |
|
113 | + if (is_numeric($dataKey) && method_exists($getObjectInstance, $data) && isset($this->origin[$data])) { |
|
114 | + if (!is_array($this->origin[$data])) { |
|
115 | 115 | $this->origin[$data] = array($this->origin[$data]); |
116 | 116 | } |
117 | - foreach ($this->origin[$data] as $originData){ |
|
117 | + foreach ($this->origin[$data] as $originData) { |
|
118 | 118 | $getObjectInstance->{$data}($originData); |
119 | 119 | } |
120 | 120 | } |
@@ -130,22 +130,22 @@ discard block |
||
130 | 130 | private function capsule() |
131 | 131 | { |
132 | 132 | //a process can be added to the capsule array using the method. |
133 | - if(method_exists($this,'capsuleMethod')){ |
|
134 | - $this->capsule = array_merge($this->capsule,$this->capsuleMethod()); |
|
133 | + if (method_exists($this, 'capsuleMethod')) { |
|
134 | + $this->capsule = array_merge($this->capsule, $this->capsuleMethod()); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | // expected method is executed. |
138 | 138 | // this method is a must for http method values to be found in this property. |
139 | - if($this->checkProperties('capsule')){ |
|
139 | + if ($this->checkProperties('capsule')) { |
|
140 | 140 | |
141 | - if(property_exists($this,'auto_capsule') && is_array($this->auto_capsule)){ |
|
142 | - $this->capsule = array_merge($this->capsule,$this->auto_capsule); |
|
141 | + if (property_exists($this, 'auto_capsule') && is_array($this->auto_capsule)) { |
|
142 | + $this->capsule = array_merge($this->capsule, $this->auto_capsule); |
|
143 | 143 | } |
144 | 144 | |
145 | - foreach($this->inputs as $input=>$value){ |
|
145 | + foreach ($this->inputs as $input=>$value) { |
|
146 | 146 | |
147 | - if($this->checkProperties('capsule') && !in_array($input,$this->capsule)){ |
|
148 | - exception('clientCapsule',['key'=>$input]) |
|
147 | + if ($this->checkProperties('capsule') && !in_array($input, $this->capsule)) { |
|
148 | + exception('clientCapsule', ['key'=>$input]) |
|
149 | 149 | ->overflow('The '.$input.' value cannot be sent.'); |
150 | 150 | } |
151 | 151 | } |
@@ -164,15 +164,15 @@ discard block |
||
164 | 164 | |
165 | 165 | // Determines which HTTP method |
166 | 166 | // the request object will be exposed to. |
167 | - if($this->checkProperties('http')){ |
|
167 | + if ($this->checkProperties('http')) { |
|
168 | 168 | |
169 | 169 | // if the current http method does not exist |
170 | 170 | // in the http object, the exception will be thrown. |
171 | - if(!in_array($method,$this->http)){ |
|
171 | + if (!in_array($method, $this->http)) { |
|
172 | 172 | |
173 | 173 | //exception batMethodCall |
174 | 174 | exception()->badMethodCall( |
175 | - 'Invalid http method process for '.basename($this).'.That is accepted http methods ['.implode(",",$this->http).'] '); |
|
175 | + 'Invalid http method process for '.basename($this).'.That is accepted http methods ['.implode(",", $this->http).'] '); |
|
176 | 176 | } |
177 | 177 | } |
178 | 178 | } |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | { |
188 | 188 | // from the properties of the object properties to |
189 | 189 | // the existing variables, control the array and at least one element. |
190 | - return (property_exists($this,$properties) |
|
190 | + return (property_exists($this, $properties) |
|
191 | 191 | && is_array($this->{$properties}) && count($this->{$properties})) ? true : false; |
192 | 192 | } |
193 | 193 | |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | { |
201 | 201 | // we are saving the expected values for the request in container. |
202 | 202 | // this record can be returned in exception information. |
203 | - app()->register('requestExpected',$this->expected); |
|
203 | + app()->register('requestExpected', $this->expected); |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | /** |
@@ -212,15 +212,15 @@ discard block |
||
212 | 212 | public function except($except) |
213 | 213 | { |
214 | 214 | // the except parameter is a callable value. |
215 | - if(is_callable($except)){ |
|
216 | - $call = call_user_func_array($except,[$this]); |
|
215 | + if (is_callable($except)) { |
|
216 | + $call = call_user_func_array($except, [$this]); |
|
217 | 217 | $except = $call; |
218 | 218 | } |
219 | 219 | |
220 | 220 | // except with the except exceptions property |
221 | 221 | // and then assigning them to the inputs property. |
222 | - $this->except = array_merge($this->except,$except); |
|
223 | - $this->inputs = array_diff_key($this->inputs,array_flip($this->except)); |
|
222 | + $this->except = array_merge($this->except, $except); |
|
223 | + $this->inputs = array_diff_key($this->inputs, array_flip($this->except)); |
|
224 | 224 | |
225 | 225 | return $this; |
226 | 226 | } |
@@ -234,27 +234,27 @@ discard block |
||
234 | 234 | { |
235 | 235 | // expected method is executed. |
236 | 236 | // this method is a must for http method values to be found in this property. |
237 | - if($this->checkProperties('expected')){ |
|
237 | + if ($this->checkProperties('expected')) { |
|
238 | 238 | |
239 | 239 | // if the expected values are not found in the inputs array, |
240 | 240 | // the exception will be thrown. |
241 | - foreach ($this->expected as $expected){ |
|
241 | + foreach ($this->expected as $expected) { |
|
242 | 242 | |
243 | 243 | $expectedValues = []; |
244 | 244 | |
245 | 245 | // mandatory expected data for each key can be separated by | operator. |
246 | 246 | // this is evaluated as "or". |
247 | - foreach($expectedData = explode("|",$expected) as $inputs){ |
|
248 | - if(!isset($this->inputs[$inputs])){ |
|
247 | + foreach ($expectedData = explode("|", $expected) as $inputs) { |
|
248 | + if (!isset($this->inputs[$inputs])) { |
|
249 | 249 | $expectedValues[$inputs] = $inputs; |
250 | 250 | } |
251 | 251 | } |
252 | 252 | |
253 | 253 | // if the expectedData and expectedValues |
254 | 254 | // array are numerically equal to the expected key, the exception is thrown. |
255 | - if(count($expectedData)===count($expectedValues)){ |
|
256 | - exception('clientExpected',['key'=>$expected]) |
|
257 | - ->unexpectedValue('You absolutely have to send the value '.implode(" or ",$expectedValues).' for request object'); |
|
255 | + if (count($expectedData)===count($expectedValues)) { |
|
256 | + exception('clientExpected', ['key'=>$expected]) |
|
257 | + ->unexpectedValue('You absolutely have to send the value '.implode(" or ", $expectedValues).' for request object'); |
|
258 | 258 | } |
259 | 259 | } |
260 | 260 | } |
@@ -269,17 +269,17 @@ discard block |
||
269 | 269 | { |
270 | 270 | // check the presence of the generator object |
271 | 271 | // and operate the generator over this object. |
272 | - if($this->checkProperties('auto_generators')){ |
|
272 | + if ($this->checkProperties('auto_generators')) { |
|
273 | 273 | $generators = $this->getAutoGenerators(); |
274 | 274 | } |
275 | 275 | |
276 | 276 | // check the presence of the generator object |
277 | 277 | // and operate the generator over this object. |
278 | - if($this->checkProperties('generators')){ |
|
279 | - $generators = array_merge(isset($generators) ? $generators: [],$this->getGenerators()); |
|
278 | + if ($this->checkProperties('generators')) { |
|
279 | + $generators = array_merge(isset($generators) ? $generators : [], $this->getGenerators()); |
|
280 | 280 | } |
281 | 281 | |
282 | - if(isset($generators)){ |
|
282 | + if (isset($generators)) { |
|
283 | 283 | $this->generatorMethod($generators); |
284 | 284 | } |
285 | 285 | } |
@@ -294,21 +294,21 @@ discard block |
||
294 | 294 | private function generatorMethod($generators) |
295 | 295 | { |
296 | 296 | //generator array object |
297 | - foreach ($generators as $generator){ |
|
297 | + foreach ($generators as $generator) { |
|
298 | 298 | |
299 | 299 | //generator method name |
300 | 300 | $generatorMethodName = $generator.'Generator'; |
301 | 301 | |
302 | 302 | // if the generator method is present, |
303 | 303 | // the fake value is assigned. |
304 | - if(method_exists($this,$generatorMethodName)){ |
|
304 | + if (method_exists($this, $generatorMethodName)) { |
|
305 | 305 | |
306 | 306 | //fake registration |
307 | - if(!isset($this->inputs[$generator])){ |
|
307 | + if (!isset($this->inputs[$generator])) { |
|
308 | 308 | |
309 | 309 | $generatorMethodNameResult = $this->{$generatorMethodName}(); |
310 | 310 | |
311 | - if(!is_null($generatorMethodNameResult)){ |
|
311 | + if (!is_null($generatorMethodNameResult)) { |
|
312 | 312 | $this->{$generator} = $this->{$generatorMethodName}(); |
313 | 313 | $this->inputs[$generator] = $this->{$generatorMethodName}(); |
314 | 314 | $this->generatorList[] = $generator; |
@@ -316,15 +316,15 @@ discard block |
||
316 | 316 | } |
317 | 317 | else { |
318 | 318 | |
319 | - if($this->checkProperties('auto_generators_dont_overwrite') |
|
320 | - && in_array($generator,$this->getAutoGeneratorsDontOverwrite())){ |
|
319 | + if ($this->checkProperties('auto_generators_dont_overwrite') |
|
320 | + && in_array($generator, $this->getAutoGeneratorsDontOverwrite())) { |
|
321 | 321 | $this->{$generator} = $this->{$generatorMethodName}(); |
322 | 322 | $this->inputs[$generator] = $this->{$generatorMethodName}(); |
323 | 323 | $this->generatorList[] = $generator; |
324 | 324 | } |
325 | 325 | |
326 | - if($this->checkProperties('generators_dont_overwrite') |
|
327 | - && in_array($generator,$this->getGeneratorsDontOverwrite())){ |
|
326 | + if ($this->checkProperties('generators_dont_overwrite') |
|
327 | + && in_array($generator, $this->getGeneratorsDontOverwrite())) { |
|
328 | 328 | $this->{$generator} = $this->{$generatorMethodName}(); |
329 | 329 | $this->inputs[$generator] = $this->{$generatorMethodName}(); |
330 | 330 | $this->generatorList[] = $generator; |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | { |
402 | 402 | // we use the http method to write |
403 | 403 | // the values to the inputs and origin properties. |
404 | - foreach($this->clientData as $key=>$value){ |
|
404 | + foreach ($this->clientData as $key=>$value) { |
|
405 | 405 | |
406 | 406 | //inputs and origin properties |
407 | 407 | $this->inputs[$key] = $value; |
@@ -417,9 +417,9 @@ discard block |
||
417 | 417 | */ |
418 | 418 | private function requestExcept() |
419 | 419 | { |
420 | - if(property_exists($this,'requestExcept') && is_array($this->requestExcept)){ |
|
421 | - foreach ($this->requestExcept as $item){ |
|
422 | - if(isset($this->inputs[$item])){ |
|
420 | + if (property_exists($this, 'requestExcept') && is_array($this->requestExcept)) { |
|
421 | + foreach ($this->requestExcept as $item) { |
|
422 | + if (isset($this->inputs[$item])) { |
|
423 | 423 | unset($this->inputs[$item]); |
424 | 424 | } |
425 | 425 | } |
@@ -432,16 +432,16 @@ discard block |
||
432 | 432 | * @param null|string $clientName |
433 | 433 | * @return void|mixed |
434 | 434 | */ |
435 | - public function setClientName($clientName=null) |
|
435 | + public function setClientName($clientName = null) |
|
436 | 436 | { |
437 | - if(!is_null($clientName) && is_string($clientName)){ |
|
437 | + if (!is_null($clientName) && is_string($clientName)) { |
|
438 | 438 | return $this->clientName = $clientName; |
439 | 439 | } |
440 | 440 | |
441 | - if(!is_null(Utils::trace(0)) && isset(Utils::trace(0)['object'])){ |
|
441 | + if (!is_null(Utils::trace(0)) && isset(Utils::trace(0)['object'])) { |
|
442 | 442 | $backTrace = Utils::trace(0)['object']; |
443 | 443 | |
444 | - if(property_exists($backTrace,'clientName')){ |
|
444 | + if (property_exists($backTrace, 'clientName')) { |
|
445 | 445 | $this->clientName = $backTrace->clientName; |
446 | 446 | } |
447 | 447 | } |
@@ -458,9 +458,9 @@ discard block |
||
458 | 458 | |
459 | 459 | // we update the input values after |
460 | 460 | // we receive and check the saved objects. |
461 | - foreach ($clientObjects as $key=>$value){ |
|
461 | + foreach ($clientObjects as $key=>$value) { |
|
462 | 462 | |
463 | - if(!in_array($key,$this->generatorList) && isset($clientObjects['origin'][$key])){ |
|
463 | + if (!in_array($key, $this->generatorList) && isset($clientObjects['origin'][$key])) { |
|
464 | 464 | |
465 | 465 | $this->{$key} = $clientObjects['origin'][$key]; |
466 | 466 | $this->inputs[$key] = $this->{$key}; |
@@ -488,11 +488,11 @@ discard block |
||
488 | 488 | |
489 | 489 | // the request update to be performed using |
490 | 490 | // the method name to be used with the http method. |
491 | - $this->setRequestInputs($requestMethod,$key); |
|
491 | + $this->setRequestInputs($requestMethod, $key); |
|
492 | 492 | |
493 | 493 | // the request update to be performed using |
494 | 494 | // the method name to be used without the http method. |
495 | - $this->setRequestInputs($key,$key); |
|
495 | + $this->setRequestInputs($key, $key); |
|
496 | 496 | } |
497 | 497 | |
498 | 498 | /** |
@@ -503,28 +503,28 @@ discard block |
||
503 | 503 | * |
504 | 504 | * @throws ReflectionExceptionAlias |
505 | 505 | */ |
506 | - private function setRequestInputs($method,$key) |
|
506 | + private function setRequestInputs($method, $key) |
|
507 | 507 | { |
508 | - if(!in_array($key,$this->generatorList) && method_exists($this,$method) && $this->reflection->reflectionMethodParams($method)->isProtected){ |
|
508 | + if (!in_array($key, $this->generatorList) && method_exists($this, $method) && $this->reflection->reflectionMethodParams($method)->isProtected) { |
|
509 | 509 | |
510 | 510 | //check annotations for method |
511 | - $annotation = app()->resolve(ClientAnnotationManager::class,['request'=>$this]); |
|
512 | - $annotation->annotation($method,$key); |
|
511 | + $annotation = app()->resolve(ClientAnnotationManager::class, ['request'=>$this]); |
|
512 | + $annotation->annotation($method, $key); |
|
513 | 513 | |
514 | - if(isset($this->inputs[$key]) && is_array($this->inputs[$key])){ |
|
514 | + if (isset($this->inputs[$key]) && is_array($this->inputs[$key])) { |
|
515 | 515 | |
516 | 516 | $inputKeys = $this->inputs[$key]; |
517 | 517 | |
518 | 518 | $this->inputs[$key] = []; |
519 | - foreach ($inputKeys as $input){ |
|
519 | + foreach ($inputKeys as $input) { |
|
520 | 520 | |
521 | 521 | $this->{$key} = $input; |
522 | 522 | $keyMethod = $this->{$method}(); |
523 | 523 | $this->inputs[$key][] = $keyMethod; |
524 | 524 | } |
525 | 525 | } |
526 | - else{ |
|
527 | - if(isset($this->inputs[$key])){ |
|
526 | + else { |
|
527 | + if (isset($this->inputs[$key])) { |
|
528 | 528 | $keyMethod = $this->{$method}(); |
529 | 529 | $this->inputs[$key] = $keyMethod; |
530 | 530 | } |
@@ -543,8 +543,8 @@ discard block |
||
543 | 543 | // the auto object validate property is the property |
544 | 544 | // where all of your request values are automatically validated. |
545 | 545 | /** @noinspection PhpParamsInspection */ |
546 | - if(property_exists($this,'autoObjectValidate') |
|
547 | - && is_array($this->autoObjectValidate) && count($this->autoObjectValidate)){ |
|
546 | + if (property_exists($this, 'autoObjectValidate') |
|
547 | + && is_array($this->autoObjectValidate) && count($this->autoObjectValidate)) { |
|
548 | 548 | $this->autoValidate('autoObjectValidate'); |
549 | 549 | } |
550 | 550 | } |
@@ -84,8 +84,9 @@ discard block |
||
84 | 84 | |
85 | 85 | /* Read the data 1 KB at a time |
86 | 86 | and write to the file */ |
87 | - while ($chunk = fread($putdata, 1024)) |
|
88 | - $raw_data .= $chunk; |
|
87 | + while ($chunk = fread($putdata, 1024)) { |
|
88 | + $raw_data .= $chunk; |
|
89 | + } |
|
89 | 90 | |
90 | 91 | /* Close the streams */ |
91 | 92 | fclose($putdata); |
@@ -105,7 +106,9 @@ discard block |
||
105 | 106 | |
106 | 107 | foreach ($parts as $part) { |
107 | 108 | // If this is the last part, break |
108 | - if ($part == "--\r\n") break; |
|
109 | + if ($part == "--\r\n") { |
|
110 | + break; |
|
111 | + } |
|
109 | 112 | |
110 | 113 | // Separate content from headers |
111 | 114 | $part = ltrim($part, "\r\n"); |
@@ -40,19 +40,19 @@ discard block |
||
40 | 40 | { |
41 | 41 | $inputs = $this->app->get($this->method); |
42 | 42 | |
43 | - $content = json_decode($this->app['request']->getContent(),1); |
|
43 | + $content = json_decode($this->app['request']->getContent(), 1); |
|
44 | 44 | |
45 | - if(is_array($inputs) && count($inputs)){ |
|
45 | + if (is_array($inputs) && count($inputs)) { |
|
46 | 46 | |
47 | - if(isset($inputs[$this->client->getClientName()])){ |
|
47 | + if (isset($inputs[$this->client->getClientName()])) { |
|
48 | 48 | return $inputs[$this->client->getClientName()]; |
49 | 49 | } |
50 | 50 | return $inputs; |
51 | 51 | } |
52 | 52 | |
53 | - if(is_array($content)){ |
|
53 | + if (is_array($content)) { |
|
54 | 54 | |
55 | - if(isset($content[$this->client->getClientName()])){ |
|
55 | + if (isset($content[$this->client->getClientName()])) { |
|
56 | 56 | return $content[$this->client->getClientName()]; |
57 | 57 | } |
58 | 58 | return $content; |
@@ -60,8 +60,8 @@ discard block |
||
60 | 60 | |
61 | 61 | $this->inputVars(); |
62 | 62 | |
63 | - if(is_array($GLOBALS[ '_PUT' ])){ |
|
64 | - return $GLOBALS[ '_PUT' ]; |
|
63 | + if (is_array($GLOBALS['_PUT'])) { |
|
64 | + return $GLOBALS['_PUT']; |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | return []; |
@@ -91,9 +91,9 @@ discard block |
||
91 | 91 | // Fetch content and determine boundary |
92 | 92 | $boundary = substr($raw_data, 0, strpos($raw_data, "\r\n")); |
93 | 93 | |
94 | - if(empty($boundary)){ |
|
95 | - parse_str($raw_data,$data); |
|
96 | - $GLOBALS[ '_PUT' ] = $data; |
|
94 | + if (empty($boundary)) { |
|
95 | + parse_str($raw_data, $data); |
|
96 | + $GLOBALS['_PUT'] = $data; |
|
97 | 97 | return; |
98 | 98 | } |
99 | 99 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | |
104 | 104 | foreach ($parts as $part) { |
105 | 105 | // If this is the last part, break |
106 | - if ($part == "--\r\n") break; |
|
106 | + if ($part=="--\r\n") break; |
|
107 | 107 | |
108 | 108 | // Separate content from headers |
109 | 109 | $part = ltrim($part, "\r\n"); |
@@ -130,10 +130,10 @@ discard block |
||
130 | 130 | list(, $type, $name) = $matches; |
131 | 131 | |
132 | 132 | //Parse File |
133 | - if( isset($matches[4]) ) |
|
133 | + if (isset($matches[4])) |
|
134 | 134 | { |
135 | 135 | //if labeled the same as previous, skip |
136 | - if( isset( $_FILES[ $matches[ 2 ] ] ) ) |
|
136 | + if (isset($_FILES[$matches[2]])) |
|
137 | 137 | { |
138 | 138 | continue; |
139 | 139 | } |
@@ -142,16 +142,16 @@ discard block |
||
142 | 142 | $filename = $matches[4]; |
143 | 143 | |
144 | 144 | //get tmp name |
145 | - $filename_parts = pathinfo( $filename ); |
|
146 | - $tmp_name = tempnam( ini_get('upload_tmp_dir'), $filename_parts['filename']); |
|
145 | + $filename_parts = pathinfo($filename); |
|
146 | + $tmp_name = tempnam(ini_get('upload_tmp_dir'), $filename_parts['filename']); |
|
147 | 147 | |
148 | 148 | //populate $_FILES with information, size may be off in multibyte situation |
149 | 149 | /** @noinspection PhpUndefinedVariableInspection */ |
150 | - $_FILES[ $matches[ 2 ] ] = array( |
|
150 | + $_FILES[$matches[2]] = array( |
|
151 | 151 | 'error'=>0, |
152 | 152 | 'name'=>$filename, |
153 | 153 | 'tmp_name'=>$tmp_name, |
154 | - 'size'=>strlen( $body ), |
|
154 | + 'size'=>strlen($body), |
|
155 | 155 | 'type'=>$value |
156 | 156 | ); |
157 | 157 | |
@@ -161,12 +161,12 @@ discard block |
||
161 | 161 | //Parse Field |
162 | 162 | else |
163 | 163 | { |
164 | - $data[$name] = substr($body, 0, strlen($body) - 2); |
|
164 | + $data[$name] = substr($body, 0, strlen($body)-2); |
|
165 | 165 | } |
166 | 166 | } |
167 | 167 | |
168 | 168 | } |
169 | - $GLOBALS[ '_PUT' ] = $data; |
|
169 | + $GLOBALS['_PUT'] = $data; |
|
170 | 170 | return; |
171 | 171 | } |
172 | 172 |
@@ -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($environment=='production' && preg_match('@SQLSTATE@is',$this->data['errStrReal'])){ |
193 | 190 | $externalMessage = 'An unexpected external error has occurred'; |
194 | - } |
|
195 | - else{ |
|
191 | + } else{ |
|
196 | 192 | $externalMessage = $this->data['errStrReal']; |
197 | 193 | } |
198 | 194 | |
@@ -236,8 +232,7 @@ discard block |
||
236 | 232 | header('Content-type:application/json;charset=utf-8'); |
237 | 233 | |
238 | 234 | echo json_encode($this->app->get('out')->outputFormatter($this->result)); |
239 | - } |
|
240 | - else{ |
|
235 | + } else{ |
|
241 | 236 | echo $restaOutHandle; |
242 | 237 | } |
243 | 238 |
@@ -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($environment=='production' && preg_match('@SQLSTATE@is',$this->data['errStrReal'])){ |
|
191 | + if ($environment=='production' && preg_match('@SQLSTATE@is', $this->data['errStrReal'])) { |
|
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,36 +205,36 @@ 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($productionLogMessage,$this->result); |
|
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($productionLogMessage, $this->result); |
|
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 | - $this->result = $exceptionResponse($this->result,$this->data['status']); |
|
219 | + $this->result = $exceptionResponse($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 | header('Content-type:application/json;charset=utf-8'); |
235 | 234 | |
236 | 235 | echo json_encode($this->app->get('out')->outputFormatter($this->result)); |
237 | 236 | } |
238 | - else{ |
|
237 | + else { |
|
239 | 238 | echo $restaOutHandle; |
240 | 239 | } |
241 | 240 | |
@@ -246,7 +245,7 @@ discard block |
||
246 | 245 | * @param $environment |
247 | 246 | * @return mixed |
248 | 247 | */ |
249 | - private function getAppException($environment,$message) |
|
248 | + private function getAppException($environment, $message) |
|
250 | 249 | { |
251 | 250 | return $this->data['appExceptionSuccess']+$this->data['exception']::$environment( |
252 | 251 | $this->data['errNo'], |
@@ -266,7 +265,7 @@ discard block |
||
266 | 265 | private function getExceptionExtender() |
267 | 266 | { |
268 | 267 | return $this->app->resolve( |
269 | - $this->app->get('macro')->call('exceptionExtender',function(){ |
|
268 | + $this->app->get('macro')->call('exceptionExtender', function() { |
|
270 | 269 | return ExceptionExtender::class; |
271 | 270 | }), |
272 | 271 | ['result'=>$this->result])->getResult(); |
@@ -284,13 +283,13 @@ discard block |
||
284 | 283 | |
285 | 284 | $this->inStackTrace($last_error); |
286 | 285 | |
287 | - if(!is_null($last_error)){ |
|
286 | + if (!is_null($last_error)) { |
|
288 | 287 | |
289 | - if(!defined('methodName')){ |
|
290 | - define('methodName',null); |
|
288 | + if (!defined('methodName')) { |
|
289 | + define('methodName', null); |
|
291 | 290 | } |
292 | 291 | |
293 | - if($this->app->has('exceptionFile')){ |
|
292 | + if ($this->app->has('exceptionFile')) { |
|
294 | 293 | $last_error['file'] = $this->app['exceptionFile']; |
295 | 294 | $last_error['line'] = $this->app['exceptionLine']; |
296 | 295 | } |
@@ -310,13 +309,13 @@ discard block |
||
310 | 309 | */ |
311 | 310 | public function inStackTrace($error) |
312 | 311 | { |
313 | - if($this->app->has('urlComponent')){ |
|
314 | - if(!preg_match('@'.$this->app['urlComponent']['project'].'@',$error['file']) |
|
315 | - && !$this->app->has('exceptionFile')){ |
|
316 | - if(preg_match('@ in\s(.*?)\n@is',$error['message'],$result)){ |
|
317 | - $errorMessage = explode(":",$result[1]); |
|
318 | - $this->app->register('exceptionFile',$errorMessage[0]); |
|
319 | - $this->app->register('exceptionLine',$errorMessage[1]); |
|
312 | + if ($this->app->has('urlComponent')) { |
|
313 | + if (!preg_match('@'.$this->app['urlComponent']['project'].'@', $error['file']) |
|
314 | + && !$this->app->has('exceptionFile')) { |
|
315 | + if (preg_match('@ in\s(.*?)\n@is', $error['message'], $result)) { |
|
316 | + $errorMessage = explode(":", $result[1]); |
|
317 | + $this->app->register('exceptionFile', $errorMessage[0]); |
|
318 | + $this->app->register('exceptionLine', $errorMessage[1]); |
|
320 | 319 | } |
321 | 320 | } |
322 | 321 | } |
@@ -329,33 +328,33 @@ discard block |
||
329 | 328 | { |
330 | 329 | $clone = clone $this; |
331 | 330 | |
332 | - if($this->app->has('exceptionTranslate')){ |
|
331 | + if ($this->app->has('exceptionTranslate')) { |
|
333 | 332 | |
334 | 333 | $langMessage = trans('exception.'.$this->app->get('exceptionTranslate')); |
335 | 334 | |
336 | - if(!is_null($langMessage) && $this->app->has('exceptionTranslateParams')){ |
|
335 | + if (!is_null($langMessage) && $this->app->has('exceptionTranslateParams')) { |
|
337 | 336 | |
338 | - if(count($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']])){ |
|
339 | - foreach ($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']] as $key=>$value){ |
|
337 | + if (count($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']])) { |
|
338 | + foreach ($this->app['exceptionTranslateParams'][$this->app['exceptionTranslate']] as $key=>$value) { |
|
340 | 339 | |
341 | 340 | $valueLangName = !is_null(trans('default.'.$value)) ? trans('default.'.$value) : $value; |
342 | - $langMessage = preg_replace('@\('.$key.'\)@is',$valueLangName,$langMessage); |
|
341 | + $langMessage = preg_replace('@\('.$key.'\)@is', $valueLangName, $langMessage); |
|
343 | 342 | } |
344 | 343 | } |
345 | 344 | } |
346 | 345 | |
347 | - if($langMessage!==null){ |
|
346 | + if ($langMessage!==null) { |
|
348 | 347 | $this->data['errStrReal'] = $langMessage; |
349 | 348 | } |
350 | 349 | } |
351 | 350 | |
352 | - if(class_exists($this->data['errorClassNamespace']) |
|
351 | + if (class_exists($this->data['errorClassNamespace']) |
|
353 | 352 | && |
354 | - (Str::startsWith($this->data['errorClassNamespace'],'App') |
|
355 | - || Str::startsWith($this->data['errorClassNamespace'],__NAMESPACE__))){ |
|
353 | + (Str::startsWith($this->data['errorClassNamespace'], 'App') |
|
354 | + || Str::startsWith($this->data['errorClassNamespace'], __NAMESPACE__))) { |
|
356 | 355 | |
357 | 356 | ClosureDispatcher::bind($this->data['errorClassNamespace'])->call(function() use ($clone) { |
358 | - if(property_exists($this,'lang')){ |
|
357 | + if (property_exists($this, 'lang')) { |
|
359 | 358 | $clone->setLang($this->lang); |
360 | 359 | } |
361 | 360 | }); |
@@ -365,7 +364,7 @@ discard block |
||
365 | 364 | |
366 | 365 | $langMessage = (!is_null($this->data['lang'])) ? trans('exception.'.$this->data['lang']) : null; |
367 | 366 | |
368 | - if($langMessage!==null){ |
|
367 | + if ($langMessage!==null) { |
|
369 | 368 | $this->data['errStrReal'] = $langMessage; |
370 | 369 | } |
371 | 370 | } |
@@ -379,14 +378,14 @@ discard block |
||
379 | 378 | { |
380 | 379 | // catch exception via preg match |
381 | 380 | // and then clear the Uncaught statement from inside. |
382 | - if(preg_match('@(.*?):@is',$this->data['errStrReal'],$errArr)){ |
|
381 | + if (preg_match('@(.*?):@is', $this->data['errStrReal'], $errArr)) { |
|
383 | 382 | |
384 | - $this->data['errType'] = trim(str_replace('Uncaught','',$errArr[1])); |
|
383 | + $this->data['errType'] = trim(str_replace('Uncaught', '', $errArr[1])); |
|
385 | 384 | $this->data['errorClassNamespace'] = $this->data['errType']; |
386 | 385 | } |
387 | 386 | |
388 | - if(preg_match('@Uncaught@is',$this->data['errStrReal']) |
|
389 | - && preg_match('@(.*?):(.*?)\sin\s@is',$this->data['errStrReal'],$errStrRealArray)){ |
|
387 | + if (preg_match('@Uncaught@is', $this->data['errStrReal']) |
|
388 | + && preg_match('@(.*?):(.*?)\sin\s@is', $this->data['errStrReal'], $errStrRealArray)) { |
|
390 | 389 | $this->data['errStrReal'] = trim($errStrRealArray[2]); |
391 | 390 | } |
392 | 391 | |
@@ -406,7 +405,7 @@ discard block |
||
406 | 405 | /** |
407 | 406 | * @param null|string $lang |
408 | 407 | */ |
409 | - public function setLang($lang=null) |
|
408 | + public function setLang($lang = null) |
|
410 | 409 | { |
411 | 410 | $this->lang = $lang; |
412 | 411 | } |