Additional PHP8.1 hardening

Uses the same logic as already included in EncryptedText
madmatt · Oct 27, 2023 · e148e60 · e148e60
1 parent 0c1240a
commit e148e60
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/src/FieldType/EncryptedDatetime.php b/src/FieldType/EncryptedDatetime.php
@@ -42,6 +42,8 @@ public function setValue($value, $record = null, $markChanged = true)
 
     public function getDecryptedValue($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 {

diff --git a/src/FieldType/EncryptedDecimal.php b/src/FieldType/EncryptedDecimal.php
@@ -42,6 +42,8 @@ public function setValue($value, $record = null, $markChanged = true)
 
     public function getDecryptedValue($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 {

diff --git a/src/FieldType/EncryptedEnum.php b/src/FieldType/EncryptedEnum.php
@@ -43,6 +43,8 @@ public function setValue($value, $record = null, $markChanged = true)
 
     public function getDecryptedValue($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 {

diff --git a/src/FieldType/EncryptedInt.php b/src/FieldType/EncryptedInt.php
@@ -42,6 +42,8 @@ public function setValue($value, $record = null, $markChanged = true)
 
     public function getDecryptedValue($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 {

diff --git a/src/FieldType/EncryptedVarchar.php b/src/FieldType/EncryptedVarchar.php
@@ -42,6 +42,8 @@ public function setValue($value, $record = null, $markChanged = true)
 
     public function getDecryptedValue($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 {