Doctrine types can work with nullable values now

onmoon · Feb 21, 2020 · 9c221b0 · 9c221b0
1 parent 80ad404
commit 9c221b0
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 12 deletions.
diff --git a/src/Type/BTCMoneyType.php b/src/Type/BTCMoneyType.php
@@ -35,19 +35,19 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla
      *
      * phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
      */
-    public function convertToPHPValue($value, AbstractPlatform $platform) : string
+    public function convertToPHPValue($value, AbstractPlatform $platform) : ?string
     {
-        return (string) bcmul((string) $value, '100000000', 0);
+        return $value !== null ? (string) bcmul((string) $value, '100000000', 0) : null;
     }
 
     /**
      * @param mixed $value
      *
      * phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
      */
-    public function convertToDatabaseValue($value, AbstractPlatform $platform) : string
+    public function convertToDatabaseValue($value, AbstractPlatform $platform) : ?string
     {
-        return (string) bcdiv((string) $value, '100000000', 8);
+        return $value !== null ? (string) bcdiv((string) $value, '100000000', 8) : null;
     }
 
     public function getName() : string

diff --git a/src/Type/GaapMoneyType.php b/src/Type/GaapMoneyType.php
@@ -35,19 +35,19 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla
      *
      * phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
      */
-    public function convertToPHPValue($value, AbstractPlatform $platform) : string
+    public function convertToPHPValue($value, AbstractPlatform $platform) : ?string
     {
-        return (string) bcmul((string) $value, '10000', 0);
+        return $value !== null ? (string) bcmul((string) $value, '10000', 0) : null;
     }
 
     /**
      * @param mixed $value
      *
      * phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
      */
-    public function convertToDatabaseValue($value, AbstractPlatform $platform) : string
+    public function convertToDatabaseValue($value, AbstractPlatform $platform) : ?string
     {
-        return (string) bcdiv((string) $value, '10000', 4);
+        return $value !== null ? (string) bcdiv((string) $value, '10000', 4) : null;
     }
 
     public function getName() : string

diff --git a/src/Type/MoneyType.php b/src/Type/MoneyType.php
@@ -35,19 +35,19 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla
      *
      * phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
      */
-    public function convertToPHPValue($value, AbstractPlatform $platform) : string
+    public function convertToPHPValue($value, AbstractPlatform $platform) : ?string
     {
-        return (string) bcmul((string) $value, '100', 0);
+        return $value !== null ? (string) bcmul((string) $value, '100', 0) : null;
     }
 
     /**
      * @param mixed $value
      *
      * phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
      */
-    public function convertToDatabaseValue($value, AbstractPlatform $platform) : string
+    public function convertToDatabaseValue($value, AbstractPlatform $platform) : ?string
     {
-        return (string) bcdiv((string) $value, '100', 2);
+        return $value !== null ? (string) bcdiv((string) $value, '100', 2) : null;
     }
 
     public function getName() : string

diff --git a/tests/Type/BTCMoneyTypeTest.php b/tests/Type/BTCMoneyTypeTest.php
@@ -75,6 +75,21 @@ public function testConvertToPHPValue() : void
         Assert::assertSame($expectedPhpValue, $phpValue);
     }
 
+    public function testConvertToNullPHPValue() : void
+    {
+        $expectedPhpValue = null;
+
+        $type = Type::getType(BTCMoneyType::TYPE_NAME);
+
+        $databaseValue = null;
+        /** @var AbstractPlatform&MockObject $platformMock */
+        $platformMock = $this->createMock(AbstractPlatform::class);
+
+        $phpValue = $type->convertToPHPValue($databaseValue, $platformMock);
+
+        Assert::assertSame($expectedPhpValue, $phpValue);
+    }
+
     public function testConvertToDatabaseValue() : void
     {
         $expectedDatabaseValue = '100.12345678';
@@ -90,6 +105,21 @@ public function testConvertToDatabaseValue() : void
         Assert::assertSame($expectedDatabaseValue, $phpValue);
     }
 
