add boolean converter + tests

src/Client/RedisClient.php

@@ -280,6 +280,7 @@ public function search(string $prefixKey, array $search, array $orderBy, ?string
                     $criteria .= sprintf('@%s:%s', $property, $value);
                 }
             }
+
             $arguments[] = $criteria;
         }
 

src/Om/Converters/BooleanConverter.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Talleu\RedisOm\Om\Converters;
+
+class BooleanConverter implements ConverterInterface
+{
+    /**
+     * @param boolean|null $data
+     */
+    public function convert($data): ?string
+    {
+        if ($data === false) {
+            return 'false';
+        } elseif ($data === true) {
+            return 'true';
+        } else {
+            return null;
+        }
+    }
+
+    public function revert($data, string $type): ?bool
+    {
+        if ($data === 'false') {
+            return false;
+        } elseif ($data === 'true') {
+            return true;
+        } else {
+            return null;
+        }
+    }
+
+    public function supportsConversion(string $type, mixed $data): bool
+    {
+        return in_array($type, ['boolean', 'bool']);
+    }
+
+    public function supportsReversion(string $type, mixed $value): bool
+    {
+        return $type === 'bool';
+    }
+}

src/Om/Converters/HashModel/ConverterFactory.php

@@ -5,6 +5,7 @@
 namespace Talleu\RedisOm\Om\Converters\HashModel;
 
 use Talleu\RedisOm\Om\Converters\AbstractConverterFactory;
+use Talleu\RedisOm\Om\Converters\BooleanConverter;
 use Talleu\RedisOm\Om\Converters\ConverterInterface;
 use Talleu\RedisOm\Om\Converters\ScalarConverter;
 
@@ -20,6 +21,7 @@ protected static function getConvertersCollection(): array
             new ArrayConverter(),
             new StandardClassConverter(),
             new ScalarConverter(),
+            new BooleanConverter(),
             new NullConverter(),
             new DateTimeConverter(),
             new DateTimeImmutableConverter(),

src/Om/Converters/JsonModel/ConverterFactory.php

@@ -5,6 +5,7 @@
 namespace Talleu\RedisOm\Om\Converters\JsonModel;
 
 use Talleu\RedisOm\Om\Converters\AbstractConverterFactory;
+use Talleu\RedisOm\Om\Converters\BooleanConverter;
 use Talleu\RedisOm\Om\Converters\ConverterInterface;
 use Talleu\RedisOm\Om\Converters\ScalarConverter;
 
@@ -19,6 +20,7 @@ protected static function getConvertersCollection(): array
             new JsonObjectConverter(),
             new ArrayConverter(),
             new ScalarConverter(),
+            new BooleanConverter(),
             new StandardClassConverter(),
             new NullConverter(),
             new DateTimeConverter(),

src/Om/Converters/ScalarConverter.php

@@ -9,7 +9,7 @@ class ScalarConverter implements ConverterInterface
     /**
      * @param scalar $data
      */
-    public function convert($data): string
+    public function convert($data)
     {
         return (string) $data;
     }
@@ -18,8 +18,6 @@ public function revert($data, string $type)
     {
         if ($type === 'int') {
             return (int) $data;
-        } elseif ($type === 'bool') {
-            return (bool) $data;
         } elseif ($type === 'float') {
             return (float) $data;
         }
@@ -29,11 +27,11 @@ public function revert($data, string $type)
 
     public function supportsConversion(string $type, mixed $data): bool
     {
-        return in_array($type, ['int', 'string', 'double', 'boolean', 'integer', 'float', 'bool', 'null']);
+        return in_array($type, ['int', 'string', 'double', 'integer', 'float', 'null']);
     }
 
     public function supportsReversion(string $type, mixed $value): bool
     {
-        return in_array($type, ['int', 'string', 'float', 'bool']);
+        return in_array($type, ['int', 'string', 'float']);
     }
 }

src/Om/Repository/AbstractObjectRepository.php

