fix: product entity

rem42 · May 16, 2024 · bba8d12 · bba8d12
1 parent d9b9af2
commit bba8d12
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/Entity/PrestashopProduct.php b/src/Entity/PrestashopProduct.php
@@ -29,8 +29,8 @@ final class PrestashopProduct
     public array $availableLater = [];
     public PrestashopAssociations $associations;
     public ?int $id = null;
-    public ?string $idManufacturer = null;
-    public ?string $idSupplier = null;
+    public null|int|string $idManufacturer = null;
+    public null|int|string $idSupplier = null;
     public ?int $idCategoryDefault = null;
     public ?string $new = null;
     public ?int $cacheDefaultAttribute = null;

diff --git a/src/Normalizer/PrestashopDeliveryPointNormalizer.php b/src/Normalizer/PrestashopDeliveryPointNormalizer.php
@@ -18,7 +18,7 @@ public function __construct(ObjectNormalizer $normalizer)
     /**
      * @param array<string, string> $context
      */
-    public function denormalize($data, string $type, string $format = null, array $context = [])
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
     {
         if (!\is_string($data)) {
             return $data;
@@ -30,7 +30,7 @@ public function denormalize($data, string $type, string $format = null, array $c
     /**
      * @param array<string, string> $context
      */
-    public function supportsDenormalization($data, string $type, string $format = null, array $context = []): bool
+    public function supportsDenormalization($data, string $type, ?string $format = null, array $context = []): bool
     {
         return PrestashopTntOfficielDeliveryPoint::class === $type;
     }

diff --git a/src/Normalizer/PrestashopItemNormalizer.php b/src/Normalizer/PrestashopItemNormalizer.php
@@ -12,7 +12,7 @@ class PrestashopItemNormalizer implements DenormalizerInterface
      *
      * @return PrestashopItem|array<PrestashopItem>
      */
-    public function denormalize($data, string $type, string $format = null, array $context = [])
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
     {
         if (!\is_string($data)) {
             return [];
@@ -24,7 +24,7 @@ public function denormalize($data, string $type, string $format = null, array $c
         return PrestashopItem::class === $type ? $prestashopItem : [$prestashopItem];
     }
 
-    public function supportsDenormalization($data, string $type, string $format = null): bool
+    public function supportsDenormalization($data, string $type, ?string $format = null): bool
     {
         return !\is_array($data)
             && (PrestashopItem::class === $type || PrestashopItem::class . '[]' === $type);

diff --git a/src/Request/PrestashopGetRequest.php b/src/Request/PrestashopGetRequest.php
@@ -43,7 +43,7 @@ public function setDisplay(string ...$display): self
         return $this;
     }
 
-    public function setLimit(?int $limit, int $offset = null): self
+    public function setLimit(?int $limit, ?int $offset = null): self
     {
         if ($offset) {
             $this->limit = $offset . ',' . $limit;

diff --git a/tests/Api/AbstractPrestashopApiTestCase.php b/tests/Api/AbstractPrestashopApiTestCase.php
@@ -16,7 +16,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        static::$fixturesDir = \dirname(__DIR__) . '/fixtures/';
+        static::$fixturesDir = __DIR__ . '/../fixtures/';
     }
 
     protected function fixturePath(string $filename): string