Skip to content

Commit fc46c9f

Browse files
committed
Some updates.
1 parent 01e27b7 commit fc46c9f

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ use Buki\Router;
5858
use Symfony\Component\HttpFoundation\Request;
5959
use Symfony\Component\HttpFoundation\Response;
6060

61-
$router = new Buki\Router();
61+
$router = new Router;
6262

6363
// For basic GET URI
6464
$router->get('/', function(Request $request, Response $response) {

src/Router/RouterCommand.php

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace Buki\Router;
44

5+
use Closure;
6+
use ReflectionException;
57
use ReflectionFunction;
68
use ReflectionMethod;
79
use Reflector;
@@ -33,17 +35,17 @@ class RouterCommand
3335
/**
3436
* @var Request
3537
*/
36-
private $request;
38+
protected $request;
3739

3840
/**
3941
* @var Response
4042
*/
41-
private $response;
43+
protected $response;
4244

4345
/**
4446
* @var array
4547
*/
46-
private $middlewares = [];
48+
protected $middlewares = [];
4749

4850
/**
4951
* RouterCommand constructor.
@@ -236,11 +238,11 @@ protected function resolveClass(string $class, string $path, string $namespace)
236238
}
237239

238240
/**
239-
* @param array|\Closure $function
240-
* @param array $params
241+
* @param array|Closure $function
242+
* @param array $params
241243
*
242244
* @return Response|mixed
243-
* @throws \ReflectionException
245+
* @throws ReflectionException
244246
*/
245247
protected function runMethodWithParams($function, array $params)
246248
{
@@ -262,9 +264,9 @@ protected function resolveCallbackParameters(Reflector $reflection, array $uriPa
262264
{
263265
$parameters = [];
264266
foreach ($reflection->getParameters() as $key => $param) {
265-
if (!is_null($param->getClass()) && $param->getClass()->getName() === Request::class) {
267+
if (!is_null($param->getClass()) && $param->getClass()->getName() instanceof Request) {
266268
$parameters[] = $this->request;
267-
} elseif (!is_null($param->getClass()) && $param->getClass()->getName() === Response::class) {
269+
} elseif (!is_null($param->getClass()) && $param->getClass()->getName() instanceof Response) {
268270
$parameters[] = $this->response;
269271
} elseif (!is_null($param->getClass())) {
270272
$parameters[] = null;
@@ -287,7 +289,7 @@ protected function resolveCallbackParameters(Reflector $reflection, array $uriPa
287289
* @param $info
288290
*
289291
* @return bool|RouterException
290-
* @throws \ReflectionException
292+
* @throws ReflectionException
291293
*/
292294
protected function runMiddleware(string $command, string $middleware, array $params, array $info)
293295
{
@@ -334,15 +336,15 @@ protected function resolveMiddleware(string $middleware)
334336
protected function sendResponse($response)
335337
{
336338
if (is_array($response)) {
337-
$this->response->headers->set('Content-Type', 'application/json');;
339+
$this->response->headers->set('Content-Type', 'application/json');
338340
return $this->response
339341
->setContent(json_encode($response))
340342
->prepare($this->request)
341343
->send();
342344
}
343345

344346
if (!is_string($response)) {
345-
return $response;
347+
return $response instanceof Response ? $response->send() : print($response);
346348
}
347349

348350
return $this->response->setContent($response)->prepare($this->request)->send();

0 commit comments

Comments
 (0)