Applied CR

Author: kisztof

src/contracts/Event/ResolveUrlAliasSchemaEvent.php

@@ -18,6 +18,9 @@ final class ResolveUrlAliasSchemaEvent extends Event
 
     private Content $content;
 
+    /**
+     * @var array<string, array<string>>
+     */
     private array $names = [];
 
     public function __construct(

src/contracts/Repository/NameSchema/NameSchemaServiceInterface.php

@@ -20,12 +20,28 @@ interface NameSchemaServiceInterface
 {
     public function resolveUrlAliasSchema(Content $content, ContentType $contentType = null): array;
 
+    /**
+     * @param array<string, array<string, string>> $fieldMap
+     * @param array<string> $languageCodes
+     *
+     * @return array
+     */
     public function resolveNameSchema(
         Content $content,
         array $fieldMap = [],
         array $languageCodes = [],
         ContentType $contentType = null
     ): array;
 
+    /**
+     * Returns the real name for a content name pattern.
+     *
+     * @param array<string, array<string, string>> $fieldMap
+     * @param array<string> $languageCodes
+     *
+     * @return array<string>
+     *
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
+     */
     public function resolve(string $nameSchema, ContentType $contentType, array $fieldMap, array $languageCodes): array;
 }

src/lib/Repository/ContentService.php

@@ -88,8 +88,7 @@ class ContentService implements ContentServiceInterface
     /** @var \Ibexa\Core\Repository\Helper\RelationProcessor */
     protected $relationProcessor;
 
-    /** @var \Ibexa\Core\Repository\Helper\NameSchemaService */
-    protected $nameSchemaService;
+    protected NameSchemaServiceInterface $nameSchemaService;
 
     /** @var \Ibexa\Core\FieldType\FieldTypeRegistry */
     protected $fieldTypeRegistry;

src/lib/Repository/NameSchema/NameSchemaService.php

@@ -51,8 +51,10 @@ class NameSchemaService implements NameSchemaServiceInterface
 
     protected FieldTypeRegistry $fieldTypeRegistry;
 
-    /** @var array */
-    protected $settings;
+    /**
+     * @param array{limit?: integer, sequence?: string} $settings
+     */
+    protected array $settings;
 
     private EventDispatcherInterface $eventDispatcher;
 

src/lib/Repository/Repository.php

@@ -150,12 +150,7 @@ class Repository implements RepositoryInterface
     /** @var \Ibexa\Core\FieldType\FieldTypeRegistry */
     private $fieldTypeRegistry;
 
-    /**
-     * Instance of name schema resolver service.
-     *
-     * @var \Ibexa\Core\Repository\Helper\NameSchemaService
-     */
-    protected $nameSchemaService;
+    protected NameSchemaServiceInterface $nameSchemaService;
 
     /**
      * Instance of relation processor service.
@@ -731,8 +726,6 @@ public function getPermissionResolver(): PermissionResolverInterface
     /**
      * @internal
      * @private
-     *
-     * @return \Ibexa\Contracts\Core\Repository\NameSchema\NameSchemaServiceInterface
      */
     public function getNameSchemaService(): NameSchemaServiceInterface
     {

src/lib/Repository/TrashService.php

@@ -51,8 +51,7 @@ class TrashService implements TrashServiceInterface
     /** @var array */
     protected $settings;
 
-    /** @var \Ibexa\Core\Repository\Helper\NameSchemaService */
-    protected $nameSchemaService;
+    protected NameSchemaServiceInterface $nameSchemaService;
 
     /** @var \Ibexa\Contracts\Core\Repository\PermissionCriterionResolver */
     private $permissionCriterionResolver;

src/lib/Repository/URLAliasService.php

@@ -34,8 +34,7 @@ class URLAliasService implements URLAliasServiceInterface
     /** @var \Ibexa\Contracts\Core\Persistence\Content\UrlAlias\Handler */
     protected $urlAliasHandler;
 
-    /** @var \Ibexa\Contracts\Core\Repository\NameSchema\NameSchemaServiceInterface */
-    protected $nameSchemaService;
+    protected NameSchemaServiceInterface $nameSchemaService;
 
     /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */
     private $permissionResolver;

tests/integration/Core/Repository/UserServiceTest.php

@@ -1331,7 +1331,7 @@ public function testCreateUserWithStrongPassword()
     }
 
     /**
-     * @covers  \Ibexa\Contracts\Core\Repository\UserService::loadUser()
+     * @covers \Ibexa\Contracts\Core\Repository\UserService::loadUser()
      *
      * @depends testCreateUser
      *

tests/lib/Repository/NameSchema/NameSchemaServiceTest.php

@@ -24,7 +24,7 @@
 /**
  * @covers \Ibexa\Core\Repository\NameSchema\NameSchemaService
  */
-class NameSchemaServiceTest extends BaseServiceMockTest
+final class NameSchemaServiceTest extends BaseServiceMockTest
 {
     private const NAME_SCHEMA = '<name_schema>';