Use willReturnMap in MapServiceTest for ConfigManager

jweiland-net · Oct 13, 2023 · 4098331 · 4098331
1 parent ca7191e
commit 4098331
Showing 1 changed file with 18 additions and 19 deletions.
diff --git a/Tests/Functional/Service/MapServiceTest.php b/Tests/Functional/Service/MapServiceTest.php
@@ -77,28 +77,27 @@ protected function setUp(): void
         $this->configurationManagerMock
             ->expects(self::atLeastOnce())
             ->method('getConfiguration')
-            ->with(
-                ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK,
-                'Maps2',
-                'Maps2'
-            )
-            ->willReturn([
-                'view' => [
-                    'layoutRootPaths' => [],
-                    'partialRootPaths' => [
-                        'EXT:maps2/Tests/Functional/Fixtures/Partials',
+            ->willReturnMap([
+                [
+                    ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK,
+                    'Maps2',
+                    'Maps2',
+                    [
+                        'view' => [
+                            'layoutRootPaths' => [],
+                            'partialRootPaths' => [
+                                'EXT:maps2/Tests/Functional/Fixtures/Partials',
+                            ],
+                        ],
                     ],
                 ],
+                [
+                    ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS,
+                    'Maps2',
+                    'Maps2',
+                    []
+                ],
             ]);
-        $this->configurationManagerMock
-            ->expects(self::atLeastOnce())
-            ->method('getConfiguration')
-            ->with(
-                ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS,
-                'Maps2',
-                'Maps2'
-            )
-            ->willReturn([]);
 
         // Replace default template to prevent calling cache VHs. They check against FE
         $this->extConfMock = $this->createMock(ExtConf::class);