Merge branch 'release-53.11.0'

oat-sa · Oct 23, 2023 · d47493d · d47493d
2 parents 2504540 + bf432c6
commit d47493d
Show file tree

Hide file tree

Showing 6 changed files with 344 additions and 558 deletions.
diff --git a/models/classes/Lists/Business/Contract/ValueCollectionRepositoryInterface.php b/models/classes/Lists/Business/Contract/ValueCollectionRepositoryInterface.php
@@ -34,13 +34,6 @@ public function findAll(ValueCollectionSearchRequest $searchRequest): ValueColle
 
     public function isApplicable(string $collectionUri): bool;
 
-    /**
-     * @param ValueCollection $valueCollection
-     *
-     * @return bool
-     *
-     * @throws ValueConflictException
-     */
     public function persist(ValueCollection $valueCollection): bool;
 
     public function delete(string $valueCollectionUri): void;

diff --git a/models/classes/Lists/Business/Domain/Value.php b/models/classes/Lists/Business/Domain/Value.php
@@ -25,11 +25,10 @@
 namespace oat\tao\model\Lists\Business\Domain;
 
 use tao_helpers_Uri;
-use JsonSerializable;
 
-class Value implements JsonSerializable
+class Value implements \JsonSerializable
 {
-    /** @var int|null */
+    /** @var string|int|null */
     private $id;
 
     /** @var string */
@@ -50,7 +49,7 @@ class Value implements JsonSerializable
     /** @var bool */
     private $hasChanges = false;
 
-    public function __construct(?int $id, string $uri, string $label, string $dependencyUri = null)
+    public function __construct($id, string $uri, string $label, string $dependencyUri = null)
     {
         $this->id = $id;
         $this->uri = $uri;
@@ -71,7 +70,7 @@ public function getListUri(): string
         return $this->listUri;
     }
 
-    public function getId(): ?int
+    public function getId()
     {
         return $this->id;
     }

diff --git a/models/classes/Lists/Business/Domain/ValueCollectionSearchRequest.php b/models/classes/Lists/Business/Domain/ValueCollectionSearchRequest.php
@@ -78,7 +78,7 @@ public function setPropertyUri(string $propertyUri): self
 
     public function hasValueCollectionUri(): bool
     {
-        return null !== $this->valueCollectionUri;
+        return !empty($this->valueCollectionUri);
     }
 
     public function getValueCollectionUri(): string
@@ -145,7 +145,9 @@ public function hasExcluded(): bool
 
     public function addExcluded(string $excluded): self
     {
-        $this->excluded[] = $excluded;
+        if (!empty($excluded)) {
+            $this->excluded[] = $excluded;
+        }
 
         return $this;
     }