ibexa · alongosz · Jun 18, 2025 · Jun 17, 2025 · Jun 17, 2025 · Jun 17, 2025
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -20820,12 +20820,6 @@ parameters:
 			count: 1
 			path: src/lib/Repository/Values/ContentType/ContentType.php
 
-		-
-			message: '#^Method Ibexa\\Core\\Repository\\Values\\ContentType\\ContentType\:\:getName\(\) should return string\|null but returns string\|false\.$#'
-			identifier: return.type
-			count: 1
-			path: src/lib/Repository/Values/ContentType/ContentType.php
-
 		-
 			message: '#^Method Ibexa\\Core\\Repository\\Values\\ContentType\\ContentTypeDraft\:\:getProperties\(\) has parameter \$dynamicProperties with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
@@ -20850,12 +20844,6 @@ parameters:
 			count: 1
 			path: src/lib/Repository/Values/ContentType/ContentTypeGroup.php
 
-		-
-			message: '#^Method Ibexa\\Core\\Repository\\Values\\ContentType\\ContentTypeGroup\:\:getName\(\) should return string\|null but returns string\|false\.$#'
-			identifier: return.type
-			count: 1
-			path: src/lib/Repository/Values/ContentType/ContentTypeGroup.php
-
 		-
 			message: '#^Class Ibexa\\Core\\Repository\\Values\\ContentType\\FieldDefinition has PHPDoc tag @property\-read for property \$fieldSettings with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
@@ -20880,12 +20868,6 @@ parameters:
 			count: 1
 			path: src/lib/Repository/Values/ContentType/FieldDefinition.php
 
-		-
-			message: '#^Method Ibexa\\Core\\Repository\\Values\\ContentType\\FieldDefinition\:\:getName\(\) should return string\|null but returns string\|false\.$#'
-			identifier: return.type
-			count: 1
-			path: src/lib/Repository/Values/ContentType/FieldDefinition.php
-
 		-
 			message: '#^Method Ibexa\\Core\\Repository\\Values\\ContentType\\FieldDefinition\:\:getValidatorConfiguration\(\) return type has no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
@@ -20964,24 +20946,12 @@ parameters:
 			count: 1
 			path: src/lib/Repository/Values/ObjectState/ObjectState.php
 
-		-
-			message: '#^Method Ibexa\\Core\\Repository\\Values\\ObjectState\\ObjectState\:\:getName\(\) should return string\|null but returns string\|false\.$#'
-			identifier: return.type
-			count: 1
-			path: src/lib/Repository/Values/ObjectState/ObjectState.php
-
 		-
 			message: '#^Method Ibexa\\Core\\Repository\\Values\\ObjectState\\ObjectStateGroup\:\:getDescription\(\) should return string\|null but returns string\|false\.$#'
 			identifier: return.type
 			count: 1
 			path: src/lib/Repository/Values/ObjectState/ObjectStateGroup.php
 
-		-
-			message: '#^Method Ibexa\\Core\\Repository\\Values\\ObjectState\\ObjectStateGroup\:\:getName\(\) should return string\|null but returns string\|false\.$#'
-			identifier: return.type
-			count: 1
-			path: src/lib/Repository/Values/ObjectState/ObjectStateGroup.php
-
 		-
 			message: '#^Property Ibexa\\Core\\Repository\\Values\\User\\PolicyDraft\:\:\$draftProperties type has no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue

diff --git a/src/contracts/Repository/Values/MultiLanguageName.php b/src/contracts/Repository/Values/MultiLanguageName.php
@@ -13,22 +13,20 @@
  * Provides a uniform way for API consuming logic to generate translated names / labels
  * for API objects.
  * Language logic is meant to also be used for description, fields, ... lookup as well.
- *
- * @todo Move to API, Repository is not a SPI concept.
  */
 interface MultiLanguageName
 {
     /**
-     * Return the human readable name in all provided languages.
+     * Return the human-readable name in all provided languages.
      *
      * The structure of the return value is:
-     * <code>
-     * array( 'eng' => '<name_eng>', 'de' => '<name_de>' );
-     * </code>
+     * ```
+     * ['eng' => '<name_eng>', 'de' => '<name_de>']
+     * ```
      *
      * @return string[]
      */
-    public function getNames();
+    public function getNames(): array;
 
     /**
      * Return the name of the domain object in a given language.
@@ -40,10 +38,8 @@ public function getNames();
      *      2. Main language if object is $alwaysAvailable
      *      3. Fallback to return in initial (version objects) or main language
      *
-     * @param string|null $languageCode
-     *
      * @return string|null The name for a given language, or null if $languageCode is not set
      *         or does not exist.
      */
-    public function getName($languageCode = null);
+    public function getName(?string $languageCode = null): ?string;
 }
diff --git a/src/lib/Repository/Values/Content/VersionInfo.php b/src/lib/Repository/Values/Content/VersionInfo.php
@@ -93,15 +93,15 @@ public function getLanguages(): iterable
     /**
      * {@inheritdoc}
      */
-    public function getNames()
+    public function getNames(): array
     {
         return $this->names;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getName($languageCode = null)
+    public function getName(?string $languageCode = null): ?string
     {
         if ($languageCode) {
             return isset($this->names[$languageCode]) ? $this->names[$languageCode] : null;

diff --git a/src/lib/Repository/Values/ContentType/ContentTypeDraft.php b/src/lib/Repository/Values/ContentType/ContentTypeDraft.php
@@ -84,15 +84,15 @@ public function __isset($property)
     /**
      * {@inheritdoc}
      */
-    public function getNames()
+    public function getNames(): array
     {
         return $this->innerContentType->getNames();
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getName($languageCode = null)
+    public function getName(?string $languageCode = null): ?string
     {
         return $this->innerContentType->getName($languageCode);
     }

diff --git a/src/lib/Repository/Values/MultiLanguageNameTrait.php b/src/lib/Repository/Values/MultiLanguageNameTrait.php
@@ -4,6 +4,7 @@
  * @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\Core\Repository\Values;
 
@@ -17,23 +18,17 @@ trait MultiLanguageNameTrait
      *
      * @var string[]
      */
-    protected $names = [];
+    protected array $names = [];
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getNames()
+    public function getNames(): array
     {
         return $this->names;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getName($languageCode = null)
+    public function getName(?string $languageCode = null): ?string
     {
         if (!empty($languageCode)) {
-            return isset($this->names[$languageCode]) ? $this->names[$languageCode] : null;
+            return $this->names[$languageCode] ?? null;
         }
 
         foreach ($this->prioritizedLanguages as $prioritizedLanguageCode) {
@@ -42,8 +37,10 @@ public function getName($languageCode = null)
             }
         }
 
-        return isset($this->names[$this->mainLanguageCode])
-            ? $this->names[$this->mainLanguageCode]
-            : reset($this->names);
+        if (isset($this->mainLanguageCode, $this->names[$this->mainLanguageCode])) {
+              return $this->names[$this->mainLanguageCode];
+        }
+
+        return $this->names[array_key_first($this->names)] ?? null;
     }
 }