Move getModule() code into App class

diff --git a/src/App.php b/src/App.php
index 68cae8083002a4e32977274065d4933102a07da1..e0f1a0e2da9851593f520f0aa955f324aca4cebf 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -715,7 +715,24 @@ class App
                /** @var Router $router */
                $router = $this->container->create(Router::class);
 
-               return $router->getModule($this->container, $moduleClass);
+               $moduleClass = $moduleClass ?? $router->getModuleClass();
+               $parameters = $router->getParameters();
+
+               $dice_profiler_threshold = $this->config->get('system', 'dice_profiler_threshold', 0);
+
+               $stamp = microtime(true);
+
+               /** @var ICanHandleRequests $module */
+               $module = $this->container->create($moduleClass, $parameters);
+
+               if ($dice_profiler_threshold > 0) {
+                       $dur = floatval(microtime(true) - $stamp);
+                       if ($dur >= $dice_profiler_threshold) {
+                               $this->logger->notice('Dice module creation lasts too long.', ['duration' => round($dur, 3), 'module' => $moduleClass, 'parameters' => $parameters]);
+                       }
+               }
+
+               return $module;
        }
 
        /**

diff --git a/src/App/Router.php b/src/App/Router.php
index f1f051086774578d95af31bdb6df8d258dfecba8..deb0155cf0c88723e14f7ea831bfbd9f91e2452f 100644 (file)
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -319,25 +319,9 @@ class Router
                }
        }
 
-       public function getModule(Dice $dice, ?string $module_class = null): ICanHandleRequests
+       public function getParameters(): array
        {
-               $moduleClass = $module_class ?? $this->getModuleClass();
-
-               $dice_profiler_threshold = $this->config->get('system', 'dice_profiler_threshold', 0);
-
-               $stamp = microtime(true);
-
-               /** @var ICanHandleRequests $module */
-               $module = $dice->create($moduleClass, $this->parameters);
-
-               if ($dice_profiler_threshold > 0) {
-                       $dur = floatval(microtime(true) - $stamp);
-                       if ($dur >= $dice_profiler_threshold) {
-                               $this->logger->notice('Dice module creation lasts too long.', ['duration' => round($dur, 3), 'module' => $moduleClass, 'parameters' => $this->parameters]);
-                       }
-               }
-
-               return $module;
+               return $this->parameters;
        }
 
        /**