Merge branch hotfix/v2.7.18

Author: roadiz-ci

composer.json

@@ -22,18 +22,18 @@
         "doctrine/orm": "~2.20.0",
         "api-platform/doctrine-orm": "^4.1.18",
         "api-platform/metadata": "^4.1.18",
-        "roadiz/nodetype-contracts": "^3.0.0",
-        "symfony/string": "7.3.*",
+        "roadiz/nodetype-contracts": "^3.1.1",
+        "symfony/string": "7.4.*",
         "symfony/translation-contracts": "^3.0",
-        "symfony/http-foundation": "7.3.*",
-        "symfony/serializer": "7.3.*",
-        "symfony/uid": "7.3.*",
-        "symfony/validator": "7.3.*"
+        "symfony/http-foundation": "7.4.*",
+        "symfony/serializer": "7.4.*",
+        "symfony/uid": "7.4.*",
+        "symfony/validator": "7.4.*"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^2.8.1",
         "php-coveralls/php-coveralls": "^2.4",
-        "phpstan/phpstan": "^1.5.3",
+        "phpstan/phpstan": "^2.1.36",
         "phpstan/phpdoc-parser": "<2",
         "phpunit/phpunit": "^9.6"
     },
@@ -55,8 +55,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.6.x-dev",
-            "dev-develop": "2.7.x-dev"
+            "dev-master": "2.7.x-dev",
+            "dev-develop": "2.8.x-dev"
         }
     }
 }

src/Core/AbstractEntities/DateTimedInterface.php

@@ -11,12 +11,12 @@ public function getCreatedAt(): ?\DateTime;
     /**
      * @return $this
      */
-    public function setCreatedAt(?\DateTime $createdAt): self;
+    public function setCreatedAt(?\DateTime $createdAt): static;
 
     public function getUpdatedAt(): ?\DateTime;
 
     /**
      * @return $this
      */
-    public function setUpdatedAt(?\DateTime $updatedAt): self;
+    public function setUpdatedAt(?\DateTime $updatedAt): static;
 }

src/Core/AbstractEntities/DateTimedTrait.php

@@ -25,7 +25,7 @@ public function getCreatedAt(): ?\DateTime
     /**
      * @return $this
      */
-    public function setCreatedAt(?\DateTime $createdAt): self
+    public function setCreatedAt(?\DateTime $createdAt): static
     {
         $this->createdAt = $createdAt;
 
@@ -40,7 +40,7 @@ public function getUpdatedAt(): ?\DateTime
     /**
      * @return $this
      */
-    public function setUpdatedAt(?\DateTime $updatedAt): self
+    public function setUpdatedAt(?\DateTime $updatedAt): static
     {
         $this->updatedAt = $updatedAt;
 
@@ -71,7 +71,7 @@ public function prePersist(): void
      *
      * @return $this
      */
-    public function resetDates(): self
+    public function resetDates(): static
     {
         $this->setCreatedAt(new \DateTime('now'));
         $this->setUpdatedAt(new \DateTime('now'));

src/Core/AbstractEntities/LeafInterface.php

@@ -6,19 +6,25 @@
 
 use Doctrine\Common\Collections\Collection;
 
+/**
+ * @template TSelf of LeafInterface
+ */
 interface LeafInterface extends PositionedInterface
 {
+    /**
+     * @return Collection<int, TSelf>
+     */
     public function getChildren(): Collection;
 
     /**
-     * @param static $child
+     * @param TSelf $child
      *
      * @return $this
      */
     public function addChild(LeafInterface $child): static;
 
     /**
-     * @param static $child
+     * @param TSelf $child
      *
      * @return $this
      */
@@ -27,16 +33,18 @@ public function removeChild(LeafInterface $child): static;
     /**
      * Do not add static return type because of Doctrine Proxy.
      *
-     * @return static|null
+     * @return TSelf|null
      */
     public function getParent(): ?LeafInterface;
 
     /**
-     * @return static[]
+     * @return TSelf[]
      */
     public function getParents(): array;
 
     /**
+     * @param TSelf|null $parent
+     *
      * @return $this
      */
     public function setParent(?LeafInterface $parent = null): static;

src/Core/AbstractEntities/LeafTrait.php

@@ -61,12 +61,8 @@ public function removeChild(LeafInterface $child): static
     /*
      * Do not add static return type because of Doctrine Proxy.
      */
-    /**
-     * @return static|null
-     */
     public function getParent(): ?LeafInterface
     {
-        /* @phpstan-ignore-next-line */
         return $this->parent;
     }
 

src/Core/AbstractEntities/PositionedInterface.php

@@ -14,6 +14,8 @@ public function getPosition(): float;
      * Set position as a float to enable increment and decrement by O.5
      * to insert an entity between two others.
      *
+     * Do not add static return type because of Doctrine Proxy.
+     *
      * @return $this
      */
     public function setPosition(float $newPosition): PositionedInterface;

src/Core/AbstractEntities/UuidTrait.php

@@ -27,7 +27,7 @@ public function getId(): ?Uuid
     /**
      * @return $this
      */
-    public function setId(?Uuid $id): self
+    public function setId(?Uuid $id): static
     {
         $this->id = $id;