phpstan & tests

contao · Jul 9, 2020 · 37c4dda · 37c4dda
1 parent 2afd655
commit 37c4dda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core-bundle/tests/EventListener/DataContainer/ContentCompositionListenerTest.php b/core-bundle/tests/EventListener/DataContainer/ContentCompositionListenerTest.php
@@ -894,9 +894,9 @@ public function testCanPasteAfterArticle(): void
     }
 
     /**
-     * @return BackendUser|FrontendUser|MockObject
+     * @return User&MockObject
      */
-    private function expectUser(string $userClass = BackendUser::class): User
+    private function expectUser(string $userClass = BackendUser::class)
     {
         /** @var User&MockObject $user */
         $user = $this->mockClassWithProperties($userClass, ['id' => 1]);

diff --git a/core-bundle/tests/Functional/RoutingTest.php b/core-bundle/tests/Functional/RoutingTest.php
@@ -74,10 +74,9 @@ public function testResolvesAliases(array $fixtures, string $request, int $statu
     /**
      * @dataProvider getAliases
      *
-     * @legacy
+     * @group legacy
      *
      * @expectedDeprecation The Contao\CoreBundle\Routing\FrontendLoader is deprecated. Use Symfony routing instead.
-     * @expectedDeprecation The Contao\CoreBundle\Routing\UrlGenerator is deprecated. Use the Symfony router instead.
      */
     public function testResolvesAliasesInLegacyMode(array $fixtures, string $request, int $statusCode, string $pageTitle, array $query, string $host, bool $autoItem): void
     {