Revert changes in CRM/Core/BAO{Cache|ConfigSetting}.php CRM/Extension/ClassLoader...

diff --git a/CRM/Core/BAO/Cache.php b/CRM/Core/BAO/Cache.php
index 4ef618f30d1395f9ad4a5f8dfbf0ae24d2880f17..e71e24e368c902d292671ab01d411a4cb224f4dd 100644 (file)
--- a/CRM/Core/BAO/Cache.php
+++ b/CRM/Core/BAO/Cache.php
@@ -444,10 +444,10 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache {
     // Upgrade support -- old records (serialize) always have this punctuation,
     // and new records (base64) never do.
     if (strpos($string, ':') !== FALSE || strpos($string, ';') !== FALSE) {
-      return CRM_Utils_String::unserialize($string);
+      return unserialize($string);
     }
     else {
-      return CRM_Utils_String::unserialize(base64_decode($string));
+      return unserialize(base64_decode($string));
     }
   }
 

diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php
index c30f7ae1ce89ec1607442d74a9ebbe647261bed5..8919a6d79095ec8cbb583e4a82875029bb12e897 100644 (file)
--- a/CRM/Core/BAO/ConfigSetting.php
+++ b/CRM/Core/BAO/ConfigSetting.php
@@ -63,7 +63,7 @@ class CRM_Core_BAO_ConfigSetting {
     $domain->id = CRM_Core_Config::domainID();
     $domain->find(TRUE);
     if ($domain->config_backend) {
-      $params = array_merge(CRM_Utils_String::unserialize($domain->config_backend), $params);
+      $params = array_merge(unserialize($domain->config_backend), $params);
     }
 
     $params = CRM_Core_BAO_ConfigSetting::filterSkipVars($params);
@@ -106,7 +106,7 @@ class CRM_Core_BAO_ConfigSetting {
     $domain->id = CRM_Core_Config::domainID();
     $domain->find(TRUE);
     if ($domain->config_backend) {
-      $defaults = CRM_Utils_String::unserialize($domain->config_backend);
+      $defaults = unserialize($domain->config_backend);
       if ($defaults === FALSE || !is_array($defaults)) {
         $defaults = [];
         return FALSE;

diff --git a/CRM/Extension/ClassLoader.php b/CRM/Extension/ClassLoader.php
index d0845911e023305ef5f24e2413ab209cbbec53dc..4569f6c2e4ee498b2af85609e04db30b22d59fe7 100644 (file)
--- a/CRM/Extension/ClassLoader.php
+++ b/CRM/Extension/ClassLoader.php
@@ -89,7 +89,7 @@ class CRM_Extension_ClassLoader {
       $loader = $this->buildClassLoader();
       $ser = serialize($loader);
       file_put_contents($file,
-        sprintf("<?php\nreturn CRM_Utils_String::unserialize(%s);", var_export($ser, 1))
+        sprintf("<?php\nreturn unserialize(%s);", var_export($ser, 1))
       );
     }
     return $loader->register();

diff --git a/CRM/Queue/Queue/Memory.php b/CRM/Queue/Queue/Memory.php
index 99b92959eebfc9681c55125c3d860ee73ff70b09..0c840c1c366d1e4bd5c0f9b55863f87f84ea329e 100644 (file)
--- a/CRM/Queue/Queue/Memory.php
+++ b/CRM/Queue/Queue/Memory.php
@@ -137,7 +137,7 @@ class CRM_Queue_Queue_Memory extends CRM_Queue_Queue {
 
         $item = new stdClass();
         $item->id = $id;
-        $item->data = CRM_Utils_String::unserialize($data);
+        $item->data = unserialize($data);
         return $item;
       }
       else {
@@ -166,7 +166,7 @@ class CRM_Queue_Queue_Memory extends CRM_Queue_Queue {
 
       $item = new stdClass();
       $item->id = $id;
-      $item->data = CRM_Utils_String::unserialize($data);
+      $item->data = unserialize($data);
       return $item;
     }
     // nothing in queue

diff --git a/CRM/Queue/Queue/Sql.php b/CRM/Queue/Queue/Sql.php
index f176318adaf951ac0ac0175f9e71f7cfc9b9244c..a77ba055feecce5f9065041aa514cbaa515bbffe 100644 (file)
--- a/CRM/Queue/Queue/Sql.php
+++ b/CRM/Queue/Queue/Sql.php
@@ -153,7 +153,7 @@ class CRM_Queue_Queue_Sql extends CRM_Queue_Queue {
         #        $dao->submit_time = date('YmdHis', strtotime($dao->submit_time));
         #        $dao->release_time = date('YmdHis', $nowEpoch + $lease_time);
         #        $dao->save();
-        $dao->data = CRM_Utils_String::unserialize($dao->data);
+        $dao->data = unserialize($dao->data);
         return $dao;
       }
     }
@@ -186,7 +186,7 @@ class CRM_Queue_Queue_Sql extends CRM_Queue_Queue {
         '1' => [date('YmdHis', $nowEpoch + $lease_time), 'String'],
         '2' => [$dao->id, 'Integer'],
       ]);
-      $dao->data = CRM_Utils_String::unserialize($dao->data);
+      $dao->data = unserialize($dao->data);
       return $dao;
     }
   }

diff --git a/CRM/Queue/Runner.php b/CRM/Queue/Runner.php
index 48906b6abbda1717488240008167b57a93fa3e8c..fa2817e7130acb761c61d7794084899874fdb40b 100644 (file)
--- a/CRM/Queue/Runner.php
+++ b/CRM/Queue/Runner.php
@@ -85,7 +85,7 @@ class CRM_Queue_Runner {
    */
   public static function instance($qrid) {
     if (!empty($_SESSION['queueRunners'][$qrid])) {
-      return CRM_Utils_String::unserialize($_SESSION['queueRunners'][$qrid]);
+      return unserialize($_SESSION['queueRunners'][$qrid]);
     }
     else {
       return NULL;

diff --git a/CRM/Utils/Array.php b/CRM/Utils/Array.php
index b28f6777034d626df0208a837a4e1516fad876c5..7dd32cd4be1d43e4a493ddd044666ebf220c8bda 100644 (file)
--- a/CRM/Utils/Array.php
+++ b/CRM/Utils/Array.php
@@ -499,7 +499,7 @@ class CRM_Utils_Array {
    *   The input array with duplicate values removed.
    */
   public static function crmArrayUnique($array) {
-    $result = array_map("CRM_Utils_String::unserialize", array_unique(array_map("serialize", $array)));
+    $result = array_map("unserialize", array_unique(array_map("serialize", $array)));
     foreach ($result as $key => $value) {
       if (is_array($value)) {
         $result[$key] = self::crmArrayUnique($value);

diff --git a/CRM/Utils/Cache/APCcache.php b/CRM/Utils/Cache/APCcache.php
index 80c3ac6a2b597919277da13eee7384bcd8b5f275..187da7edb801bee1a059c5aa1c7838718186c8e5 100644 (file)
--- a/CRM/Utils/Cache/APCcache.php
+++ b/CRM/Utils/Cache/APCcache.php
@@ -145,7 +145,7 @@ class CRM_Utils_Cache_APCcache implements CRM_Utils_Cache_Interface {
   }
 
   private function reobjectify($value) {
-    return is_object($value) ? CRM_Utils_String::unserialize(serialize($value)) : $value;
+    return is_object($value) ? unserialize(serialize($value)) : $value;
   }
 
 }

diff --git a/CRM/Utils/Cache/ArrayCache.php b/CRM/Utils/Cache/ArrayCache.php
index de44d73b647c121c6f93bed187cd1afbab8fd905..c83f3f1f4eb63448bfaef67f2226ffd78e14f2e7 100644 (file)
--- a/CRM/Utils/Cache/ArrayCache.php
+++ b/CRM/Utils/Cache/ArrayCache.php
@@ -121,12 +121,12 @@ class CRM_Utils_Cache_ArrayCache implements CRM_Utils_Cache_Interface {
 
   private function reobjectify($value) {
     if (is_object($value)) {
-      return CRM_Utils_String::unserialize(serialize($value));
+      return unserialize(serialize($value));
     }
     if (is_array($value)) {
       foreach ($value as $p) {
         if (is_object($p)) {
-          return CRM_Utils_String::unserialize(serialize($value));
+          return unserialize(serialize($value));
         }
       }
     }

diff --git a/CRM/Utils/Cache/ArrayDecorator.php b/CRM/Utils/Cache/ArrayDecorator.php
index 0f75d84a1a2b76c005e66f342fc1fcce3efb4886..86ac79728a52e65ffbe3ed41308d3c14ecc27033 100644 (file)
--- a/CRM/Utils/Cache/ArrayDecorator.php
+++ b/CRM/Utils/Cache/ArrayDecorator.php
@@ -137,7 +137,7 @@ class CRM_Utils_Cache_ArrayDecorator implements CRM_Utils_Cache_Interface {
   }
 
   private function reobjectify($value) {
-    return is_object($value) ? CRM_Utils_String::unserialize(serialize($value)) : $value;
+    return is_object($value) ? unserialize(serialize($value)) : $value;
   }
 
 }

diff --git a/CRM/Utils/Cache/Memcache.php b/CRM/Utils/Cache/Memcache.php
index 64db5ae9f1dff935c046a551582532458a6cf651..511663792e575030897694f495f184a2f505ce73 100644 (file)
--- a/CRM/Utils/Cache/Memcache.php
+++ b/CRM/Utils/Cache/Memcache.php
@@ -149,7 +149,7 @@ class CRM_Utils_Cache_Memcache implements CRM_Utils_Cache_Interface {
   public function get($key, $default = NULL) {
     CRM_Utils_Cache::assertValidKey($key);
     $result = $this->_cache->get($this->getTruePrefix() . $key);
-    return ($result === FALSE) ? $default : CRM_Utils_String::unserialize($result);
+    return ($result === FALSE) ? $default : unserialize($result);
   }
 
   /**

diff --git a/CRM/Utils/Cache/Memcached.php b/CRM/Utils/Cache/Memcached.php
index 6e2a1332a528cd48424d9681163f44653bb0330c..fd3aee39c236fe795e16141fab26cc9d5b05361c 100644 (file)
--- a/CRM/Utils/Cache/Memcached.php
+++ b/CRM/Utils/Cache/Memcached.php
@@ -167,7 +167,7 @@ class CRM_Utils_Cache_Memcached implements CRM_Utils_Cache_Interface {
     $result = $this->_cache->get($key);
     switch ($this->_cache->getResultCode()) {
       case Memcached::RES_SUCCESS:
-        return CRM_Utils_String::unserialize($result);
+        return unserialize($result);
 
       case Memcached::RES_NOTFOUND:
         return $default;

diff --git a/CRM/Utils/Cache/Redis.php b/CRM/Utils/Cache/Redis.php
index b3b01fee25488e122d4fde3b9111828d629ed538..f7c8435f791eac16f84e69e15d2fc304ec12446e 100644 (file)
--- a/CRM/Utils/Cache/Redis.php
+++ b/CRM/Utils/Cache/Redis.php
@@ -153,7 +153,7 @@ class CRM_Utils_Cache_Redis implements CRM_Utils_Cache_Interface {
   public function get($key, $default = NULL) {
     CRM_Utils_Cache::assertValidKey($key);
     $result = $this->_cache->get($this->_prefix . $key);
-    return ($result === FALSE) ? $default : CRM_Utils_String::unserialize($result);
+    return ($result === FALSE) ? $default : unserialize($result);
   }
 
   /**

diff --git a/CRM/Utils/Cache/SqlGroup.php b/CRM/Utils/Cache/SqlGroup.php
index b206c1b04cc736af7b2504b7a9c3b9189f65cc31..840886c65edca956eb8c5bf66cdcb2cdfda1a535 100644 (file)
--- a/CRM/Utils/Cache/SqlGroup.php
+++ b/CRM/Utils/Cache/SqlGroup.php
@@ -184,7 +184,7 @@ class CRM_Utils_Cache_SqlGroup implements CRM_Utils_Cache_Interface {
   }
 
   private function reobjectify($value) {
-    return is_object($value) ? CRM_Utils_String::unserialize(serialize($value)) : $value;
+    return is_object($value) ? unserialize(serialize($value)) : $value;
   }
 
   /**