Additional PHP8.1 hardening

scott-nz · scott-nz · commit e148e601922c · 2023-10-27T16:07:23.000+13:00
Uses the same logic as already included in EncryptedText
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 {

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ public function setValue($value, $record = null, $markChanged = true)`
`42`	`42`
`43`	`43`	`public function getDecryptedValue($value)`
`44`	`44`	`{`
	`45`	`+ // Type hardening for PHP 8.1+`
	`46`	`+ $value = (string)$value;`
`45`	`47`	`// Test if we're actually an encrypted value;`
`46`	`48`	`if (ctype_xdigit($value) && strlen($value) > 130) {`
`47`	`49`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ public function setValue($value, $record = null, $markChanged = true)`
`43`	`43`
`44`	`44`	`public function getDecryptedValue($value)`
`45`	`45`	`{`
	`46`	`+ // Type hardening for PHP 8.1+`
	`47`	`+ $value = (string)$value;`
`46`	`48`	`// Test if we're actually an encrypted value;`
`47`	`49`	`if (ctype_xdigit($value) && strlen($value) > 130) {`
`48`	`50`	`try {`