feat: Node types

roadiz · Oct 15, 2022 · 6f4addc · 6f4addc
1 parent 377384a
commit 6f4addc
Show file tree

Hide file tree

Showing 9 changed files with 143 additions and 75 deletions.
diff --git a/Makefile b/Makefile
@@ -4,6 +4,7 @@ test:
 	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizCoreBundle/src
 	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizCompatBundle/src
 	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizRozierBundle/src
+	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizFontBundle/src
 	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizUserBundle/src
 	php -d "memory_limit=-1" vendor/bin/phpstan analyse -c phpstan.neon
 	php -d "memory_limit=-1" bin/console lint:twig ./lib

diff --git a/src/Entity/PositionedPageUser.php b/src/Entity/PositionedPageUser.php
@@ -4,6 +4,7 @@
 
 namespace App\Entity;
 
+use App\GeneratedEntity\NSPage;
 use Doctrine\ORM\Mapping as ORM;
 use RZ\Roadiz\Core\AbstractEntities\AbstractPositioned;
 use RZ\Roadiz\CoreBundle\Entity\NodesSources;
@@ -18,11 +19,11 @@
 class PositionedPageUser extends AbstractPositioned
 {
     /**
-     * @var NodesSources|null
+     * @var NSPage|null
      */
     #[ORM\ManyToOne(targetEntity: '\App\GeneratedEntity\NSPage', inversedBy: 'usersProxy')]
     #[ORM\JoinColumn(name: 'node_source_id', onDelete: 'CASCADE')]
-    private ?NodesSources $nodeSource;
+    private ?NSPage $nodeSource;
 
     /**
      * @var User|null
@@ -32,18 +33,18 @@ class PositionedPageUser extends AbstractPositioned
     private ?User $user;
 
     /**
-     * @return NodesSources|null
+     * @return NSPage|null
      */
-    public function getNodeSource(): ?NodesSources
+    public function getNodeSource(): ?NSPage
     {
         return $this->nodeSource;
     }
 
     /**
-     * @param NodesSources|null $nodeSource
+     * @param NSPage|null $nodeSource
      * @return PositionedPageUser
      */
-    public function setNodeSource(?NodesSources $nodeSource): PositionedPageUser
+    public function setNodeSource(?NSPage $nodeSource): PositionedPageUser
     {
         $this->nodeSource = $nodeSource;
         return $this;

diff --git a/src/GeneratedEntity/NSArticle.php b/src/GeneratedEntity/NSArticle.php
@@ -8,6 +8,7 @@
  */
 namespace App\GeneratedEntity;
 
+use Doctrine\Common\Collections\Collection;
 use JMS\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation as SymfonySerializer;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -36,7 +37,7 @@ class NSArticle extends \RZ\Roadiz\CoreBundle\Entity\NodesSources
         SymfonySerializer\Groups(["nodes_sources", "nodes_sources_default"]),
         SymfonySerializer\MaxDepth(2),
         Gedmo\Versioned,
-        ORM\Column(type: "text", nullable: true, name: "content"),
+        ORM\Column(name: "content", type: "text", nullable: true),
         Serializer\Groups(["nodes_sources", "nodes_sources_default"]),
         Serializer\MaxDepth(2),
         Serializer\Type("string")
@@ -56,7 +57,7 @@ public function getContent(): ?string
      *
      * @return $this
      */
-    public function setContent($content)
+    public function setContent(?string $content)
     {
         $this->content = null !== $content ?
             (string) $content :
@@ -75,9 +76,9 @@ public function setContent($content)
         SymfonySerializer\MaxDepth(2),
         Gedmo\Versioned,
         ORM\Column(
+            name: "realm_b_secret",
             type: "string",
             nullable: true,
-            name: "realm_b_secret",
             length: 250
         ),
         Serializer\Groups(["realm_b"]),
@@ -99,7 +100,7 @@ public function getRealmBSecret(): ?string
      *
      * @return $this
      */
-    public function setRealmBSecret($realmBSecret)
+    public function setRealmBSecret(?string $realmBSecret)
     {
         $this->realmBSecret = null !== $realmBSecret ?
             (string) $realmBSecret :
@@ -118,9 +119,9 @@ public function setRealmBSecret($realmBSecret)
         SymfonySerializer\MaxDepth(2),
         Gedmo\Versioned,
         ORM\Column(
+            name: "realm_a_secret",
             type: "string",
             nullable: true,
-            name: "realm_a_secret",
             length: 250
         ),
         Serializer\Groups(["realm_a"]),
@@ -142,7 +143,7 @@ public function getRealmASecret(): ?string
      *
      * @return $this
      */
-    public function setRealmASecret($realmASecret)
+    public function setRealmASecret(?string $realmASecret)
     {
         $this->realmASecret = null !== $realmASecret ?
             (string) $realmASecret :

diff --git a/src/GeneratedEntity/NSBasicBlock.php b/src/GeneratedEntity/NSBasicBlock.php
@@ -8,6 +8,7 @@
  */
 namespace App\GeneratedEntity;
 
+use Doctrine\Common\Collections\Collection;
 use JMS\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation as SymfonySerializer;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -36,7 +37,7 @@ class NSBasicBlock extends \RZ\Roadiz\CoreBundle\Entity\NodesSources
         SymfonySerializer\Groups(["nodes_sources", "nodes_sources_default"]),
         SymfonySerializer\MaxDepth(2),
         Gedmo\Versioned,
-        ORM\Column(type: "text", nullable: true, name: "content"),
+        ORM\Column(name: "content", type: "text", nullable: true),
         Serializer\Groups(["nodes_sources", "nodes_sources_default"]),
         Serializer\MaxDepth(2),
         Serializer\Type("string")
@@ -56,7 +57,7 @@ public function getContent(): ?string
      *
      * @return $this
      */
-    public function setContent($content)
+    public function setContent(?string $content)
     {
         $this->content = null !== $content ?
             (string) $content :
@@ -75,9 +76,9 @@ public function setContent($content)
         SymfonySerializer\MaxDepth(2),
         Gedmo\Versioned,
         ORM\Column(
+            name: "boolean_field",
             type: "boolean",
             nullable: false,
-            name: "boolean_field",
             options: ["default" => false]
         ),
         Serializer\Groups(["nodes_sources", "nodes_sources_default"]),
@@ -99,7 +100,7 @@ public function getBooleanField(): bool
      *
      * @return $this
      */
-    public function setBooleanField($booleanField)
+    public function setBooleanField(bool $booleanField)
     {
         $this->booleanField = $booleanField;
 

diff --git a/src/GeneratedEntity/NSGroupBlock.php b/src/GeneratedEntity/NSGroupBlock.php
@@ -8,6 +8,7 @@
  */
 namespace App\GeneratedEntity;
 
+use Doctrine\Common\Collections\Collection;
 use JMS\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation as SymfonySerializer;
 use Gedmo\Mapping\Annotation as Gedmo;

diff --git a/src/GeneratedEntity/NSNeutral.php b/src/GeneratedEntity/NSNeutral.php
@@ -8,6 +8,7 @@
  */
 namespace App\GeneratedEntity;
 
+use Doctrine\Common\Collections\Collection;
 use JMS\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation as SymfonySerializer;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -36,28 +37,31 @@ class NSNeutral extends \RZ\Roadiz\CoreBundle\Entity\NodesSources
         SymfonySerializer\SerializedName(serializedName: "number"),
         SymfonySerializer\Groups(["nodes_sources", "nodes_sources_default"]),
         SymfonySerializer\MaxDepth(2),
+        ApiFilter(OrmFilter\OrderFilter::class),
+        ApiFilter(OrmFilter\NumericFilter::class),
+        ApiFilter(OrmFilter\RangeFilter::class),
         Gedmo\Versioned,
-        ORM\Column(type: "integer", nullable: true, name: "number"),
+        ORM\Column(name: "number", type: "integer", nullable: true),
         Serializer\Groups(["nodes_sources", "nodes_sources_default"]),
         Serializer\MaxDepth(2),
         Serializer\Type("int")
     ]
-    private ?int $number = null;
+    private int|float|null $number = null;
 
     /**
-     * @return int|null
+     * @return int|float|null
      */
-    public function getNumber(): ?int
+    public function getNumber(): int|float|null
     {
         return $this->number;
     }
 
     /**
-     * @param int|null $number
+     * @param int|float|null $number
      *
      * @return $this
      */
-    public function setNumber($number)
+    public function setNumber(int|float|null $number)
     {
         $this->number = null !== $number ?
             (int) $number :

diff --git a/src/GeneratedEntity/NSOffer.php b/src/GeneratedEntity/NSOffer.php
@@ -8,6 +8,7 @@
  */
 namespace App\GeneratedEntity;
 
+use Doctrine\Common\Collections\Collection;
 use JMS\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation as SymfonySerializer;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -36,28 +37,31 @@ class NSOffer extends \RZ\Roadiz\CoreBundle\Entity\NodesSources
         SymfonySerializer\SerializedName(serializedName: "price"),
         SymfonySerializer\Groups(["nodes_sources", "nodes_sources_default"]),
         SymfonySerializer\MaxDepth(2),
+        ApiFilter(OrmFilter\OrderFilter::class),
+        ApiFilter(OrmFilter\NumericFilter::class),
+        ApiFilter(OrmFilter\RangeFilter::class),
         Gedmo\Versioned,
-        ORM\Column(type: "integer", nullable: true, name: "price"),
+        ORM\Column(name: "price", type: "integer", nullable: true),
         Serializer\Groups(["nodes_sources", "nodes_sources_default"]),
         Serializer\MaxDepth(2),
         Serializer\Type("int")
     ]
-    private ?int $price = null;
+    private int|float|null $price = null;
 
     /**
-     * @return int|null
+     * @return int|float|null
      */
-    public function getPrice(): ?int
+    public function getPrice(): int|float|null
     {
         return $this->price;
     }
 
     /**
-     * @param int|null $price
+     * @param int|float|null $price
      *
      * @return $this
      */
-    public function setPrice($price)
+    public function setPrice(int|float|null $price)
     {
         $this->price = null !== $price ?
             (int) $price :
@@ -76,32 +80,32 @@ public function setPrice($price)
         SymfonySerializer\MaxDepth(2),
         Gedmo\Versioned,
         ORM\Column(
+            name: "vat",
             type: "decimal",
             nullable: true,
-            name: "vat",
             precision: 18,
             scale: 3
         ),
         Serializer\Groups(["nodes_sources", "nodes_sources_default"]),
         Serializer\MaxDepth(2),
         Serializer\Type("double")
     ]
-    private $vat = null;
+    private int|float|null $vat = null;
 
     /**
-     * @return mixed
+     * @return int|float|null
      */
-    public function getVat()
+    public function getVat(): int|float|null
     {
         return $this->vat;
     }
 
     /**
-     * @param mixed $vat
+     * @param int|float|null $vat
      *
      * @return $this
      */
-    public function setVat($vat)
+    public function setVat(int|float|null $vat)
     {
         $this->vat = $vat;