@@ -38,7 +38,7 @@ abstract public function getPropertyValue($identifier, string $property): mixed;
     public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
     {
         $this->convertDates($criteria);
-        $this->escapeSpecialCharsInCriterias($criteria);
+        $this->convertSpecial($criteria);
         $data = $this->redisClient->search($this->prefix, $criteria, $orderBy ?? [], $this->format, $limit);
 
         $collection = [];
@@ -55,7 +55,7 @@ public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = nu
     public function findByLike(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
     {
         $this->convertDates($criteria);
-        $this->escapeSpecialCharsInCriterias($criteria);
+        $this->convertSpecial($criteria);
         foreach ($criteria as $property => $value) {
             $criteria[$property.'_text'] = "*$value*";
             unset($criteria[$property]);
@@ -100,7 +100,7 @@ public function findAll(): array
     public function findOneBy(array $criteria, ?array $orderBy = null): ?object
     {
         $this->convertDates($criteria);
-        $this->escapeSpecialCharsInCriterias($criteria);
+        $this->convertSpecial($criteria);
         $data = $this->redisClient->search($this->prefix, $criteria, $orderBy ?? [], $this->format, 1);
 
         if ($data === []) {
@@ -116,7 +116,7 @@ public function findOneBy(array $criteria, ?array $orderBy = null): ?object
     public function findOneByLike(array $criteria, ?array $orderBy = null): ?object
     {
         $this->convertDates($criteria);
-        $this->escapeSpecialCharsInCriterias($criteria);
+        $this->convertSpecial($criteria);
         foreach ($criteria as $property => $value) {
             $criteria[$property.'_text'] = "*$value*";
             unset($criteria[$property]);
@@ -184,9 +184,15 @@ public function setFormat(?string $format = null): void
         $this->format = $format ?? RedisFormat::HASH->value;
     }
 
-    protected function escapeSpecialCharsInCriterias(array|string &$criteria): void
+    protected function convertSpecial(array|string &$criteria): void
     {
         foreach ($criteria as $property => $value) {
+
+            if (is_bool($value)) {
+                $criteria[$property] = $value ? 'true' : 'false';
+                continue;
+            }
+
             if (!is_string($value)) {
                 continue;
             }

tests/Fixtures/AbstractDummy.php

@@ -33,7 +33,7 @@ abstract class AbstractDummy
     #[RedisOm\Property]
     public ?array $infos = [];
 
-    #[RedisOm\Property]
+    #[RedisOm\Property(index: true)]
     public ?bool $enabled = null;
 
     #[RedisOm\Property]

tests/Functionnal/Om/Repository/HashModel/HashBooleanRepositoryTest.php

@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Talleu\RedisOm\Tests\Functionnal\Om\Repository\HashModel;
+
+use Talleu\RedisOm\Om\RedisObjectManager;
+use Talleu\RedisOm\Tests\Fixtures\Hash\DummyHash;
+use Talleu\RedisOm\Tests\RedisAbstractTestCase;
+
+final class HashBooleanRepositoryTest extends RedisAbstractTestCase
+{
+    public function testFindByEnabled()
+    {
+        static::emptyRedis();
+        static::generateIndex();
+        static::loadRedisFixtures();
+
+        $objectManager = new RedisObjectManager();
+        $repository = $objectManager->getRepository(DummyHash::class);
+
+        $collection = $repository->findBy(['enabled' => true]);
+        foreach ($collection as $dummy) {
+            $this->assertInstanceOf(DummyHash::class, $dummy);
+            $this->assertTrue($dummy->enabled);
+        }
+    }
+
+    public function testFindOneByEnabled()
+    {
+        static::emptyRedis();
+        static::generateIndex();
+        static::loadRedisFixtures();
+
+        $objectManager = new RedisObjectManager();
+        $repository = $objectManager->getRepository(DummyHash::class);
+
+        $objet = $repository->findOneBy(['enabled' => true]);
+        $this->assertTrue($objet->enabled);
+    }
+
+    public function testFindByDisabled()
+    {
+        static::emptyRedis();
+        static::generateIndex();
+        static::loadRedisFixtures();
+
+        $objectManager = new RedisObjectManager();
+        $repository = $objectManager->getRepository(DummyHash::class);
+
+        $collection = $repository->findBy(['enabled' => false]);
+        foreach ($collection as $dummy) {
+            $this->assertInstanceOf(DummyHash::class, $dummy);
+            $this->assertFalse($dummy->enabled);
+        }
+    }
+
+    public function testFindOneByDisabled()
+    {
+        static::emptyRedis();
+        static::generateIndex();
+        static::loadRedisFixtures();
+
+        $objectManager = new RedisObjectManager();
+        $repository = $objectManager->getRepository(DummyHash::class);
+
+        $objet = $repository->findOneBy(['enabled' => false]);
+        $this->assertFalse($objet->enabled);
+    }
+}

tests/Functionnal/Om/Repository/JsonModel/JsonBooleanRepositoryTest.php

@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Talleu\RedisOm\Tests\Functionnal\Om\Repository\JsonModel;
+
+use Talleu\RedisOm\Om\RedisObjectManager;
+use Talleu\RedisOm\Tests\Fixtures\Json\DummyJson;
+use Talleu\RedisOm\Tests\RedisAbstractTestCase;
+
+final class JsonBooleanRepositoryTest extends RedisAbstractTestCase
+{
+    public function testFindByEnabled()
+    {
+        static::emptyRedis();
+        static::generateIndex();
+        static::loadRedisFixtures(DummyJson::class);
+
+        $objectManager = new RedisObjectManager();
+        $repository = $objectManager->getRepository(DummyJson::class);
+
+        $collection = $repository->findBy(['enabled' => true]);
+        foreach ($collection as $dummy) {
+            $this->assertInstanceOf(DummyJson::class, $dummy);
+            $this->assertTrue($dummy->enabled);
+        }
+    }
+
+    public function testFindOneByEnabled()
+    {
+        static::emptyRedis();
+        static::generateIndex();
+        static::loadRedisFixtures(DummyJson::class);
+
+        $objectManager = new RedisObjectManager();
+        $repository = $objectManager->getRepository(DummyJson::class);
+
+        $objet = $repository->findOneBy(['enabled' => true]);
+        $this->assertTrue($objet->enabled);
+    }
+
+    public function testFindByDisabled()
+    {
+        static::emptyRedis();
+        static::generateIndex();
+        static::loadRedisFixtures(DummyJson::class);
+
+        $objectManager = new RedisObjectManager();
+        $repository = $objectManager->getRepository(DummyJson::class);
+
+        $collection = $repository->findBy(['enabled' => false]);
+        foreach ($collection as $dummy) {
+            $this->assertInstanceOf(DummyJson::class, $dummy);
+            $this->assertFalse($dummy->enabled);
+        }
+    }
+
+    public function testFindOneByDisabled()
+    {
+        static::emptyRedis();
+        static::generateIndex();
+        static::loadRedisFixtures(DummyJson::class);
+
+        $objectManager = new RedisObjectManager();
+        $repository = $objectManager->getRepository(DummyJson::class);
+
+        $objet = $repository->findOneBy(['enabled' => false]);
+        $this->assertFalse($objet->enabled);
+    }
+}