Additional PHP8.1 hardening

src/FieldType/EncryptedDatetime.php

@@ -3,6 +3,7 @@
 namespace Madmatt\EncryptAtRest\FieldType;
 
 use Exception;
+use Madmatt\EncryptAtRest\Traits\EncryptedFieldGetValueTrait;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\ORM\DB;
 use SilverStripe\ORM\FieldType\DBDatetime;
@@ -17,6 +18,9 @@
  */
 class EncryptedDatetime extends DBDatetime
 {
+
+    use EncryptedFieldGetValueTrait;
+
     /**
      * @var AtRestCryptoService
      */
@@ -40,7 +44,7 @@ public function setValue($value, $record = null, $markChanged = true)
         }
     }
 
-    public function getDecryptedValue($value)
+    public function getDecryptedValue(string $value = '')
     {
         // Test if we're actually an encrypted value;
         if (ctype_xdigit($value) && strlen($value) > 130) {
@@ -54,11 +58,6 @@ public function getDecryptedValue($value)
         return $value;
     }
 
-    public function getValue()
-    {
-        return $this->getDecryptedValue($this->value); // TODO: Change the autogenerated stub
-    }
-
     public function requireField()
     {
         $values = array(

src/FieldType/EncryptedDecimal.php

@@ -3,6 +3,7 @@
 namespace Madmatt\EncryptAtRest\FieldType;
 
 use Exception;
+use Madmatt\EncryptAtRest\Traits\EncryptedFieldGetValueTrait;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\ORM\DB;
 use SilverStripe\ORM\FieldType\DBDecimal;
@@ -17,6 +18,8 @@
  */
 class EncryptedDecimal extends DBDecimal
 {
+    use EncryptedFieldGetValueTrait;
+
     /**
      * @var AtRestCryptoService
      */
@@ -40,7 +43,7 @@ public function setValue($value, $record = null, $markChanged = true)
         }
     }
 
-    public function getDecryptedValue($value)
+    public function getDecryptedValue(string $value = '')
     {
         // Test if we're actually an encrypted value;
         if (ctype_xdigit($value) && strlen($value) > 130) {
@@ -54,11 +57,6 @@ public function getDecryptedValue($value)
         return (float)$value;
     }
 
-    public function getValue()
-    {
-        return $this->getDecryptedValue($this->value); // TODO: Change the autogenerated stub
-    }
-
     public function requireField()
     {
         $values = array(

src/FieldType/EncryptedEnum.php

@@ -3,6 +3,7 @@
 namespace Madmatt\EncryptAtRest\FieldType;
 
 use Exception;
+use Madmatt\EncryptAtRest\Traits\EncryptedFieldGetValueTrait;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\ORM\DB;
 use SilverStripe\ORM\FieldType\DBEnum;
@@ -18,6 +19,8 @@
  */
 class EncryptedEnum extends DBEnum
 {
+    use EncryptedFieldGetValueTrait;
+
     /**
      * @var AtRestCryptoService
      */
@@ -41,7 +44,7 @@ public function setValue($value, $record = null, $markChanged = true)
         }
     }
 
-    public function getDecryptedValue($value)
+    public function getDecryptedValue(string $value = '')
     {
         // Test if we're actually an encrypted value;
         if (ctype_xdigit($value) && strlen($value) > 130) {
@@ -55,11 +58,6 @@ public function getDecryptedValue($value)
         return $value;
     }
 
-    public function getValue()
-    {
-        return $this->getDecryptedValue($this->value);
-    }
-
     public function requireField()
     {
         $values = array(

src/FieldType/EncryptedInt.php

@@ -3,6 +3,7 @@
 namespace Madmatt\EncryptAtRest\FieldType;
 
 use Exception;
+use Madmatt\EncryptAtRest\Traits\EncryptedFieldGetValueTrait;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\ORM\DB;
 use SilverStripe\ORM\FieldType\DBInt;
@@ -17,6 +18,8 @@
  */
 class EncryptedInt extends DBInt
 {
+    use EncryptedFieldGetValueTrait;
+
     /**
      * @var AtRestCryptoService
      */
@@ -40,7 +43,7 @@ public function setValue($value, $record = null, $markChanged = true)
         }
     }
 
-    public function getDecryptedValue($value)
+    public function getDecryptedValue(string $value = '')
     {
         // Test if we're actually an encrypted value;
         if (ctype_xdigit($value) && strlen($value) > 130) {
@@ -54,11 +57,6 @@ public function getDecryptedValue($value)
         return $value;
     }
 
-    public function getValue()
-    {
-        return $this->getDecryptedValue($this->value);
-    }
-
     public function requireField()
     {
         $values = array(

src/FieldType/EncryptedText.php

@@ -3,13 +3,16 @@
 namespace Madmatt\EncryptAtRest\FieldType;
 
 use Exception;
+use Madmatt\EncryptAtRest\Traits\EncryptedFieldGetValueTrait;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\ORM\DB;
 use SilverStripe\ORM\FieldType\DBText;
 use Madmatt\EncryptAtRest\AtRestCryptoService;
 
 class EncryptedText extends DBText
 {
+    use EncryptedFieldGetValueTrait;
+
     /**
      * @var AtRestCryptoService
      */
@@ -33,10 +36,8 @@ public function setValue($value, $record = null, $markChanged = true)
         }
     }
 
-    public function getDecryptedValue($value)
+    public function getDecryptedValue(string $value = '')
     {
-        // Type hardening for PHP 8.1+
-        $value = (string)$value;
         // Test if we're actually an encrypted value;
         if (ctype_xdigit($value) && strlen($value) > 130) {
             try {
@@ -49,11 +50,6 @@ public function getDecryptedValue($value)
         return $value;
     }
 
-    public function getValue()
-    {
-        return $this->getDecryptedValue($this->value); // TODO: Change the autogenerated stub
-    }
-
     public function requireField()
     {
         $values = array(

src/FieldType/EncryptedVarchar.php

@@ -3,10 +3,11 @@
 namespace Madmatt\EncryptAtRest\FieldType;
 
 use Exception;
+use Madmatt\EncryptAtRest\AtRestCryptoService;
+use Madmatt\EncryptAtRest\Traits\EncryptedFieldGetValueTrait;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\ORM\DB;
 use SilverStripe\ORM\FieldType\DBVarchar;
-use Madmatt\EncryptAtRest\AtRestCryptoService;
 
 /**
  * Class EncryptedVarchar
@@ -17,6 +18,9 @@
  */
 class EncryptedVarchar extends DBVarchar
 {
+
+    use EncryptedFieldGetValueTrait;
+
     /**
      * @var AtRestCryptoService
      */
@@ -40,7 +44,7 @@ public function setValue($value, $record = null, $markChanged = true)
         }
     }
 
-    public function getDecryptedValue($value)
+    public function getDecryptedValue(string $value = '')
     {
         // Test if we're actually an encrypted value;
         if (ctype_xdigit($value) && strlen($value) > 130) {
@@ -54,18 +58,13 @@ public function getDecryptedValue($value)
         return $value;
     }
 
-    public function getValue()
-    {
-        return $this->getDecryptedValue($this->value); // TODO: Change the autogenerated stub
-    }
-
     public function requireField()
     {
         $values = array(
-            'type'  => 'text',
+            'type' => 'text',
             'parts' => array(
-                'datatype'   => 'text',
-                'null'       => 'not null',
+                'datatype' => 'text',
+                'null' => 'not null',
                 'arrayValue' => $this->arrayValue
             )
         );

src/Traits/EncryptedFieldGetValueTrait.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Madmatt\EncryptAtRest\Traits;
+
+trait EncryptedFieldGetValueTrait
+{
+
+    public function getValue()
+    {
+        // Type hardening for PHP 8.1+
+        $value = (string)$this->value;
+
+        return $this->getDecryptedValue($value);
+    }
+
+}