]> source.dussan.org Git - nextcloud-server.git/commitdiff
test(settings): Correctly only return bool for Symfony Input::hasParameterOption... dependabot/composer/symfony-6.4 48539/head
authorJoas Schilling <coding@schilljs.com>
Fri, 4 Oct 2024 14:24:22 +0000 (16:24 +0200)
committerJoas Schilling <coding@schilljs.com>
Mon, 7 Oct 2024 10:11:39 +0000 (12:11 +0200)
Signed-off-by: Joas Schilling <coding@schilljs.com>
tests/Core/Command/User/SettingTest.php

index 95d1c192b81dfe83e8832d5e75abee15960e4f74..62b75191d36de649edaa9e79d210369ce90f48cc 100644 (file)
@@ -193,7 +193,16 @@ class SettingTest extends TestCase {
                        ->willReturnMap($options);
                $this->consoleInput->expects($this->any())
                        ->method('hasParameterOption')
-                       ->willReturnMap($parameterOptions);
+                       ->willReturnCallback(function (string|array $config, bool $default = false) use ($parameterOptions): bool {
+                               foreach ($parameterOptions as $parameterOption) {
+                                       if ($config === $parameterOption[0]
+                                               // Check the default value if the maps has 3 entries
+                                               && (!isset($parameterOption[2]) || $default === $parameterOption[1])) {
+                                               return end($parameterOption);
+                                       }
+                               }
+                               return false;
+                       });
 
                if ($user !== false) {
                        $this->userManager->expects($this->once())
@@ -401,15 +410,16 @@ class SettingTest extends TestCase {
                        if ($defaultValue === null) {
                                $this->consoleInput->expects($this->atLeastOnce())
                                        ->method('hasParameterOption')
-                                       ->willReturnMap([
-                                               ['--default-value', false],
-                                       ]);
+                                       ->willReturn(false);
                        } else {
                                $this->consoleInput->expects($this->atLeastOnce())
                                        ->method('hasParameterOption')
-                                       ->willReturnMap([
-                                               ['--default-value', false, true],
-                                       ]);
+                                       ->willReturnCallback(function (string|array $config, bool $default = false): bool {
+                                               if ($config === '--default-value' && $default === false) {
+                                                       return true;
+                                               }
+                                               return false;
+                                       });
                                $this->consoleInput->expects($this->once())
                                        ->method('getOption')
                                        ->with('default-value')