Merged branch '4.6'

ibexa · May 20, 2024 · 57c22e7 · 57c22e7
2 parents 680a96a + 5316c60
commit 57c22e7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 28 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -9300,36 +9300,11 @@ parameters:
 			count: 1
 			path: tests/lib/Server/Output/ValueObjectVisitor/LocationListTest.php
 
-		-
-			message: "#^Access to an undefined property Ibexa\\\\Tests\\\\Rest\\\\Server\\\\Output\\\\ValueObjectVisitor\\\\LocationTest\\:\\:\\$permissionResolverMock\\.$#"
-			count: 1
-			path: tests/lib/Server/Output/ValueObjectVisitor/LocationTest.php
-
-		-
-			message: "#^Access to property \\$id on an unknown class eZ\\\\Publish\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Location\\.$#"
-			count: 2
-			path: tests/lib/Server/Output/ValueObjectVisitor/LocationTest.php
-
-		-
-			message: "#^Call to method getContentInfo\\(\\) on an unknown class eZ\\\\Publish\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Location\\.$#"
-			count: 1
-			path: tests/lib/Server/Output/ValueObjectVisitor/LocationTest.php
-
-		-
-			message: "#^Instantiated class eZ\\\\Publish\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Location not found\\.$#"
-			count: 2
-			path: tests/lib/Server/Output/ValueObjectVisitor/LocationTest.php
-
 		-
 			message: "#^Method Ibexa\\\\Tests\\\\Rest\\\\Server\\\\Output\\\\ValueObjectVisitor\\\\LocationTest\\:\\:getDataForTestVisitLocationAttributesResolvesMainLocation\\(\\) return type has no value type specified in iterable type iterable\\.$#"
 			count: 1
 			path: tests/lib/Server/Output/ValueObjectVisitor/LocationTest.php
 
-		-
-			message: "#^Parameter \\$location of method Ibexa\\\\Tests\\\\Rest\\\\Server\\\\Output\\\\ValueObjectVisitor\\\\LocationTest\\:\\:mockLoadLocation\\(\\) has invalid type eZ\\\\Publish\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Location\\.$#"
-			count: 1
-			path: tests/lib/Server/Output/ValueObjectVisitor/LocationTest.php
-
 		-
 			message: "#^Method Ibexa\\\\Tests\\\\Rest\\\\Server\\\\Output\\\\ValueObjectVisitor\\\\NoContentTest\\:\\:testVisit\\(\\) should return string but return statement is missing\\.$#"
 			count: 1

diff --git a/tests/lib/Server/Output/ValueObjectVisitor/LocationTest.php b/tests/lib/Server/Output/ValueObjectVisitor/LocationTest.php
@@ -7,14 +7,13 @@
 
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\Core\Repository\Values\Content\Location;
 use Ibexa\Contracts\Core\Repository\ContentService;
 use Ibexa\Contracts\Core\Repository\LocationService;
-use Ibexa\Contracts\Core\Repository\PermissionResolver;
 use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location as ApiLocation;
 use Ibexa\Core\Base\Exceptions\UnauthorizedException;
 use Ibexa\Core\Repository\Values\Content\Content;
+use Ibexa\Core\Repository\Values\Content\Location;
 use Ibexa\Core\Repository\Values\Content\VersionInfo;
 use Ibexa\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -36,7 +35,6 @@ final class LocationTest extends ValueObjectVisitorBaseTest
 
     protected function setUp(): void
     {
-        $this->permissionResolverMock = $this->createMock(PermissionResolver::class);
         $this->locationServiceMock = $this->createMock(LocationService::class);
         $this->contentServiceMock = $this->createMock(ContentService::class);