Fix some false mocking inside various tests (#7392)

sulu · May 3, 2024 · 37b0d17 · 37b0d17
1 parent d6d9831
commit 37b0d17
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 18 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -12910,11 +12910,6 @@ parameters:
 			count: 1
 			path: src/Sulu/Bundle/MarkupBundle/Tests/Unit/Listener/MarkupListenerTest.php
 
-		-
-			message: "#^Property Symfony\\\\Component\\\\HttpFoundation\\\\Response\\:\\:\\$headers \\(Symfony\\\\Component\\\\HttpFoundation\\\\ResponseHeaderBag\\) does not accept Symfony\\\\Component\\\\HttpFoundation\\\\HeaderBag\\.$#"
-			count: 1
-			path: src/Sulu/Bundle/MarkupBundle/Tests/Unit/Listener/MarkupListenerTest.php
-
 		-
 			message: "#^Method Sulu\\\\Bundle\\\\MarkupBundle\\\\Tests\\\\Unit\\\\Markup\\\\HtmlTagExtractorTest\\:\\:provideMultipleTags\\(\\) has no return type specified\\.$#"
 			count: 1

diff --git a/src/Sulu/Bundle/DocumentManagerBundle/Tests/Unit/Command/FixturesLoadCommandTest.php b/src/Sulu/Bundle/DocumentManagerBundle/Tests/Unit/Command/FixturesLoadCommandTest.php
@@ -201,7 +201,7 @@ public function testLoadGroup(): void
     public function testNoFixturesInteraction(): void
     {
         $helper = $this->prophesize(QuestionHelper::class);
-        $helper->setHelperSet(Argument::cetera())->willReturn(null);
+        $helper->setHelperSet(Argument::cetera())->shouldBeCalled();
         $helper->getName()->willReturn('question');
         $helper->ask(Argument::cetera())->shouldBeCalled()->willReturn(true);
 

diff --git a/src/Sulu/Bundle/DocumentManagerBundle/Tests/Unit/Routing/Loader/VersionRouteLoaderTest.php b/src/Sulu/Bundle/DocumentManagerBundle/Tests/Unit/Routing/Loader/VersionRouteLoaderTest.php
@@ -16,6 +16,7 @@
 use Sulu\Bundle\DocumentManagerBundle\Routing\Loader\VersionRouteLoader;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Config\Loader\LoaderResolverInterface;
+use Symfony\Component\Routing\RouteCollection;
 
 class VersionRouteLoaderTest extends TestCase
 {
@@ -32,11 +33,14 @@ public function testLoadWithActivatedVersioning(): void
     {
         $versionRouteLoader = new VersionRouteLoader(true);
         $resolver = $this->prophesize(LoaderResolverInterface::class);
+
+        $routeDefinitons = new RouteCollection();
+
         $loader = $this->prophesize(LoaderInterface::class);
-        $loader->load('routing.yml', 'rest')->shouldBeCalled();
+        $loader->load('routing.yml', 'rest')->shouldBeCalled()->willReturn($routeDefinitons);
         $resolver->resolve('routing.yml', 'rest')->willReturn($loader->reveal());
         $versionRouteLoader->setResolver($resolver->reveal());
 
-        $versionRouteLoader->load('routing.yml');
+        $this->assertEquals($routeDefinitons, $versionRouteLoader->load('routing.yml'));
     }
 }
diff --git a/src/Sulu/Bundle/MarkupBundle/Tests/Unit/Listener/MarkupListenerTest.php b/src/Sulu/Bundle/MarkupBundle/Tests/Unit/Listener/MarkupListenerTest.php
@@ -17,7 +17,6 @@
 use Prophecy\Prophecy\ObjectProphecy;
 use Sulu\Bundle\MarkupBundle\Listener\MarkupListener;
 use Sulu\Bundle\MarkupBundle\Markup\MarkupParserInterface;
-use Symfony\Component\HttpFoundation\HeaderBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
@@ -42,11 +41,6 @@ class MarkupListenerTest extends TestCase
      */
     private $response;
 
-    /**
-     * @var ObjectProphecy<HeaderBag>
-     */
-    private $responseHeaders;
-
     /**
      * @var ObjectProphecy<Request>
      */
@@ -71,9 +65,6 @@ protected function setUp(): void
         $this->request = $this->prophesize(Request::class);
         $this->response = $this->prophesize(Response::class);
 
-        $this->responseHeaders = $this->prophesize(HeaderBag::class);
-        $this->response->reveal()->headers = $this->responseHeaders->reveal();
-
         $this->event = new ResponseEvent(
             $this->kernel->reveal(),
             $this->request->reveal(),

diff --git a/src/Sulu/Bundle/SecurityBundle/Tests/Unit/Security/AuthenticationHandlerTest.php b/src/Sulu/Bundle/SecurityBundle/Tests/Unit/Security/AuthenticationHandlerTest.php
@@ -65,7 +65,7 @@ public function setUp(): void
         $router = $this->prophesize(RouterInterface::class);
         $session = $this->prophesize(Session::class);
         $session->get('_security.admin.target_path')->willReturn('/admin/#target/path');
-        $session->set(Security::AUTHENTICATION_ERROR, $this->exception->reveal())->willReturn(null);
+        $session->set(Security::AUTHENTICATION_ERROR, $this->exception->reveal())->will(function() {});
         $this->request->getSession()
             ->willReturn($session->reveal());
         $router->generate('sulu_admin')->willReturn('/admin');