Fix rebase-issue

tvdijen · tvdijen · commit 6cd611adf907 · 2023-12-14T16:05:00.000+01:00
diff --git a/tests/modules/core/src/Auth/Process/CardinalitySingleTest.php b/tests/modules/core/src/Auth/Process/CardinalitySingleTest.php
@@ -45,13 +45,7 @@ private function processFilter(array $config, array $request): array
     protected function setUp(): void
     {
         Configuration::loadFromArray([], '[ARRAY]', 'simplesaml');
-<<<<<<< HEAD
-        $this->httpUtils = $this->getMockBuilder(Utils\HTTP::class)
-                           ->setMethods(['redirectTrustedURL'])
-                           ->getMock();
-=======
         $this->httpUtils = $this->createStub(Utils\HTTP::class);
->>>>>>> d7b3e17e7 (Fix unit tests)
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,7 @@ private function processFilter(array $config, array $request): array`
`45`	`45`	`protected function setUp(): void`
`46`	`46`	`{`
`47`	`47`	`Configuration::loadFromArray([], '[ARRAY]', 'simplesaml');`
`48`		`-<<<<<<< HEAD`
`49`		`- $this->httpUtils = $this->getMockBuilder(Utils\HTTP::class)`
`50`		`- ->setMethods(['redirectTrustedURL'])`
`51`		`- ->getMock();`
`52`		`-=======`
`53`	`48`	`$this->httpUtils = $this->createStub(Utils\HTTP::class);`
`54`		`->>>>>>> d7b3e17e7 (Fix unit tests)`
`55`	`49`	`}`
`56`	`50`
`57`	`51`