File tree Expand file tree Collapse file tree 5 files changed +21
-15
lines changed Expand file tree Collapse file tree 5 files changed +21
-15
lines changed Original file line number Diff line number Diff line change @@ -15,11 +15,11 @@ http://localhost:8080/db
15
15
16
16
### QUERY
17
17
18
- http://localhost:8080/query /[count ]
18
+ http://localhost:8080/queries /[count ]
19
19
20
20
### UPDATE
21
21
22
- http://localhost:8080/update /[count ]
22
+ http://localhost:8080/updates /[count ]
23
23
24
24
### FORTUNES
25
25
Original file line number Diff line number Diff line change 16
16
],
17
17
'orm ' => 'pdo ' ,
18
18
'pdo ' => [
19
- 'dsn ' => 'pgsql :host=tfb-database ;dbname=hello_world ' ,
20
- 'username ' => 'benchmarkdbuser ' ,
21
- 'password ' => 'benchmarkdbpass ' ,
19
+ 'dsn ' => 'mysql :host=127.0.0.1 ;dbname=hello_world ' ,
20
+ 'username ' => 'root ' ,
21
+ 'password ' => 'root ' ,
22
22
'options ' => [
23
23
PDO ::ATTR_ERRMODE => PDO ::ERRMODE_EXCEPTION ,
24
24
PDO ::ATTR_DEFAULT_FETCH_MODE => PDO ::FETCH_ASSOC ,
Original file line number Diff line number Diff line change @@ -38,10 +38,10 @@ public function fortunes()
38
38
return Response::html ("<!DOCTYPE html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr> $ html</table></body></html> " );
39
39
}
40
40
41
- public function queries ($ q = 1 )
41
+ public function queries ($ q= 1 )
42
42
{
43
43
$ statement = app ()->db ->prepare ('SELECT id,randomNumber FROM World WHERE id=? ' );
44
- $ query_count = min ( max (( int ) $ q , 1 ), 500 );
44
+ $ query_count = max (min ( intval ( $ q ), 500 ), 1 );
45
45
$ arr = [];
46
46
while ($ query_count --) {
47
47
$ statement ->execute ([mt_rand (1 , 10000 )]);
@@ -50,12 +50,12 @@ public function queries($q = 1)
50
50
return Response::json ($ arr );
51
51
}
52
52
53
- public function updates ($ q = 1 )
53
+ public function updates ($ q= 1 )
54
54
{
55
55
static $ updates = [];
56
56
57
57
$ random = app ()->db ->prepare ('SELECT id,randomNumber FROM World WHERE id=? ' );
58
- $ count = min ( max (( int ) $ q , 1 ), 500 );
58
+ $ count = max (min ( intval ( $ q ), 500 ), 1 );
59
59
60
60
$ worlds = $ keys = $ values = [];
61
61
for ($ i = 0 ; $ i < $ count ; ++ $ i ) {
Original file line number Diff line number Diff line change @@ -91,16 +91,22 @@ public function run()
91
91
$ requestMiddlewares = $ this ->getConfig ('request_middleware ' );
92
92
93
93
/* Execute request object middleware */
94
- $ this ->request = $ this ->middleware ->handleRequest ($ requestMiddlewares );
94
+ if (!empty ($ requestMiddlewares )){
95
+ $ this ->request = $ this ->middleware ->handleRequest ($ requestMiddlewares );
96
+ }
95
97
96
98
/* Parse route and return the closure to be executed */
97
99
$ handleRoute = $ this ->route ->handleRoute ();
98
100
/* Middleware list */
99
101
$ Middlewares = $ this ->getConfig ('middleware ' );
100
102
/* Execute middleware */
101
- $ response = $ this ->middleware ->handle ($ Middlewares ,function () use ($ handleRoute ) {
102
- return $ handleRoute ;
103
- });
103
+ if (!empty ($ Middlewares )){
104
+ $ response = $ this ->middleware ->handle ($ Middlewares ,function () use ($ handleRoute ) {
105
+ return $ handleRoute ;
106
+ });
107
+ }else {
108
+ $ response = $ handleRoute ;
109
+ }
104
110
/* Return response */
105
111
return $ response ;
106
112
}
Original file line number Diff line number Diff line change @@ -40,14 +40,14 @@ public function handleRoute()
40
40
} elseif ($ routeInfo [0 ] == 1 ) {
41
41
$ handler = $ routeInfo [1 ];
42
42
$ vars = $ routeInfo [2 ];
43
- $ parameters = [$ request , ...array_values ($ vars )];
43
+ $ parameters = [...array_values ($ vars )];
44
44
45
45
// Create a closure to pass to your middleware to execute the final handler
46
46
$ finalHandler = function () use ($ handler , $ parameters , $ container ) {
47
47
// If handler is a string (controller@method)
48
48
if (is_string ($ handler )) {
49
49
list ($ controller , $ method ) = explode ('@ ' , $ handler );
50
- $ class = $ container -> get ( $ controller );
50
+ $ class = new $ controller( );
51
51
return $ class ->$ method (...$ parameters );
52
52
} elseif (is_callable ($ handler )) {
53
53
return $ handler (...$ parameters );
You can’t perform that action at this time.
0 commit comments