Added support for including system content type groups in ContentTypeController

composer.json

@@ -30,7 +30,7 @@
         "ext-libxml": "*",
         "ext-simplexml": "*",
         "ext-xmlwriter": "*",
-        "ibexa/core": "~4.6.0@dev",
+        "ibexa/core": "dev-ct-group-is-system as 4.6.x-dev",
         "symfony/http-kernel": "^5.3",
         "symfony/dependency-injection": "^5.3",
         "symfony/routing": "^5.3",

src/lib/Server/Controller/ContentType.php

@@ -168,8 +168,10 @@ public function loadContentTypeGroupList(Request $request)
             );
         }
 
+        $includeSystem = $request->query->getBoolean('includeSystem', false);
+
         return new Values\ContentTypeGroupList(
-            $this->contentTypeService->loadContentTypeGroups(Language::ALL)
+            $this->contentTypeService->loadContentTypeGroups(Language::ALL, $includeSystem)
         );
     }
 

src/lib/Server/Input/Parser/Criterion/LogicalNot.php

@@ -28,7 +28,7 @@ class LogicalNot extends CriterionParser
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
-        if (!array_key_exists('NOT', $data) && !is_array($data['NOT'])) {
+        if (!array_key_exists('NOT', $data) || !is_array($data['NOT'])) {
             throw new Exceptions\Parser('Invalid <NOT> format');
         }
 
@@ -37,6 +37,11 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher)
         }
         $criterionName = key($data['NOT']);
         $criterionData = current($data['NOT']);
+
+        if (!is_string($criterionName)) {
+            throw new Exceptions\Parser('Invalid <NOT> format');
+        }
+
         $criteria = $this->dispatchCriterion($criterionName, $criterionData, $parsingDispatcher);
 
         return new LogicalNotCriterion($criteria);

tests/lib/Server/Controller/ContentTypeControllerTest.php

@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+namespace Ibexa\Tests\Rest\Server\Controller;
+
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Language;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup;
+use Ibexa\Rest\Server\Controller\ContentType;
+use Ibexa\Rest\Server\Values\ContentTypeGroupList;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+
+final class ContentTypeControllerTest extends TestCase
+{
+    public function testLoadContentTypeGroupListDefaultsToNonSystem(): void
+    {
+        $contentTypeService = $this->createMock(ContentTypeService::class);
+        $contentTypeGroups = [$this->createMock(ContentTypeGroup::class)];
+
+        $contentTypeService
+            ->expects(self::once())
+            ->method('loadContentTypeGroups')
+            ->with(Language::ALL, false)
+            ->willReturn($contentTypeGroups);
+
+        $controller = new ContentType($contentTypeService);
+
+        $result = $controller->loadContentTypeGroupList(new Request());
+
+        self::assertInstanceOf(ContentTypeGroupList::class, $result);
+        self::assertSame($contentTypeGroups, $result->contentTypeGroups);
+    }
+
+    public function testLoadContentTypeGroupListIncludesSystemWhenRequested(): void
+    {
+        $contentTypeService = $this->createMock(ContentTypeService::class);
+        $contentTypeGroups = [$this->createMock(ContentTypeGroup::class)];
+
+        $contentTypeService
+            ->expects(self::once())
+            ->method('loadContentTypeGroups')
+            ->with(Language::ALL, true)
+            ->willReturn($contentTypeGroups);
+
+        $controller = new ContentType($contentTypeService);
+
+        $result = $controller->loadContentTypeGroupList(new Request(['includeSystem' => 'true']));
+
+        self::assertInstanceOf(ContentTypeGroupList::class, $result);
+        self::assertSame($contentTypeGroups, $result->contentTypeGroups);
+    }
+}