Skip to content

Commit d4b92e9

Browse files
authored
[php] Wolff simplify code (#10061)
1 parent b1383f0 commit d4b92e9

File tree

2 files changed

+13
-30
lines changed

2 files changed

+13
-30
lines changed

frameworks/PHP/wolff/app/controllers/Home.php

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,10 @@ public function json(Request $req, Response $res)
2525

2626
public function db(Request $req, Response $res)
2727
{
28-
$random_id = mt_rand(1, 10000);
29-
/** @var \Wolff\Core\DB */
30-
$db = Container::get('db');
31-
$row = $db->select('World', 'id = ?', $random_id)[0];
28+
$row = Container::get('db')->select('World', 'id = ?', mt_rand(1, 10000))[0];
29+
3230
$res->setHeader('Content-Type', 'application/json');
33-
$res->writeJson([
34-
'id' => $row['id'],
35-
'randomNumber' => $row['randomNumber']
36-
]);
31+
$res->writeJson($row);
3732
}
3833

3934
public function queries(Request $req, Response $res)
@@ -50,13 +45,7 @@ public function queries(Request $req, Response $res)
5045

5146
$worlds = [];
5247
for ($i = 0; $i < $queries; ++$i) {
53-
$random_id = mt_rand(1, 10000);
54-
$row = $db->select('World', 'id = ?', $random_id)[0];
55-
$world = [
56-
'id' => $row['id'],
57-
'randomNumber' => $row['randomNumber']
58-
];
59-
$worlds[] = $world;
48+
$worlds[] = $db->select('World', 'id = ?', mt_rand(1, 10000))[0];
6049
}
6150
$res->setHeader('Content-Type', 'application/json');
6251
$res->writeJson($worlds);
@@ -80,11 +69,10 @@ public function update(Request $req, Response $res)
8069
$random_update_id = mt_rand(1, 10000);
8170
$row = $db->select('World', 'id = ?', $random_id)[0];
8271
$db->query('UPDATE World SET randomNumber = ? WHERE id = ?', $random_update_id, $row['id']);
83-
$world = [
84-
'id' => $row['id'],
85-
'randomNumber' => $random_update_id
86-
];
87-
$worlds[] = $world;
72+
$worlds[] = [
73+
'id' => $row['id'],
74+
'randomNumber' => $random_update_id
75+
];
8876
}
8977
$res->setHeader('Content-Type', 'application/json');
9078
$res->writeJson($worlds);
@@ -93,14 +81,10 @@ public function update(Request $req, Response $res)
9381
public function fortunes(Request $req, Response $res)
9482
{
9583

96-
/** @var \Wolff\Core\DB */
97-
$db = Container::get('db');
98-
99-
$fortunes = $db->select('Fortune');
84+
$fortunes = Container::get('db')->select('Fortune');
10085
$fortunes[] = [ 'id' => 0, 'message' => 'Additional fortune added at request time.' ];
101-
usort($fortunes, function ($left, $right) {
102-
return $left['message'] <=> $right['message'];
103-
});
86+
usort($fortunes, fn($left, $right) => $left['message'] <=> $right['message'] );
87+
10488
$res->setHeader('Content-Type', 'text/html; charset=utf-8');
10589
View::render('fortunes', [
10690
'fortunes' => $fortunes,

frameworks/PHP/wolff/system/web.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@
1414
Route::get('/update', [ Controller\Home::class, 'update' ]);
1515
Route::get('/fortunes', [ Controller\Home::class, 'fortunes' ]);
1616

17-
Container::singleton('db', function() {
18-
return new \Wolff\Core\DB;
19-
});
17+
18+
Container::singleton('db', fn() => new \Wolff\Core\DB );

0 commit comments

Comments
 (0)