@@ -40,8 +40,7 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | if (isset($arr['status']) && $type == 2) { |
| 42 | 42 | $ret=$arr; |
| 43 | - } |
|
| 44 | - else { |
|
| 43 | + } else { |
|
| 45 | 44 | $ret['status']=$type; |
| 46 | 45 | $ret['data']=$arr; |
| 47 | 46 | } |
@@ -323,8 +322,7 @@ discard block |
||
| 323 | 322 | if ($filters) { |
| 324 | 323 | if (is_string($filters)) { |
| 325 | 324 | $filters=explode(',', $filters); |
| 326 | - } |
|
| 327 | - else if (is_array($filters)) { |
|
| 325 | + } else if (is_array($filters)) { |
|
| 328 | 326 | foreach ($filters as $filter) { |
| 329 | 327 | $data=array_map_recursive($filter, $data); // 参数过滤 |
| 330 | 328 | } |
@@ -9,7 +9,6 @@ |
||
| 9 | 9 | use Dotenv\Dotenv; |
| 10 | 10 | use puck\Config; |
| 11 | 11 | use puck\Route; |
| 12 | -use puck\tools\Arr; |
|
| 13 | 12 | use Whoops\Run; |
| 14 | 13 | |
| 15 | 14 | class App extends Container { |
@@ -98,8 +98,7 @@ |
||
| 98 | 98 | } |
| 99 | 99 | } catch (\ReflectionException $e) { |
| 100 | 100 | return false; |
| 101 | - } |
|
| 102 | - catch (\InvalidArgumentException $e) { |
|
| 101 | + } catch (\InvalidArgumentException $e) { |
|
| 103 | 102 | return false; |
| 104 | 103 | } |
| 105 | 104 | return true; |