Merge tag v2.7.0 into develop

Author: roadiz-ci

composer.json

@@ -33,7 +33,7 @@
     "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/AbstractDateTimed.php

@@ -11,13 +11,11 @@
  *
  * @deprecated since 2.6, use composition with DateTimedTrait instead.
  */
-#[
-    ORM\MappedSuperclass,
+#[ORM\MappedSuperclass,
     ORM\HasLifecycleCallbacks,
     ORM\Table,
     ORM\Index(columns: ['created_at']),
-    ORM\Index(columns: ['updated_at']),
-]
+    ORM\Index(columns: ['updated_at']),]
 abstract class AbstractDateTimed extends AbstractEntity implements DateTimedInterface
 {
     use DateTimedTrait;

src/Core/AbstractEntities/AbstractEntity.php

@@ -11,10 +11,8 @@
  *
  * @deprecated since 2.6, use composition with PersistableInterface and SequentialIdTrait or UuidTrait instead.
  */
-#[
-    ORM\MappedSuperclass,
-    ORM\Table
-]
+#[ORM\MappedSuperclass,
+    ORM\Table]
 abstract class AbstractEntity implements PersistableInterface
 {
     use SequentialIdTrait;

src/Core/AbstractEntities/AbstractHuman.php

@@ -16,11 +16,9 @@
  *
  * This class can be extended for *Users*, *Subscribers*, etc.
  */
-#[
-    ORM\MappedSuperclass,
+#[ORM\MappedSuperclass,
     ORM\Table,
-    ORM\HasLifecycleCallbacks
-]
+    ORM\HasLifecycleCallbacks]
 abstract class AbstractHuman implements DateTimedInterface, PersistableInterface
 {
     use SequentialIdTrait;
@@ -40,32 +38,24 @@ abstract class AbstractHuman implements DateTimedInterface, PersistableInterface
     /**
      * Public name (pseudonyme) that can be displayed to a public audience.
      */
-    #[
-        ORM\Column(name: 'publicName', type: 'string', length: 250, nullable: true),
+    #[ORM\Column(name: 'publicName', type: 'string', length: 250, nullable: true),
         Serializer\Groups(['user_public', 'human']),
-        Assert\Length(max: 250)
-    ]
+        Assert\Length(max: 250)]
     protected ?string $publicName = null;
 
-    #[
-        ORM\Column(name: 'firstName', type: 'string', length: 250, nullable: true),
+    #[ORM\Column(name: 'firstName', type: 'string', length: 250, nullable: true),
         Serializer\Groups(['user_personal', 'human']),
-        Assert\Length(max: 250)
-    ]
+        Assert\Length(max: 250)]
     protected ?string $firstName = null;
 
-    #[
-        ORM\Column(name: 'lastName', type: 'string', length: 250, nullable: true),
+    #[ORM\Column(name: 'lastName', type: 'string', length: 250, nullable: true),
         Serializer\Groups(['user_personal', 'human']),
-        Assert\Length(max: 250)
-    ]
+        Assert\Length(max: 250)]
     protected ?string $lastName = null;
 
-    #[
-        ORM\Column(type: 'string', length: 250, nullable: true),
+    #[ORM\Column(type: 'string', length: 250, nullable: true),
         Serializer\Groups(['user_personal', 'human']),
-        Assert\Length(max: 250)
-    ]
+        Assert\Length(max: 250)]
     protected ?string $company = null;
 
     public function getEmail(): ?string

src/Core/AbstractEntities/AbstractPositioned.php

@@ -12,19 +12,15 @@
  *
  * @deprecated since 2.6, use composition with PositionedTrait and PositionedInterface instead.
  */
-#[
-    ORM\MappedSuperclass,
+#[ORM\MappedSuperclass,
     ORM\HasLifecycleCallbacks,
     ORM\Table,
-    ORM\Index(columns: ['position'])
-]
+    ORM\Index(columns: ['position'])]
 abstract class AbstractPositioned extends AbstractEntity implements PositionedInterface
 {
     use PositionedTrait;
 
-    #[
-        ORM\Column(type: 'float'),
-        Serializer\Groups(['position']),
-    ]
+    #[ORM\Column(type: 'float'),
+        Serializer\Groups(['position']),]
     protected float $position = 0.0;
 }

src/Core/AbstractEntities/DateTimedTrait.php

@@ -9,16 +9,12 @@
 
 trait DateTimedTrait
 {
-    #[
-        ORM\Column(name: 'created_at', type: 'datetime', nullable: true),
-        Serializer\Groups(['timestamps']),
-    ]
+    #[ORM\Column(name: 'created_at', type: 'datetime', nullable: true),
+        Serializer\Groups(['timestamps']),]
     protected ?\DateTime $createdAt = null;
 
-    #[
-        ORM\Column(name: 'updated_at', type: 'datetime', nullable: true),
-        Serializer\Groups(['timestamps']),
-    ]
+    #[ORM\Column(name: 'updated_at', type: 'datetime', nullable: true),
+        Serializer\Groups(['timestamps']),]
     protected ?\DateTime $updatedAt = null;
 
     public function getCreatedAt(): ?\DateTime

src/Core/AbstractEntities/PositionedTrait.php

@@ -15,12 +15,10 @@
  */
 trait PositionedTrait
 {
-    #[
-        ORM\Column(type: 'float'),
+    #[ORM\Column(type: 'float'),
         Serializer\Groups(['position']),
         ApiFilter(RangeFilter::class),
-        ApiFilter(NumericFilter::class)
-    ]
+        ApiFilter(NumericFilter::class)]
     protected float $position = 0.0;
 
     public function getPosition(): float

src/Core/AbstractEntities/SequentialIdTrait.php

@@ -9,12 +9,10 @@
 
 trait SequentialIdTrait
 {
-    #[
-        ORM\Id,
+    #[ORM\Id,
         ORM\Column(type: 'integer'),
         ORM\GeneratedValue,
-        Serializer\Groups(['id'])
-    ]
+        Serializer\Groups(['id'])]
     protected ?int $id = null;
 
     public function getId(): ?int

src/Utils/StringHandler.php

@@ -145,9 +145,8 @@ public static function encodeWithSecret(?string $value, ?string $secret): string
             $secret = crypt($secret, $secret);
 
             return base64_encode($secret.base64_encode(strip_tags($value ?? '')));
-        } else {
-            throw new \InvalidArgumentException('You cannot encode with an empty salt. Did you enter a secret security phrase in your conf/config.json file?', 1);
         }
+        throw new \InvalidArgumentException('You cannot encode with an empty salt. Did you enter a secret security phrase in your conf/config.json file?', 1);
     }
 
     /**
@@ -169,9 +168,8 @@ public static function decodeWithSecret(?string $value, ?string $secret): string
             $nonSalted = str_replace($secret, '', $salted);
 
             return base64_decode($nonSalted);
-        } else {
-            throw new \InvalidArgumentException('You cannot encode with an empty salt. Did you enter a secret security phrase in your conf/config.json file?', 1);
         }
+        throw new \InvalidArgumentException('You cannot encode with an empty salt. Did you enter a secret security phrase in your conf/config.json file?', 1);
     }
 
     /**