+    public function testConvertToNullDatabaseValue() : void
+    {
+        $expectedDatabaseValue = null;
+
+        $type = Type::getType(BTCMoneyType::TYPE_NAME);
+
+        $phpValue = null;
+        /** @var AbstractPlatform&MockObject $platformMock */
+        $platformMock = $this->createMock(AbstractPlatform::class);
+
+        $phpValue = $type->convertToDatabaseValue($phpValue, $platformMock);
+
+        Assert::assertSame($expectedDatabaseValue, $phpValue);
+    }
+
     public function testGetName() : void
     {
         $type = Type::getType(BTCMoneyType::TYPE_NAME);

diff --git a/tests/Type/GaapMoneyTypeTest.php b/tests/Type/GaapMoneyTypeTest.php
@@ -75,6 +75,21 @@ public function testConvertToPHPValue() : void
         Assert::assertSame($expectedPhpValue, $phpValue);
     }
 
+    public function testConvertToNullPHPValue() : void
+    {
+        $expectedPhpValue = null;
+
+        $type = Type::getType(GaapMoneyType::TYPE_NAME);
+
+        $databaseValue = null;
+        /** @var AbstractPlatform&MockObject $platformMock */
+        $platformMock = $this->createMock(AbstractPlatform::class);
+
+        $phpValue = $type->convertToPHPValue($databaseValue, $platformMock);
+
+        Assert::assertSame($expectedPhpValue, $phpValue);
+    }
+
     public function testConvertToDatabaseValue() : void
     {
         $expectedDatabaseValue = '100.1234';
@@ -90,6 +105,21 @@ public function testConvertToDatabaseValue() : void
         Assert::assertSame($expectedDatabaseValue, $phpValue);
     }
 
+    public function testConvertToNullDatabaseValue() : void
+    {
+        $expectedDatabaseValue = null;
+
+        $type = Type::getType(GaapMoneyType::TYPE_NAME);
+
+        $phpValue = null;
+        /** @var AbstractPlatform&MockObject $platformMock */
+        $platformMock = $this->createMock(AbstractPlatform::class);
+
+        $phpValue = $type->convertToDatabaseValue($phpValue, $platformMock);
+
+        Assert::assertSame($expectedDatabaseValue, $phpValue);
+    }
+
     public function testGetName() : void
     {
         $type = Type::getType(GaapMoneyType::TYPE_NAME);

diff --git a/tests/Type/MoneyTypeTest.php b/tests/Type/MoneyTypeTest.php
@@ -75,6 +75,21 @@ public function testConvertToPHPValue() : void
         Assert::assertSame($expectedPhpValue, $phpValue);
     }
 
+    public function testConvertToNullPHPValue() : void
+    {
+        $expectedPhpValue = null;
+
+        $type = Type::getType(MoneyType::TYPE_NAME);
+
+        $databaseValue = null;
+        /** @var AbstractPlatform&MockObject $platformMock */
+        $platformMock = $this->createMock(AbstractPlatform::class);
+
+        $phpValue = $type->convertToPHPValue($databaseValue, $platformMock);
+
+        Assert::assertSame($expectedPhpValue, $phpValue);
+    }
+
     public function testConvertToDatabaseValue() : void
     {
         $expectedDatabaseValue = '100.12';
@@ -90,6 +105,21 @@ public function testConvertToDatabaseValue() : void
         Assert::assertSame($expectedDatabaseValue, $phpValue);
     }
 
+    public function testConvertToNullDatabaseValue() : void
+    {
+        $expectedDatabaseValue = null;
+
+        $type = Type::getType(MoneyType::TYPE_NAME);
+
+        $phpValue = null;
+        /** @var AbstractPlatform&MockObject $platformMock */
+        $platformMock = $this->createMock(AbstractPlatform::class);
+
+        $phpValue = $type->convertToDatabaseValue($phpValue, $platformMock);
+
+        Assert::assertSame($expectedDatabaseValue, $phpValue);
+    }
+
     public function testGetName() : void
     {
         $type = Type::getType(MoneyType::TYPE_NAME);