Configuration options are supplemented

mobicms · Jan 21, 2024 · 97d9784 · 97d9784
1 parent 4b76968
commit 97d9784
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/SessionMiddlewareFactory.php b/src/SessionMiddlewareFactory.php
@@ -17,9 +17,16 @@ class SessionMiddlewareFactory
      */
     public function __invoke(ContainerInterface $container): SessionMiddleware
     {
-        /** @var ConfigInterface $configContainer */
-        $configContainer = $container->get(ConfigInterface::class);
-        $config = (array) $configContainer->get('session', []);
+        if ($container->has(ConfigInterface::class)) {
+            /** @var ConfigInterface $configContainer */
+            $configContainer = $container->get(ConfigInterface::class);
+            $config = (array) $configContainer->get('session', []);
+        } elseif ($container->has('config')) {
+            $configArray = (array) $container->get('config');
+            $config = $configArray['session'] ?? [];
+        } else {
+            $config = [];
+        }
 
         $session = new SessionHandler(
             $container->get(PDO::class),

diff --git a/tests/unit/SessionMiddlewareFactoryTest.php b/tests/unit/SessionMiddlewareFactoryTest.php
@@ -107,6 +107,10 @@ private function getContainer(array $options): ContainerInterface
             ->willReturn($options);
 
         $container = $this->createMock(ContainerInterface::class);
+        $container
+            ->method('has')
+            ->with(ConfigInterface::class)
+            ->willReturn(true);
         $container
             ->method('get')
             ->willReturnCallback(