Merge tag v2.4.0 into develop

roadiz · Dec 6, 2024 · 894c819 · 894c819
1 parent 5856f37
commit 894c819
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 33 deletions.
diff --git a/composer.json b/composer.json
@@ -52,8 +52,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.3.x-dev",
-            "dev-develop": "2.4.x-dev"
+            "dev-master": "2.4.x-dev",
+            "dev-develop": "2.5.x-dev"
         }
     }
 }
diff --git a/src/Core/AbstractEntities/AbstractField.php b/src/Core/AbstractEntities/AbstractField.php
@@ -382,7 +382,7 @@ public function getName(): string
     /**
      * @return $this
      */
-    public function setName(?string $name)
+    public function setName(?string $name): AbstractField
     {
         $this->name = StringHandler::variablize($name ?? '');
 
@@ -411,9 +411,9 @@ public function getLabel(): string
     }
 
     /**
-     * @return self
+     * @return $this
      */
-    public function setLabel(?string $label)
+    public function setLabel(?string $label): AbstractField
     {
         $this->label = $label ?? '';
 
@@ -426,9 +426,9 @@ public function getPlaceholder(): ?string
     }
 
     /**
-     * @return AbstractField
+     * @return $this
      */
-    public function setPlaceholder(?string $placeholder)
+    public function setPlaceholder(?string $placeholder): AbstractField
     {
         $this->placeholder = $placeholder;
 
@@ -443,7 +443,7 @@ public function getDescription(): ?string
     /**
      * @return $this
      */
-    public function setDescription(?string $description)
+    public function setDescription(?string $description): AbstractField
     {
         $this->description = $description;
 
@@ -458,7 +458,7 @@ public function getDefaultValues(): ?string
     /**
      * @return $this
      */
-    public function setDefaultValues(?string $defaultValues)
+    public function setDefaultValues(?string $defaultValues): AbstractField
     {
         $this->defaultValues = $defaultValues;
 
@@ -482,7 +482,7 @@ public function getType(): int
     /**
      * @return $this
      */
-    public function setType(int $type)
+    public function setType(int $type): AbstractField
     {
         $this->type = $type;
 
@@ -527,9 +527,9 @@ public function getGroupName(): ?string
      *
      * @param string|null $groupName the group name
      *
-     * @return static
+     * @return $this
      */
-    public function setGroupName(?string $groupName)
+    public function setGroupName(?string $groupName): AbstractField
     {
         if (null === $groupName) {
             $this->groupName = null;
@@ -553,9 +553,9 @@ public function isExpanded(): bool
     }
 
     /**
-     * @return AbstractField
+     * @return $this
      */
-    public function setExpanded(bool $expanded)
+    public function setExpanded(bool $expanded): AbstractField
     {
         $this->expanded = $expanded;
 

diff --git a/src/Core/AbstractEntities/AbstractHuman.php b/src/Core/AbstractEntities/AbstractHuman.php
@@ -98,7 +98,7 @@ public function getEmail(): ?string
     /**
      * @return $this
      */
-    public function setEmail(?string $email)
+    public function setEmail(?string $email): AbstractHuman
     {
         if (false !== filter_var($email ?? '', FILTER_VALIDATE_EMAIL)) {
             $this->email = $email;
@@ -115,7 +115,7 @@ public function getFirstName(): ?string
     /**
      * @return $this
      */
-    public function setFirstName(?string $firstName)
+    public function setFirstName(?string $firstName): AbstractHuman
     {
         $this->firstName = $firstName;
 
@@ -130,7 +130,7 @@ public function getLastName(): ?string
     /**
      * @return $this
      */
-    public function setLastName(?string $lastName)
+    public function setLastName(?string $lastName): AbstractHuman
     {
         $this->lastName = $lastName;
 
@@ -145,7 +145,7 @@ public function getCompany(): ?string
     /**
      * @return $this
      */
-    public function setCompany(?string $company)
+    public function setCompany(?string $company): AbstractHuman
     {
         $this->company = $company;
 
@@ -160,7 +160,7 @@ public function getJob(): ?string
     /**
      * @return $this
      */
-    public function setJob(?string $job)
+    public function setJob(?string $job): AbstractHuman
     {
         $this->job = $job;
 
@@ -175,7 +175,7 @@ public function getBirthday(): ?\DateTime
     /**
      * @return $this
      */
-    public function setBirthday(?\DateTime $birthday = null)
+    public function setBirthday(?\DateTime $birthday = null): AbstractHuman
     {
         $this->birthday = $birthday;
 
@@ -188,9 +188,9 @@ public function getPhone(): ?string
     }
 
     /**
-     * @return self
+     * @return $this
      */
-    public function setPhone(?string $phone)
+    public function setPhone(?string $phone): AbstractHuman
     {
         $this->phone = $phone;
 

diff --git a/src/Core/AbstractEntities/LeafTrait.php b/src/Core/AbstractEntities/LeafTrait.php
@@ -18,6 +18,9 @@ public function getChildren(): Collection
         return $this->children;
     }
 
+    /**
+     * @return $this
+     */
     public function setChildren(Collection $children): static
     {
         $this->children = $children;

diff --git a/src/Core/AbstractEntities/PositionedInterface.php b/src/Core/AbstractEntities/PositionedInterface.php
@@ -12,7 +12,7 @@ public function getPosition(): float;
      * Set position as a float to enable increment and decrement by O.5
      * to insert an entity between two others.
      *
-     * @return PositionedInterface
+     * @return $this
      */
-    public function setPosition(float $newPosition);
+    public function setPosition(float $newPosition): PositionedInterface;
 }
diff --git a/src/Core/AbstractEntities/PositionedTrait.php b/src/Core/AbstractEntities/PositionedTrait.php
@@ -14,13 +14,7 @@ public function getPosition(): float
         return $this->position;
     }
 
-    /**
-     * Set position as a float to enable increment and decrement by O.5
-     * to insert a node between two others.
-     *
-     * @return $this
-     */
-    public function setPosition(float $newPosition)
+    public function setPosition(float $newPosition): PositionedInterface
     {
         if ($newPosition > -1) {
             $this->position = $newPosition;

diff --git a/src/Core/Events/LeafEntityLifeCycleSubscriber.php b/src/Core/Events/LeafEntityLifeCycleSubscriber.php
@@ -12,9 +12,9 @@
 use RZ\Roadiz\Core\Handlers\HandlerFactoryInterface;
 
 #[AsDoctrineListener(event: Events::prePersist)]
-final class LeafEntityLifeCycleSubscriber
+final readonly class LeafEntityLifeCycleSubscriber
 {
-    public function __construct(private readonly HandlerFactoryInterface $handlerFactory)
+    public function __construct(private HandlerFactoryInterface $handlerFactory)
     {
     }