IBX-6738: Applied code review suggestions

ibexa · Oct 23, 2023 · 2974c54 · 2974c54
1 parent 7f51e57
commit 2974c54
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/lib/Repository/ContentTypeService.php b/src/lib/Repository/ContentTypeService.php
@@ -297,8 +297,8 @@ public function deleteContentTypeGroup(APIContentTypeGroup $contentTypeGroup): v
 
         $this->repository->beginTransaction();
         try {
-            $ContentTypesDrafts = $this->contentTypeHandler->loadContentTypes($contentTypeGroup->id, SPIContentType::STATUS_DRAFT);
-            foreach ($ContentTypesDrafts as $contentTypeDraft) {
+            $contentTypesDrafts = $this->contentTypeHandler->loadContentTypes($contentTypeGroup->id, SPIContentType::STATUS_DRAFT);
+            foreach ($contentTypesDrafts as $contentTypeDraft) {
                 $this->contentTypeHandler->delete($contentTypeDraft->id, SPIContentType::STATUS_DRAFT);
             }
 

diff --git a/tests/integration/Core/Repository/ContentTypeServiceTest.php b/tests/integration/Core/Repository/ContentTypeServiceTest.php
@@ -602,11 +602,8 @@ public function testDeleteContentTypeGroup()
 
     public function testDeleteContentTypeGroupWithOrphanedContentTypeDrafts(): void
     {
-        $this->expectException(NotFoundException::class);
-
         $repository = $this->getRepository();
 
-        /* BEGIN: Use Case */
         $contentTypeService = $repository->getContentTypeService();
 
         $groupCreate = $contentTypeService->newContentTypeGroupCreateStruct(
@@ -626,12 +623,11 @@ public function testDeleteContentTypeGroupWithOrphanedContentTypeDrafts(): void
         }
 
         $contentTypeService->deleteContentTypeGroup($group);
-        /* END: Use Case */
 
         // loadContentTypeGroup should throw NotFoundException
-        $contentTypeService->loadContentTypeGroup($group->id);
+        $this->expectException(NotFoundException::class);
 
-        $this->fail('Content type group not deleted.');
+        $contentTypeService->loadContentTypeGroup($group->id);
     }
 
     /**