IBX-9631: Applied review remarks

Author: barw4

src/bundle/Resources/config/services/services.yaml

@@ -12,4 +12,4 @@ services:
     Ibexa\AdminUi\Service\ContentTypeFieldsByExpressionService: ~
 
     Ibexa\Contracts\AdminUi\Service\ContentTypeFieldsByExpressionServiceInterface:
-        '@Ibexa\AdminUi\Service\ContentTypeFieldsByExpressionService'
+        '@Ibexa\AdminUi\Service\ContentTypeFieldsByExpressionService'

src/lib/Exception/FieldTypeExpressionParserException.php

@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\AdminUi\Exception;
+
+use RuntimeException;
+
+final class FieldTypeExpressionParserException extends RuntimeException
+{
+}

src/lib/Util/ContentTypeFieldsExpressionParser.php

@@ -8,7 +8,7 @@
 
 namespace Ibexa\AdminUi\Util;
 
-use RuntimeException;
+use Ibexa\AdminUi\Exception\FieldTypeExpressionParserException;
 
 final class ContentTypeFieldsExpressionParser implements ContentTypeFieldsExpressionParserInterface
 {
@@ -46,7 +46,7 @@ public function parseExpression(string $expression): array
                 $this->expectSlash();
                 $fieldTokens = $this->parseSection();
             } else {
-                throw new RuntimeException('Invalid expression, expected one or two T_SLASH delimiters.');
+                throw new FieldTypeExpressionParserException('Invalid expression, expected one or two T_SLASH delimiters.');
             }
         }
 
@@ -57,7 +57,7 @@ public function parseExpression(string $expression): array
         ];
 
         if (array_filter($parsedTokens) === []) {
-            throw new RuntimeException('Choosing every possible content type field is not allowed.');
+            throw new FieldTypeExpressionParserException('Choosing every possible content type field is not allowed.');
         }
 
         return $parsedTokens;
@@ -71,7 +71,7 @@ private function parseSection(): ?array
         $items = [];
 
         if ($this->lexer->token === null) {
-            throw new RuntimeException('A token inside a section cannot be empty.');
+            throw new FieldTypeExpressionParserException('A token inside a section cannot be empty.');
         }
 
         // Multiple elements between braces
@@ -83,7 +83,7 @@ private function parseSection(): ?array
             }
 
             if (!$this->lexer->token->isA(ContentTypeFieldsExpressionDoctrineLexer::T_RBRACE)) {
-                throw new RuntimeException('Expected T_RBRACE to close the list.');
+                throw new FieldTypeExpressionParserException('Expected T_RBRACE to close the list.');
             }
 
             $this->lexer->moveNext();
@@ -107,19 +107,19 @@ private function getTokenFromInsideBracket(): string
 
         $token = $this->expectIdentifierOrWildcard();
         if ($token === null) {
-            throw new RuntimeException('Wildcards cannot be mixed with identifiers inside the expression.');
+            throw new FieldTypeExpressionParserException('Wildcards cannot be mixed with identifiers inside the expression.');
         }
 
         return $token;
     }
 
     /**
-     * @throws \RuntimeException
+     * @throws \Ibexa\AdminUi\Exception\FieldTypeExpressionParserException
      */
     private function expectSlash(): void
     {
         if ($this->lexer->token === null) {
-            throw new RuntimeException(
+            throw new FieldTypeExpressionParserException(
                 sprintf(
                     'Expected token of type "%s" but got "null"',
                     ContentTypeFieldsExpressionDoctrineLexer::T_SLASH,
@@ -128,7 +128,7 @@ private function expectSlash(): void
         }
 
         if (!$this->lexer->token->isA(ContentTypeFieldsExpressionDoctrineLexer::T_SLASH)) {
-            throw new RuntimeException(
+            throw new FieldTypeExpressionParserException(
                 sprintf(
                     'Expected token of type "%s" but got "%s"',
                     ContentTypeFieldsExpressionDoctrineLexer::T_SLASH,
@@ -143,7 +143,7 @@ private function expectSlash(): void
     private function expectIdentifierOrWildcard(): ?string
     {
         if ($this->lexer->token === null) {
-            throw new RuntimeException(
+            throw new FieldTypeExpressionParserException(
                 sprintf(
                     'Expected token of type "%s" but got "null"',
                     ContentTypeFieldsExpressionDoctrineLexer::T_SLASH,
@@ -159,7 +159,7 @@ private function expectIdentifierOrWildcard(): ?string
             ],
             true,
         )) {
-            throw new RuntimeException('Expected an identifier or wildcard.');
+            throw new FieldTypeExpressionParserException('Expected an identifier or wildcard.');
         }
 
         $value = $this->lexer->token->isA(ContentTypeFieldsExpressionDoctrineLexer::T_WILDCARD)

src/lib/Util/ContentTypeFieldsExtractor.php

@@ -47,7 +47,7 @@ public function isFieldWithinExpression(int $fieldDefinitionId, string $expressi
     /**
      * @param array{non-empty-list<string>|null, non-empty-list<string>|null, non-empty-list<string>|null} $extractedMetadata
      *
-     * @return list<ContentType>
+     * @return list<\Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType>
      */
     private function resolveContentTypes(array $extractedMetadata): array
     {
@@ -109,7 +109,7 @@ private function resolveFieldIds(?array $fieldIdentifiers, ContentType $contentT
     }
 
     /**
-     * @param non-empty-list<ContentType> $contentTypes
+     * @param non-empty-list<\Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType> $contentTypes
      * @param list<string> $contentTypeGroupIdentifiers
      */
     private function validateContentTypesInsideGroups(