Removed deprecated ContentType::isContainer property (#1472)

Author: wiewiurdp

phpstan-baseline.neon

@@ -4000,11 +4000,6 @@ parameters:
 			count: 1
 			path: src/lib/Form/Data/FormMapper/ContentTypeDraftMapper.php
 
-		-
-			message: "#^Access to an undefined property Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\ValueObject\\:\\:\\$isContainer\\.$#"
-			count: 1
-			path: src/lib/Form/Data/FormMapper/ContentTypeDraftMapper.php
-
 		-
 			message: "#^Access to an undefined property Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\ValueObject\\:\\:\\$mainLanguageCode\\.$#"
 			count: 2
@@ -4045,6 +4040,11 @@ parameters:
 			count: 1
 			path: src/lib/Form/Data/FormMapper/ContentTypeDraftMapper.php
 
+		-
+			message: "#^Call to an undefined method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\ValueObject\\:\\:isContainer\\(\\)\\.$#"
+			count: 1
+			path: src/lib/Form/Data/FormMapper/ContentTypeDraftMapper.php
+
 		-
 			message: "#^Method Ibexa\\\\AdminUi\\\\Form\\\\Data\\\\FormMapper\\\\ContentTypeDraftMapper\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
 			count: 1

src/bundle/Controller/LocationController.php

@@ -144,7 +144,7 @@ public function moveAction(Request $request): Response
                 $location = $data->getLocation();
                 $newParentLocation = $data->getNewParentLocation();
 
-                if (!$newParentLocation->getContent()->getContentType()->isContainer) {
+                if (!$newParentLocation->getContent()->getContentType()->isContainer()) {
                     throw new InvalidArgumentException(
                         '$newParentLocation',
                         'Cannot move the Location to a parent that is not a container'
@@ -197,7 +197,7 @@ public function copyAction(Request $request): Response
                 $location = $data->getLocation();
                 $newParentLocation = $data->getNewParentLocation();
 
-                if (!$newParentLocation->getContent()->getContentType()->isContainer) {
+                if (!$newParentLocation->getContent()->getContentType()->isContainer()) {
                     throw new InvalidArgumentException(
                         '$newParentLocation',
                         'Cannot copy the Location to a parent that is not a container'
@@ -305,7 +305,7 @@ public function swapAction(Request $request): Response
                 $childCount = $this->locationService->getLocationChildCount($currentLocation);
                 $contentType = $newLocation->getContent()->getContentType();
 
-                if (!$contentType->isContainer && $childCount) {
+                if (!$contentType->isContainer() && $childCount) {
                     throw new \InvalidArgumentException(
                         'Cannot swap a Location that has sub-items with a Location that is not a container'
                     );

src/lib/Form/Data/FormMapper/ContentTypeDraftMapper.php

@@ -76,7 +76,7 @@ public function mapToFormData(ValueObject $contentTypeDraft, array $params = [])
         $contentTypeData->remoteId = $contentTypeDraft->remoteId;
         $contentTypeData->urlAliasSchema = $contentTypeDraft->urlAliasSchema;
         $contentTypeData->nameSchema = $contentTypeDraft->nameSchema;
-        $contentTypeData->isContainer = $contentTypeDraft->isContainer;
+        $contentTypeData->isContainer = $contentTypeDraft->isContainer();
         $contentTypeData->mainLanguageCode = $contentTypeDraft->mainLanguageCode;
         $contentTypeData->defaultSortField = $contentTypeDraft->defaultSortField;
         $contentTypeData->defaultSortOrder = $contentTypeDraft->defaultSortOrder;

src/lib/Menu/ContentCreateRightSidebarBuilder.php

@@ -104,7 +104,7 @@ public function createStructure(array $options): ItemInterface
         $locationCreateStruct = $this->locationService->newLocationCreateStruct($parentLocation->id);
 
         $canPublish = $this->permissionResolver->canUser('content', 'publish', $contentCreateStruct, [$locationCreateStruct]);
-        $canCreate = $this->permissionResolver->canUser('content', 'create', $contentCreateStruct, [$locationCreateStruct]) && $parentContentType->isContainer;
+        $canCreate = $this->permissionResolver->canUser('content', 'create', $contentCreateStruct, [$locationCreateStruct]) && $parentContentType->isContainer();
         $canPreview = $this->permissionResolver->canUser('content', 'versionread', $contentCreateStruct, [$locationCreateStruct]);
 
         $publishAttributes = [

src/lib/Menu/ContentRightSidebarBuilder.php

@@ -125,7 +125,7 @@ public function createStructure(array $options): ItemInterface
         $startingLocationId = $this->udwConfigResolver->getConfig('default')['starting_location_id'];
 
         $lookupLimitationsResult = $this->limitationResolver->getContentCreateLimitations($location);
-        $canCreate = $lookupLimitationsResult->hasAccess && $contentType->isContainer;
+        $canCreate = $lookupLimitationsResult->hasAccess && $contentType->isContainer();
         $uwdConfig = $this->udwExtension->renderUniversalDiscoveryWidgetConfig('single_container');
         $canEdit = $this->permissionResolver->canUser(
             'content',

src/lib/Specification/Location/IsContainer.php

@@ -19,6 +19,6 @@ class IsContainer extends AbstractSpecification
      */
     public function isSatisfiedBy($item): bool
     {
-        return $item->getContent()->getContentType()->isContainer;
+        return $item->getContent()->getContentType()->isContainer();
     }
 }

src/lib/UI/Config/Provider/ContentTypes.php

@@ -117,7 +117,7 @@ private function getContentTypeData(ContentType $contentType, bool $isHidden): a
             'id' => $contentType->id,
             'identifier' => $contentType->identifier,
             'name' => $contentType->getName(),
-            'isContainer' => $contentType->isContainer,
+            'isContainer' => $contentType->isContainer(),
             'thumbnail' => $this->contentTypeIconResolver->getContentTypeIcon($contentType->identifier),
             'href' => $this->urlGenerator->generate('ibexa.rest.load_content_type', [
                 'contentTypeId' => $contentType->id,

tests/lib/Form/Data/FormMapper/ContentTypeDraftMapperTest.php

@@ -121,7 +121,7 @@ private function createContentType(FieldDefinitionCollectionInterface $fieldDefi
 
     private function createContentTypeDraft(ContentType $contentType): ContentTypeDraft
     {
-        return new ContentTypeDraft(['innerContentType' => $contentType]);
+        return new ContentTypeDraft(['innerContentType' => $contentType, 'isContainer' => false]);
     }
 
     private function createFieldDefinitionCollectionForFieldDefinitionsData(): FieldDefinitionCollectionInterface
@@ -254,7 +254,7 @@ private function createContentTypeData(ContentTypeDraft $contentTypeDraft): Cont
             'remoteId' => $contentTypeDraft->remoteId,
             'urlAliasSchema' => $contentTypeDraft->urlAliasSchema,
             'nameSchema' => $contentTypeDraft->nameSchema,
-            'isContainer' => $contentTypeDraft->isContainer,
+            'isContainer' => $contentTypeDraft->isContainer(),
             'mainLanguageCode' => $contentTypeDraft->mainLanguageCode,
             'defaultSortField' => $contentTypeDraft->defaultSortField,
             'defaultSortOrder' => $contentTypeDraft->defaultSortOrder,

tests/lib/Validator/Constraint/LocationIsContainerValidatorTest.php

@@ -53,8 +53,7 @@ protected function setUp(): void
     public function testValid()
     {
         $this->contentType
-            ->method('__get')
-            ->with('isContainer')
+            ->method('isContainer')
             ->willReturn(true);
 
         $this->executionContext
@@ -67,8 +66,7 @@ public function testValid()
     public function testInvalid()
     {
         $this->contentType
-            ->method('__get')
-            ->with('isContainer')
+            ->method('isContainer')
             ->willReturn(false);
 
         $this->executionContext