chore: Bumped

roadiz · Jun 13, 2024 · bfe8344 · bfe8344
1 parent 0dd6669
commit bfe8344
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 37 deletions.
diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml
@@ -19,7 +19,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.0', '8.1']
+                php-version: ['8.1', '8.2', '8.3']
         steps:
             - uses: shivammathur/setup-php@v2
               with:

diff --git a/.travis.yml b/.travis.yml
diff --git a/composer.json b/composer.json
@@ -18,8 +18,8 @@
         }
     ],
     "require": {
-        "php": ">=8.0",
-        "doctrine/orm": "<2.17",
+        "php": ">=8.1",
+        "doctrine/orm": "~2.17.0",
         "jms/serializer": "^3.9.0",
         "symfony/string": "5.4.*",
         "symfony/translation-contracts": "^2.3",
@@ -35,7 +35,7 @@
     },
     "autoload": {
         "psr-4": {
-            "RZ\\": "src/"
+            "RZ\\Roadiz\\": "src/"
         }
     },
     "config": {
@@ -46,8 +46,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1.x-dev",
-            "dev-develop": "2.2.x-dev"
+            "dev-master": "2.2.x-dev",
+            "dev-develop": "2.3.x-dev"
         }
     }
 }
diff --git a/src/Roadiz/Bag/LazyParameterBag.php → src/Bag/LazyParameterBag.php b/src/Roadiz/Bag/LazyParameterBag.php → src/Bag/LazyParameterBag.php
diff --git a/...re/AbstractEntities/AbstractDateTimed.php → ...re/AbstractEntities/AbstractDateTimed.php b/...re/AbstractEntities/AbstractDateTimed.php → ...re/AbstractEntities/AbstractDateTimed.php
diff --git a/...tEntities/AbstractDateTimedPositioned.php → ...tEntities/AbstractDateTimedPositioned.php b/...tEntities/AbstractDateTimedPositioned.php → ...tEntities/AbstractDateTimedPositioned.php
@@ -4,10 +4,13 @@
 
 namespace RZ\Roadiz\Core\AbstractEntities;
 
+use ApiPlatform\Doctrine\Orm\Filter\NumericFilter;
+use ApiPlatform\Metadata\ApiFilter;
 use Doctrine\Common\Comparable;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation as SymfonySerializer;
+use ApiPlatform\Doctrine\Orm\Filter\RangeFilter;
 
 /**
  * Combined AbstractDateTimed and PositionedTrait.
@@ -28,7 +31,9 @@ abstract class AbstractDateTimedPositioned extends AbstractDateTimed implements
         ORM\Column(type: "float"),
         Serializer\Groups(["position"]),
         Serializer\Type("float"),
-        SymfonySerializer\Groups(["position"])
+        SymfonySerializer\Groups(["position"]),
+        ApiFilter(RangeFilter::class),
+        ApiFilter(NumericFilter::class)
     ]
     protected float $position = 0.0;
 }
diff --git a/.../Core/AbstractEntities/AbstractEntity.php → src/Core/AbstractEntities/AbstractEntity.php b/.../Core/AbstractEntities/AbstractEntity.php → src/Core/AbstractEntities/AbstractEntity.php
diff --git a/...z/Core/AbstractEntities/AbstractField.php → src/Core/AbstractEntities/AbstractField.php b/...z/Core/AbstractEntities/AbstractField.php → src/Core/AbstractEntities/AbstractField.php
@@ -255,7 +255,7 @@ abstract class AbstractField extends AbstractPositioned
     ];
 
     #[
-        ORM\Column(name: "group_name", type: "string", nullable: true),
+        ORM\Column(name: "group_name", type: "string", length: 250, nullable: true),
         Assert\Length(max: 250),
         SymfonySerializer\Groups(["node_type", "setting"]),
         Serializer\Groups(["node_type", "setting"]),
@@ -265,7 +265,7 @@ abstract class AbstractField extends AbstractPositioned
     protected ?string $groupName = null;
 
     #[
-        ORM\Column(name: "group_name_canonical", type: "string", nullable: true),
+        ORM\Column(name: "group_name_canonical", type: "string", length: 250, nullable: true),
         Serializer\Groups(["node_type", "setting"]),
         SymfonySerializer\Groups(["node_type", "setting"]),
         Assert\Length(max: 250),
@@ -275,7 +275,7 @@ abstract class AbstractField extends AbstractPositioned
     protected ?string $groupNameCanonical = null;
 
     #[
-        ORM\Column(type: "string"),
+        ORM\Column(type: "string", length: 250),
         Serializer\Expose,
         Serializer\Groups(["node_type", "setting"]),
         SymfonySerializer\Groups(["node_type", "setting"]),
@@ -287,7 +287,7 @@ abstract class AbstractField extends AbstractPositioned
     protected string $name;
 
     #[
-        ORM\Column(type: "string"),
+        ORM\Column(type: "string", length: 250),
         Serializer\Expose,
         Serializer\Groups(["node_type", "setting"]),
         Serializer\Type("string"),
@@ -299,7 +299,7 @@ abstract class AbstractField extends AbstractPositioned
     protected ?string $label;
 
     #[
-        ORM\Column(type: "string", nullable: true),
+        ORM\Column(type: "string", length: 250, nullable: true),
         Serializer\Expose,
         Serializer\Groups(["node_type", "setting"]),
         SymfonySerializer\Groups(["node_type", "setting"]),

diff --git a/...z/Core/AbstractEntities/AbstractHuman.php → src/Core/AbstractEntities/AbstractHuman.php b/...z/Core/AbstractEntities/AbstractHuman.php → src/Core/AbstractEntities/AbstractHuman.php
@@ -23,7 +23,7 @@
 abstract class AbstractHuman extends AbstractDateTimed
 {
     #[
-        ORM\Column(type: "string", unique: true),
+        ORM\Column(type: "string", length: 200, unique: true),
         Serializer\Groups(["user_personal", "human"]),
         SymfonySerializer\Groups(["user_personal", "human"]),
         Assert\NotNull(),
@@ -37,47 +37,47 @@ abstract class AbstractHuman extends AbstractDateTimed
      * Public name (pseudonyme) that can be displayed to a public audience.
      */
     #[
