Added SerializationHelper that handles PostgreSql serialization correctly & replaced all serialization function calls

src/Casts/CallbackCollectionCast.php

@@ -6,6 +6,7 @@
 
 use InvalidArgumentException;
 use Sammyjo20\LaravelHaystack\Data\CallbackCollection;
+use Sammyjo20\LaravelHaystack\Helpers\SerializationHelper;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 
 class CallbackCollectionCast implements CastsAttributes
@@ -21,7 +22,7 @@ class CallbackCollectionCast implements CastsAttributes
      */
     public function get($model, string $key, $value, array $attributes)
     {
-        return isset($value) ? unserialize($value, ['allowed_classes' => true]) : null;
+        return isset($value) ? SerializationHelper::unserialize($value, ['allowed_classes' => true]) : null;
     }
 
     /**
@@ -43,6 +44,6 @@ public function set($model, string $key, $value, array $attributes)
             throw new InvalidArgumentException(sprintf('Value provided must be an instance of %s.', CallbackCollection::class));
         }
 
-        return serialize($value);
+        return SerializationHelper::serialize($value);
     }
 }

src/Casts/MiddlewareCollectionCast.php

@@ -6,6 +6,7 @@
 
 use InvalidArgumentException;
 use Sammyjo20\LaravelHaystack\Data\MiddlewareCollection;
+use Sammyjo20\LaravelHaystack\Helpers\SerializationHelper;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 
 class MiddlewareCollectionCast implements CastsAttributes
@@ -21,7 +22,7 @@ class MiddlewareCollectionCast implements CastsAttributes
      */
     public function get($model, string $key, $value, array $attributes)
     {
-        return isset($value) ? unserialize($value, ['allowed_classes' => true]) : null;
+        return isset($value) ? SerializationHelper::unserialize($value, ['allowed_classes' => true]) : null;
     }
 
     /**
@@ -43,6 +44,6 @@ public function set($model, string $key, $value, array $attributes)
             throw new InvalidArgumentException(sprintf('Value provided must be an instance of %s.', MiddlewareCollection::class));
         }
 
-        return serialize($value);
+        return SerializationHelper::serialize($value);
     }
 }

src/Casts/SerializeClosure.php

@@ -8,6 +8,7 @@
 use InvalidArgumentException;
 use Laravel\SerializableClosure\SerializableClosure;
 use Sammyjo20\LaravelHaystack\Helpers\ClosureHelper;
+use Sammyjo20\LaravelHaystack\Helpers\SerializationHelper;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 
 class SerializeClosure implements CastsAttributes
@@ -23,7 +24,7 @@ class SerializeClosure implements CastsAttributes
      */
     public function get($model, string $key, $value, array $attributes): ?Closure
     {
-        return isset($value) ? unserialize($value, ['allowed_classes' => true])->getClosure() : null;
+        return isset($value) ? SerializationHelper::unserialize($value, ['allowed_classes' => true])->getClosure() : null;
     }
 
     /**
@@ -49,6 +50,6 @@ public function set($model, string $key, $value, array $attributes): ?string
 
         $closure = ClosureHelper::fromCallable($value);
 
-        return serialize(new SerializableClosure($closure));
+        return SerializationHelper::serialize(new SerializableClosure($closure));
     }
 }

src/Casts/Serialized.php

@@ -5,6 +5,7 @@
 namespace Sammyjo20\LaravelHaystack\Casts;
 
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+use Sammyjo20\LaravelHaystack\Helpers\SerializationHelper;
 
 class Serialized implements CastsAttributes
 {
@@ -19,7 +20,7 @@ class Serialized implements CastsAttributes
      */
     public function get($model, string $key, $value, array $attributes)
     {
-        return isset($value) ? unserialize($value, ['allowed_classes' => true]) : null;
+        return isset($value) ? SerializationHelper::unserialize($value, ['allowed_classes' => true]) : null;
     }
 
     /**
@@ -37,6 +38,6 @@ public function set($model, string $key, $value, array $attributes)
             return null;
         }
 
-        return serialize($value);
+        return SerializationHelper::serialize($value);
     }
 }

src/Casts/SerializedModel.php

@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Sammyjo20\LaravelHaystack\Data\SerializedModel as SerializedModelData;
+use Sammyjo20\LaravelHaystack\Helpers\SerializationHelper;
 
 class SerializedModel implements CastsAttributes
 {
@@ -22,7 +23,7 @@ class SerializedModel implements CastsAttributes
      */
     public function get($model, string $key, $value, array $attributes)
     {
-        return isset($value) ? unserialize($value, ['allowed_classes' => true])->model : null;
+        return isset($value) ? SerializationHelper::unserialize($value, ['allowed_classes' => true])->model : null;
     }
 
     /**
@@ -44,6 +45,6 @@ public function set($model, string $key, $value, array $attributes)
             throw new InvalidArgumentException('The provided value must be a model.');
         }
 
-        return serialize(new SerializedModelData($value));
+        return SerializationHelper::serialize(new SerializedModelData($value));
     }
 }

src/Helpers/SerializationHelper.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sammyjo20\LaravelHaystack\Helpers;
+
+use Illuminate\Database\PostgresConnection;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+
+class SerializationHelper
+{
+    /**
+     * Serialize the given value.
+     *
+     * @param  mixed  $value
+     * @return string
+     */
+    public static function serialize(mixed $value) : string
+    {
+        $serialized = serialize($value);
+
+        return DB::connection() instanceof PostgresConnection
+            ? base64_encode($serialized)
+            : $serialized;
+    }
+
+    /**
+     * Unserialize the given value.
+     *
+     * @param  string  $serialized
+     * @param  array   $options
+     * @return mixed
+     */
+    public static function unserialize(string $serialized, array $options = []) : mixed
+    {
+        if (DB::connection() instanceof PostgresConnection && ! Str::contains($serialized, [':', ';'])) {
+            $serialized = base64_decode($serialized);
+        }
+
+        return unserialize($serialized, $options);
+    }
+}

src/JobEventListener.php

@@ -9,6 +9,7 @@
 use Illuminate\Queue\Events\JobProcessed;
 use Sammyjo20\LaravelHaystack\Models\Haystack;
 use Sammyjo20\LaravelHaystack\Contracts\StackableJob;
+use Sammyjo20\LaravelHaystack\Helpers\SerializationHelper;
 
 class JobEventListener
 {
@@ -163,7 +164,7 @@ private function unserializeJobFromPayload(array $payload): ?object
             return null;
         }
 
-        return unserialize($payload['data']['command'], ['allowed_classes' => true]);
+        return SerializationHelper::unserialize($payload['data']['command'], ['allowed_classes' => true]);
     }
 
     /**