Refactoring

Author: designcise

www/public/index.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require_once __DIR__ . '/../vendor/autoload.php';
 
 use BitFrame\App;
@@ -9,11 +11,13 @@
 
 (static function () {
     $app = new App();
+
+    /** @var \BitFrame\Container $container */
     $container = $app->getContainer();
 
     import(Server::CONFIG_DIR . 'settings', [$container]);
     import(Server::CONFIG_DIR . 'services', [$container]);
-    import(Server::ROUTES_DIR . 'routes', [$container['router']]);
+    import(Server::ROUTES_DIR . 'routes', [$container['router'], $container]);
 
     $app->use([
         $container['emitter'],

www/server/app/Controller/DefaultController.php

@@ -1,20 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 namespace YourProject\App\Controller;
 
 use Psr\Http\Message\{ServerRequestInterface, ResponseInterface};
 use Psr\Http\Server\RequestHandlerInterface;
+use BitFrame\Container;
 
 class DefaultController
 {
     public function testAction(
         ServerRequestInterface $request,
-        RequestHandlerInterface $handler
+        RequestHandlerInterface $handler,
+        Container $container
     ): ResponseInterface {
-        $container = $handler->getContainer();
-        $globals = $container['globals'];
-
         $response = $handler->handle($request);
+        $globals = $container['globals'];
 
         $response->getBody()->write(
             "{$globals['title']} - 👋 Build Something Amazing Today!"

www/server/app/Server.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace YourProject\App;
 
 class Server

www/server/config/routes.php

@@ -1,8 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
+use BitFrame\Container;
 use BitFrame\Router\AbstractRouter;
 use YourProject\App\Controller\DefaultController;
 
-return static function (AbstractRouter $router) {
-    $router->get('/hello/{action}', [DefaultController::class, 'testAction']);
+return static function (AbstractRouter $router, Container $container) {
+    $router->get('/hello/{action}', [DefaultController::class, 'testAction', $container]);
 };

www/server/config/services.php

@@ -1,13 +1,15 @@
 <?php
 
-use Psr\Container\ContainerInterface;
+declare(strict_types=1);
+
+use BitFrame\Container;
 use BitFrame\FastRoute\Router;
 use BitFrame\Factory\HttpFactory;
 use BitFrame\Emitter\SapiEmitter;
 use BitFrame\Whoops\ErrorHandler;
 use BitFrame\Whoops\Provider\HandlerProviderNegotiator;
 
-return static function (ContainerInterface $container) {
+return static function (Container $container) {
     $container['router'] = static fn() => new Router();
     $container['emitter'] = static fn() => new SapiEmitter();
     $container['errorHandler'] = static fn () => (

www/server/config/settings.php

@@ -1,11 +1,13 @@
 <?php
 
-use Psr\Container\ContainerInterface;
+declare(strict_types=1);
+
+use BitFrame\Container;
 
 error_reporting(E_ALL & ~E_USER_DEPRECATED & ~E_DEPRECATED & ~E_STRICT & ~E_NOTICE);
 date_default_timezone_set('UTC');
 
-return static function (ContainerInterface $container) {
+return static function (Container $container) {
     $container['server'] = [
         'env' => 'dev',
     ];

www/server/helper/func.php

@@ -1,10 +1,19 @@
 <?php
 
+declare(strict_types=1);
+
 namespace YourProject\Helper;
 
 use function is_callable;
 
-function import(string $location, array $args = []) {
+/**
+ * @param string $location
+ * @param array $args
+ *
+ * @return mixed
+ */
+function import(string $location, array $args = [])
+{
     if (is_dir($location)) {
         $location .= 'index';
     }