-        ORM\Column(name: "publicName", type: "string", nullable: true),
+        ORM\Column(name: "publicName", type: "string", length: 250, nullable: true),
         Serializer\Groups(["user_public", "human"]),
         SymfonySerializer\Groups(["user_public", "human"]),
         Assert\Length(max: 250)
     ]
     protected ?string $publicName = null;
 
     #[
-        ORM\Column(name: "firstName", type: "string", nullable: true),
+        ORM\Column(name: "firstName", type: "string", length: 250, nullable: true),
         Serializer\Groups(["user_personal", "human"]),
         SymfonySerializer\Groups(["user_personal", "human"]),
         Assert\Length(max: 250)
     ]
     protected ?string $firstName = null;
 
     #[
-        ORM\Column(name: "lastName", type: "string", nullable: true),
+        ORM\Column(name: "lastName", type: "string", length: 250, nullable: true),
         Serializer\Groups(["user_personal", "human"]),
         SymfonySerializer\Groups(["user_personal", "human"]),
         Assert\Length(max: 250)
     ]
     protected ?string $lastName = null;
 
     #[
-        ORM\Column(type: "string", nullable: true),
+        ORM\Column(type: "string", length: 50, nullable: true),
         Serializer\Groups(["user_personal", "human"]),
         SymfonySerializer\Groups(["user_personal", "human"]),
-        Assert\Length(max: 20)
+        Assert\Length(max: 50)
     ]
     protected ?string $phone = null;
 
     #[
-        ORM\Column(type: "string", nullable: true),
+        ORM\Column(type: "string", length: 250, nullable: true),
         Serializer\Groups(["user_personal", "human"]),
         SymfonySerializer\Groups(["user_personal", "human"]),
         Assert\Length(max: 250)
     ]
     protected ?string $company = null;
 
     #[
-        ORM\Column(type: "string", nullable: true),
+        ORM\Column(type: "string", length: 250, nullable: true),
         Serializer\Groups(["user_personal", "human"]),
         SymfonySerializer\Groups(["user_personal", "human"]),
         Assert\Length(max: 250)

diff --git a/...e/AbstractEntities/AbstractPositioned.php → ...e/AbstractEntities/AbstractPositioned.php b/...e/AbstractEntities/AbstractPositioned.php → ...e/AbstractEntities/AbstractPositioned.php
diff --git a/...z/Core/AbstractEntities/LeafInterface.php → src/Core/AbstractEntities/LeafInterface.php b/...z/Core/AbstractEntities/LeafInterface.php → src/Core/AbstractEntities/LeafInterface.php
diff --git a/...oadiz/Core/AbstractEntities/LeafTrait.php → src/Core/AbstractEntities/LeafTrait.php b/...oadiz/Core/AbstractEntities/LeafTrait.php → src/Core/AbstractEntities/LeafTrait.php
diff --git a/...AbstractEntities/PersistableInterface.php → ...AbstractEntities/PersistableInterface.php b/...AbstractEntities/PersistableInterface.php → ...AbstractEntities/PersistableInterface.php
diff --git a/.../AbstractEntities/PositionedInterface.php → .../AbstractEntities/PositionedInterface.php b/.../AbstractEntities/PositionedInterface.php → .../AbstractEntities/PositionedInterface.php
diff --git a/...Core/AbstractEntities/PositionedTrait.php → ...Core/AbstractEntities/PositionedTrait.php b/...Core/AbstractEntities/PositionedTrait.php → ...Core/AbstractEntities/PositionedTrait.php
diff --git a/...AbstractEntities/TranslationInterface.php → ...AbstractEntities/TranslationInterface.php b/...AbstractEntities/TranslationInterface.php → ...AbstractEntities/TranslationInterface.php
diff --git a/.../Events/LeafEntityLifeCycleSubscriber.php → .../Events/LeafEntityLifeCycleSubscriber.php b/.../Events/LeafEntityLifeCycleSubscriber.php → .../Events/LeafEntityLifeCycleSubscriber.php
diff --git a/src/Roadiz/Core/Handlers/AbstractHandler.php → src/Core/Handlers/AbstractHandler.php b/src/Roadiz/Core/Handlers/AbstractHandler.php → src/Core/Handlers/AbstractHandler.php
diff --git a/...Core/Handlers/HandlerFactoryInterface.php → ...Core/Handlers/HandlerFactoryInterface.php b/...Core/Handlers/HandlerFactoryInterface.php → ...Core/Handlers/HandlerFactoryInterface.php
diff --git a/src/Roadiz/Utils/StringHandler.php → src/Utils/StringHandler.php b/src/Roadiz/Utils/StringHandler.php → src/Utils/StringHandler.php