Fix decode with previously cached versions

Closes #84ti
stevebauman · Dec 28, 2023 · 35e262b · 35e262b
1 parent fb5b765
commit 35e262b
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/src/Cache/CacheDefinitionCache.php b/src/Cache/CacheDefinitionCache.php
@@ -2,6 +2,7 @@
 
 namespace Stevebauman\Purify\Cache;
 
+use HTMLPurifier_Definition;
 use HTMLPurifier_DefinitionCache;
 use Illuminate\Support\Facades\Cache;
 
@@ -31,8 +32,8 @@ public function __construct($type)
     /**
      * Adds a definition object to the cache.
      *
-     * @param \HTMLPurifier_Definition $def
-     * @param \HTMLPurifier_Config     $config
+     * @param HTMLPurifier_Definition $def
+     * @param \HTMLPurifier_Config $config
      *
      * @return bool|void
      */
@@ -54,8 +55,8 @@ public function add($def, $config)
     /**
      * Unconditionally saves a definition object to the cache.
      *
-     * @param \HTMLPurifier_Definition $def
-     * @param \HTMLPurifier_Config     $config
+     * @param HTMLPurifier_Definition $def
+     * @param \HTMLPurifier_Config $config
      *
      * @return bool|void
      */
@@ -73,8 +74,8 @@ public function set($def, $config)
     /**
      * Replace an object in the cache.
      *
-     * @param \HTMLPurifier_Definition $def
-     * @param \HTMLPurifier_Config     $config
+     * @param HTMLPurifier_Definition $def
+     * @param \HTMLPurifier_Config $config
      *
      * @return bool|void
      */
@@ -98,7 +99,7 @@ public function replace($def, $config)
      *
      * @param \HTMLPurifier_Config $config
      *
-     * @return bool|\HTMLPurifier_Definition
+     * @return bool|HTMLPurifier_Definition
      */
     public function get($config)
     {
@@ -162,7 +163,7 @@ public function cleanup($config)
     /**
      * Encode the definition for storage.
      *
-     * @param \HTMLPurifier_Definition $def
+     * @param HTMLPurifier_Definition $def
      *
      * @return string
      */
@@ -176,15 +177,17 @@ protected function encode($def)
      *
      * @param string $def
      *
-     * @return \HTMLPurifier_Definition
+     * @return HTMLPurifier_Definition
      */
     protected function decode($def)
     {
-        // Backwards compatibility with previously cached definitions.
-        if (! $encoded = base64_decode($def)) {
-            return unserialize($def);
+        // Backwards compatibility with old cache definitions.
+        $instance = @unserialize($def);
+
+        if ($instance instanceof HTMLPurifier_Definition) {
+            return $instance;
         }
 
-        return unserialize($encoded);
+        return unserialize(base64_decode($def));
     }
 }