bytic / router

src/RouterAwareTrait.php

<?php

namespace Nip\Router;

use Nip\Request;

/**
 * Class ConfigAwareTrait
 * @package Nip\Router
 */
trait RouterAwareTrait
{
    /**
     * @var Router|null
     */
    protected $router = null;

    /**
     * @param bool|Request $request
     * @return array
     */
    public function route($request = false)
    {
        $request = $request ? $request : $this->getRequest();

It seems like getRequest() must be provided by classes using this trait. How about adding it as abstract method to this trait?

        $router = $this->getRouter();
        $router->setContext((new RequestContext())->fromRequest($this->getRequest()));

        $params = $router->route($request);

The function Nip\Router\Router::route() has been deprecated: Use matchRequest($request)

It seems like $request can also be of type true; however, parameter $request of Nip\Router\Router::route() does only seem to accept Nip\Request|Psr\Http\Message\ServerRequestInterface, maybe add an additional type check?

        return $params;
    }

    /**
     * @return Router
     */
    public function getRouter()
    {
        if (!$this->router) {
            $this->initRouter();
        }

        return $this->router;
    }

    /**
     * @param Router $router
     * @return $this
     */
    public function setRouter($router = false)
    {
        $this->router = $router;

It seems like $router can also be of type false. However, the property $router is declared as type Nip\Router\Router|null. Maybe add an additional type check?

        return $this;
    }

    protected function initRouter()
    {
        $this->setRouter($this->newRouter());
    }

    /**
     * @return Router
     */
    protected function newRouter()
    {
        return app()->get('router');
    }
}