From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 13 Feb 2009 05:47:48 +0000 (-0700)
Subject: Missed the Serialize conversion in horde.git
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c6823e2cd793c952537f44f887b6abcac6b2989d;p=horde.git

Missed the Serialize conversion in horde.git
---

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Cache.php b/framework/Imap_Client/lib/Horde/Imap/Client/Cache.php
index d2a395208..dcc36958d 100644
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Cache.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Cache.php
@@ -124,14 +124,14 @@ class Horde_Imap_Client_Cache
         if (!empty($params['compress'])) {
             switch ($params['compress']) {
             case 'gzip':
-                if (Horde_Serialize::hasCapability(SERIALIZE_GZ_COMPRESS)) {
-                    $compress = SERIALIZE_GZ_COMPRESS;
+                if (Horde_Serialize::hasCapability(Horde_Serialize::GZ_COMPRESS)) {
+                    $compress = Horde_Serialize::GZ_COMPRESS;
                 }
                 break;
 
             case 'lzf':
-                if (Horde_Serialize::hasCapability(SERIALIZE_LZF)) {
-                    $compress = SERIALIZE_LZF;
+                if (Horde_Serialize::hasCapability(Horde_Serialize::LZF)) {
+                    $compress = Horde_Serialize::LZF;
                 }
                 break;
             }
@@ -173,7 +173,7 @@ class Horde_Imap_Client_Cache
                      * error checking when decompressing (cache data will
                      * automatically be invalidated then). */
                     if (isset($dptr[$uid])) {
-                        $data[$uid] = ($compress && is_array($dptr[$uid])) ? Horde_Serialize::serialize($dptr[$uid], array(SERIALIZE_BASIC, $compress)) : $dptr[$uid];
+                        $data[$uid] = ($compress && is_array($dptr[$uid])) ? Horde_Serialize::serialize($dptr[$uid], array(Horde_Serialize::BASIC, $compress)) : $dptr[$uid];
                     }
                 }
 
@@ -182,12 +182,12 @@ class Horde_Imap_Client_Cache
                     // If empty, we can expire the cache.
                     $this->_cache->expire($cid);
                 } else {
-                    $this->_cache->set($cid, Horde_Serialize::serialize($data, SERIALIZE_BASIC), $lifetime);
+                    $this->_cache->set($cid, Horde_Serialize::serialize($data, Horde_Serialize::BASIC), $lifetime);
                 }
             }
 
             // Save the slicemap
-            $this->_cache->set($this->_getCID($mbox, 'slicemap'), Horde_Serialize::serialize($sptr, SERIALIZE_BASIC), $lifetime);
+            $this->_cache->set($this->_getCID($mbox, 'slicemap'), Horde_Serialize::serialize($sptr, Horde_Serialize::BASIC), $lifetime);
         }
     }
 
@@ -448,7 +448,7 @@ class Horde_Imap_Client_Cache
             return;
         }
 
-        $data = Horde_Serialize::unserialize($data, SERIALIZE_BASIC);
+        $data = Horde_Serialize::unserialize($data, Horde_Serialize::BASIC);
         if (!is_array($data)) {
             return;
         }
@@ -545,7 +545,7 @@ class Horde_Imap_Client_Cache
             if (isset($ptr[$val]) && !is_array($ptr[$val])) {
                 $success = false;
                 if (!is_null($compress)) {
-                    $res = Horde_Serialize::unserialize($ptr[$val], array($compress, SERIALIZE_BASIC));
+                    $res = Horde_Serialize::unserialize($ptr[$val], array($compress, Horde_Serialize::BASIC));
                     if (!is_a($res, 'PEAR_Error')) {
                         $ptr[$val] = $res;
                         $success = true;
@@ -574,7 +574,7 @@ class Horde_Imap_Client_Cache
     {
         if (!isset($this->_slicemap[$mailbox])) {
             if (($data = $this->_cache->get($this->_getCID($mailbox, 'slicemap'), $this->_params['lifetime'])) !== false) {
-                $slice = Horde_Serialize::unserialize($data, SERIALIZE_BASIC);
+                $slice = Horde_Serialize::unserialize($data, Horde_Serialize::BASIC);
                 if (is_array($slice)) {
                     $this->_slicemap[$mailbox] = $slice;
                 }
diff --git a/framework/Serialize/doc/Horde/Serialize/examples/json.php b/framework/Serialize/doc/Horde/Serialize/examples/json.php
index 9cffe8764..df60cf8e5 100644
--- a/framework/Serialize/doc/Horde/Serialize/examples/json.php
+++ b/framework/Serialize/doc/Horde/Serialize/examples/json.php
@@ -8,8 +8,8 @@ require_once 'Horde/Serialize.php';
 // Convert a complex value to JSON notation, and send it to the
 // browser.
 $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
-echo Horde_Serialize::serialize($value, SERIALIZE_JSON);
+echo Horde_Serialize::serialize($value, Horde_Serialize::JSON);
 // prints: ["foo","bar",[1,2,"baz"],[3,[4]]]
 
 // Accept incoming POST data, assumed to be in JSON notation.
-var_dump(Horde_Serialize::unserialize(file_get_contents('php://stdin'), SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize(file_get_contents('php://stdin'), Horde_Serialize::JSON));
diff --git a/framework/Serialize/test/Horde/Serialize/json_assoc_array.phpt b/framework/Serialize/test/Horde/Serialize/json_assoc_array.phpt
index 685cc8686..71345c4b3 100644
--- a/framework/Serialize/test/Horde/Serialize/json_assoc_array.phpt
+++ b/framework/Serialize/test/Horde/Serialize/json_assoc_array.phpt
@@ -24,24 +24,24 @@ $arrs_jo = '{"1":"one","2":"two","5":"five"}';
 /* Types test */
 
 // strict type should be array
-out(gettype(Horde_Serialize::unserialize($arn_ja, SERIALIZE_JSON)));
+out(gettype(Horde_Serialize::unserialize($arn_ja, Horde_Serialize::JSON)));
 
 echo"============================================================================\n";
 
 /* Encode tests */
 
 // array case - strict: associative array with nested associative arrays
-out(Horde_Serialize::serialize($arr, SERIALIZE_JSON));
+out(Horde_Serialize::serialize($arr, Horde_Serialize::JSON));
 
 // array case - strict: associative array with nested associative arrays, and
 // some numeric keys thrown in
 // Should degrade to a numeric array.
-out(Horde_Serialize::serialize($arn, SERIALIZE_JSON));
+out(Horde_Serialize::serialize($arn, Horde_Serialize::JSON));
 
 // sparse numeric assoc array: associative array numeric keys which are not
 // fully populated in a range of 0 to length-1
 // Test a sparsely populated numerically indexed associative array.
-out(Horde_Serialize::serialize($arrs, SERIALIZE_JSON));
+out(Horde_Serialize::serialize($arrs, Horde_Serialize::JSON));
 
 ?>
 --EXPECT--
@@ -49,4 +49,4 @@ array
 ============================================================================
 {"car1":{"color":"tan","model":"sedan"},"car2":{"color":"red","model":"sports"}}
 [{"0":"tan\\","model\\":"sedan"},{"0":"red","model":"sports"}]
-{"1":"one","2":"two","5":"five"}
\ No newline at end of file
+{"1":"one","2":"two","5":"five"}
diff --git a/framework/Serialize/test/Horde/Serialize/json_empty.phpt b/framework/Serialize/test/Horde/Serialize/json_empty.phpt
index 8bd2fbff7..34d5dcca6 100644
--- a/framework/Serialize/test/Horde/Serialize/json_empty.phpt
+++ b/framework/Serialize/test/Horde/Serialize/json_empty.phpt
@@ -18,19 +18,19 @@ $obj2_j = '{ /* comment inside */ }';
 /* Types tests */
 
 // should be object
-out(gettype(Horde_Serialize::unserialize($obj0_j, SERIALIZE_JSON)));
+out(gettype(Horde_Serialize::unserialize($obj0_j, Horde_Serialize::JSON)));
 // should be empty object
-out(count(get_object_vars(Horde_Serialize::unserialize($obj0_j, SERIALIZE_JSON))));
+out(count(get_object_vars(Horde_Serialize::unserialize($obj0_j, Horde_Serialize::JSON))));
 
 // should be object, even with space
-out(gettype(Horde_Serialize::unserialize($obj1_j, SERIALIZE_JSON)));
+out(gettype(Horde_Serialize::unserialize($obj1_j, Horde_Serialize::JSON)));
 // should be empty object, even with space
-out(count(get_object_vars(Horde_Serialize::unserialize($obj1_j, SERIALIZE_JSON))));
+out(count(get_object_vars(Horde_Serialize::unserialize($obj1_j, Horde_Serialize::JSON))));
 
 // should be object, despite comment
-out(gettype(Horde_Serialize::unserialize($obj2_j, SERIALIZE_JSON)));
+out(gettype(Horde_Serialize::unserialize($obj2_j, Horde_Serialize::JSON)));
 // should be empty object, despite comment
-out(count(get_object_vars(Horde_Serialize::unserialize($obj2_j, SERIALIZE_JSON))));
+out(count(get_object_vars(Horde_Serialize::unserialize($obj2_j, Horde_Serialize::JSON))));
 
 ?>
 --EXPECT--
diff --git a/framework/Serialize/test/Horde/Serialize/json_encode_decode.phpt b/framework/Serialize/test/Horde/Serialize/json_encode_decode.phpt
index 57343c5af..4aa3dcf05 100644
--- a/framework/Serialize/test/Horde/Serialize/json_encode_decode.phpt
+++ b/framework/Serialize/test/Horde/Serialize/json_encode_decode.phpt
@@ -38,139 +38,139 @@ $str4_j_ = '"héllö wørłd"';
 /* Encode tests. */
 
 // type case: null
-out(Horde_Serialize::serialize(null, SERIALIZE_JSON));
+out(Horde_Serialize::serialize(null, Horde_Serialize::JSON));
 // type case: boolean true
-out(Horde_Serialize::serialize(true, SERIALIZE_JSON));
+out(Horde_Serialize::serialize(true, Horde_Serialize::JSON));
 // type case: boolean false
-out(Horde_Serialize::serialize(false, SERIALIZE_JSON));
+out(Horde_Serialize::serialize(false, Horde_Serialize::JSON));
 
 // numeric case: 1
-out(Horde_Serialize::serialize(1, SERIALIZE_JSON));
+out(Horde_Serialize::serialize(1, Horde_Serialize::JSON));
 // numeric case: -1
-out(Horde_Serialize::serialize(-1, SERIALIZE_JSON));
+out(Horde_Serialize::serialize(-1, Horde_Serialize::JSON));
 // numeric case: 1.0
-out(Horde_Serialize::serialize(1.0, SERIALIZE_JSON));
+out(Horde_Serialize::serialize(1.0, Horde_Serialize::JSON));
 // numeric case: 1.1
-out(Horde_Serialize::serialize(1.1, SERIALIZE_JSON));
+out(Horde_Serialize::serialize(1.1, Horde_Serialize::JSON));
 
 // string case: hello world
-out(Horde_Serialize::serialize($str1, SERIALIZE_JSON));
+out(Horde_Serialize::serialize($str1, Horde_Serialize::JSON));
 // string case: hello world, with tab, double-quotes
-out(Horde_Serialize::serialize($str2, SERIALIZE_JSON));
+out(Horde_Serialize::serialize($str2, Horde_Serialize::JSON));
 // string case: backslash, return, newline, tab, double-quote
-out(Horde_Serialize::serialize($str3, SERIALIZE_JSON));
+out(Horde_Serialize::serialize($str3, Horde_Serialize::JSON));
 // string case: hello world, with unicode
-out(Horde_Serialize::serialize($str4, SERIALIZE_JSON));
+out(Horde_Serialize::serialize($str4, Horde_Serialize::JSON));
 
 // array case: array with elements and nested arrays
-out(Horde_Serialize::serialize($arr, SERIALIZE_JSON));
+out(Horde_Serialize::serialize($arr, Horde_Serialize::JSON));
 // object case: object with properties, nested object and arrays
-out(Horde_Serialize::serialize($obj, SERIALIZE_JSON));
+out(Horde_Serialize::serialize($obj, Horde_Serialize::JSON));
 
 echo"============================================================================\n";
 
 /* Decode tests */
 
 // type case: null
-var_dump(Horde_Serialize::unserialize('null', SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize('null', Horde_Serialize::JSON));
 // type case: boolean true
-var_dump(Horde_Serialize::unserialize('true', SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize('true', Horde_Serialize::JSON));
 // type case: boolean false
-var_dump(Horde_Serialize::unserialize('false', SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize('false', Horde_Serialize::JSON));
 
 // numeric case: 1
-var_dump(Horde_Serialize::unserialize('1', SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize('1', Horde_Serialize::JSON));
 // numeric case: -1
-var_dump(Horde_Serialize::unserialize('-1', SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize('-1', Horde_Serialize::JSON));
 // numeric case: 1.0
-var_dump(Horde_Serialize::unserialize('1.0', SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize('1.0', Horde_Serialize::JSON));
 // numeric case: 1.1
-var_dump(Horde_Serialize::unserialize('1.1', SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize('1.1', Horde_Serialize::JSON));
 
 // string case: hello world
-var_dump(Horde_Serialize::unserialize($str1_j, SERIALIZE_JSON));
-var_dump(Horde_Serialize::unserialize($str1_j_, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($str1_j, Horde_Serialize::JSON));
+var_dump(Horde_Serialize::unserialize($str1_j_, Horde_Serialize::JSON));
 // string case: hello world, with tab, double-quotes
-var_dump(Horde_Serialize::unserialize($str2_j, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($str2_j, Horde_Serialize::JSON));
 // string case: backslash, return, newline, tab, double-quote
-var_dump(Horde_Serialize::unserialize($str3_j, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($str3_j, Horde_Serialize::JSON));
 // string case: hello world, with unicode
-var_dump(Horde_Serialize::unserialize($str4_j, SERIALIZE_JSON));
-var_dump(Horde_Serialize::unserialize($str4_j_, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($str4_j, Horde_Serialize::JSON));
+var_dump(Horde_Serialize::unserialize($str4_j_, Horde_Serialize::JSON));
 
 // array case: array with elements and nested arrays
-var_dump(Horde_Serialize::unserialize($arr_j, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($arr_j, Horde_Serialize::JSON));
 // object case: object with properties, nested object and arrays
-var_dump(Horde_Serialize::unserialize($obj_j, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($obj_j, Horde_Serialize::JSON));
 
 echo"============================================================================\n";
 
 /* Encode-decode tests */
 
 // type case: null
-var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize(null, SERIALIZE_JSON), SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize(null, Horde_Serialize::JSON), Horde_Serialize::JSON));
 // type case: boolean true
-var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize(true, SERIALIZE_JSON), SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize(true, Horde_Serialize::JSON), Horde_Serialize::JSON));
 // type case: boolean false
-var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize(false, SERIALIZE_JSON), SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize(false, Horde_Serialize::JSON), Horde_Serialize::JSON));
 
 // numeric case: 1
-var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize(1, SERIALIZE_JSON), SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize(1, Horde_Serialize::JSON), Horde_Serialize::JSON));
 // numeric case: -1
-var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize(-1, SERIALIZE_JSON), SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize(-1, Horde_Serialize::JSON), Horde_Serialize::JSON));
 // numeric case: 1.0
-var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize(1.0, SERIALIZE_JSON), SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize(1.0, Horde_Serialize::JSON), Horde_Serialize::JSON));
 // numeric case: 1.1
-var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize(1.1, SERIALIZE_JSON), SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize(1.1, Horde_Serialize::JSON), Horde_Serialize::JSON));
 
 // string case: hello world
-var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize($str1, SERIALIZE_JSON), SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize($str1, Horde_Serialize::JSON), Horde_Serialize::JSON));
 // string case: hello world, with tab, double-quotes
-var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize($str2, SERIALIZE_JSON), SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize($str2, Horde_Serialize::JSON), Horde_Serialize::JSON));
 // string case: backslash, return, newline, tab, double-quote
-var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize($str3, SERIALIZE_JSON), SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize($str3, Horde_Serialize::JSON), Horde_Serialize::JSON));
 // string case: hello world, with unicode
-var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize($str4, SERIALIZE_JSON), SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize($str4, Horde_Serialize::JSON), Horde_Serialize::JSON));
 
 // array case: array with elements and nested arrays
-var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize($arr, SERIALIZE_JSON), SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize($arr, Horde_Serialize::JSON), Horde_Serialize::JSON));
 // object case: object with properties, nested object and arrays
-var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize($obj, SERIALIZE_JSON), SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize(Horde_Serialize::serialize($obj, Horde_Serialize::JSON), Horde_Serialize::JSON));
 
 echo"============================================================================\n";
 
 /* Decode-encode tests */
 
 // type case: null
-out(Horde_Serialize::serialize(Horde_Serialize::unserialize('null', SERIALIZE_JSON), SERIALIZE_JSON));
+out(Horde_Serialize::serialize(Horde_Serialize::unserialize('null', Horde_Serialize::JSON), Horde_Serialize::JSON));
 // type case: boolean true
-out(Horde_Serialize::serialize(Horde_Serialize::unserialize('true', SERIALIZE_JSON), SERIALIZE_JSON));
+out(Horde_Serialize::serialize(Horde_Serialize::unserialize('true', Horde_Serialize::JSON), Horde_Serialize::JSON));
 // type case: boolean false
-out(Horde_Serialize::serialize(Horde_Serialize::unserialize('false', SERIALIZE_JSON), SERIALIZE_JSON));
+out(Horde_Serialize::serialize(Horde_Serialize::unserialize('false', Horde_Serialize::JSON), Horde_Serialize::JSON));
 
 // numeric case: 1
-out(Horde_Serialize::serialize(Horde_Serialize::unserialize('1', SERIALIZE_JSON), SERIALIZE_JSON));
+out(Horde_Serialize::serialize(Horde_Serialize::unserialize('1', Horde_Serialize::JSON), Horde_Serialize::JSON));
 // numeric case: -1
-out(Horde_Serialize::serialize(Horde_Serialize::unserialize('-1', SERIALIZE_JSON), SERIALIZE_JSON));
+out(Horde_Serialize::serialize(Horde_Serialize::unserialize('-1', Horde_Serialize::JSON), Horde_Serialize::JSON));
 // numeric case: 1.0
-out(Horde_Serialize::serialize(Horde_Serialize::unserialize('1.0', SERIALIZE_JSON), SERIALIZE_JSON));
+out(Horde_Serialize::serialize(Horde_Serialize::unserialize('1.0', Horde_Serialize::JSON), Horde_Serialize::JSON));
 // numeric case: 1.1
-out(Horde_Serialize::serialize(Horde_Serialize::unserialize('1.1', SERIALIZE_JSON), SERIALIZE_JSON));
+out(Horde_Serialize::serialize(Horde_Serialize::unserialize('1.1', Horde_Serialize::JSON), Horde_Serialize::JSON));
 
 // string case: hello world
-out(Horde_Serialize::serialize(Horde_Serialize::unserialize($str1_j, SERIALIZE_JSON), SERIALIZE_JSON));
+out(Horde_Serialize::serialize(Horde_Serialize::unserialize($str1_j, Horde_Serialize::JSON), Horde_Serialize::JSON));
 // string case: hello world, with tab, double-quotes
-out(Horde_Serialize::serialize(Horde_Serialize::unserialize($str2_j, SERIALIZE_JSON), SERIALIZE_JSON));
+out(Horde_Serialize::serialize(Horde_Serialize::unserialize($str2_j, Horde_Serialize::JSON), Horde_Serialize::JSON));
 // string case: backslash, return, newline, tab, double-quote
-out(Horde_Serialize::serialize(Horde_Serialize::unserialize($str3_j, SERIALIZE_JSON), SERIALIZE_JSON));
+out(Horde_Serialize::serialize(Horde_Serialize::unserialize($str3_j, Horde_Serialize::JSON), Horde_Serialize::JSON));
 // string case: hello world, with unicode
-out(Horde_Serialize::serialize(Horde_Serialize::unserialize($str4_j, SERIALIZE_JSON), SERIALIZE_JSON));
-out(Horde_Serialize::serialize(Horde_Serialize::unserialize($str4_j_, SERIALIZE_JSON), SERIALIZE_JSON));
+out(Horde_Serialize::serialize(Horde_Serialize::unserialize($str4_j, Horde_Serialize::JSON), Horde_Serialize::JSON));
+out(Horde_Serialize::serialize(Horde_Serialize::unserialize($str4_j_, Horde_Serialize::JSON), Horde_Serialize::JSON));
 
 // array case: array with elements and nested arrays
-out(Horde_Serialize::serialize(Horde_Serialize::unserialize($arr_j, SERIALIZE_JSON), SERIALIZE_JSON));
+out(Horde_Serialize::serialize(Horde_Serialize::unserialize($arr_j, Horde_Serialize::JSON), Horde_Serialize::JSON));
 // object case: object with properties, nested object and arrays
-out(Horde_Serialize::serialize(Horde_Serialize::unserialize($obj_j, SERIALIZE_JSON), SERIALIZE_JSON));
+out(Horde_Serialize::serialize(Horde_Serialize::unserialize($obj_j, Horde_Serialize::JSON), Horde_Serialize::JSON));
 
 ?>
 --EXPECT--
diff --git a/framework/Serialize/test/Horde/Serialize/json_nested_array.phpt b/framework/Serialize/test/Horde/Serialize/json_nested_array.phpt
index 7d98ef125..3d5c6029d 100644
--- a/framework/Serialize/test/Horde/Serialize/json_nested_array.phpt
+++ b/framework/Serialize/test/Horde/Serialize/json_nested_array.phpt
@@ -15,15 +15,15 @@ $str5 = '{"params":[{"options": {"old": [ ], "new": {"0": {"elements": {"old": [
 /* Decode tests */
 
 // simple compactly-nested array
-var_dump(Horde_Serialize::unserialize($str1, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($str1, Horde_Serialize::JSON));
 // simple compactly-nested array
-var_dump(Horde_Serialize::unserialize($str2, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($str2, Horde_Serialize::JSON));
 // complex compactly nested array
-var_dump(Horde_Serialize::unserialize($str3, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($str3, Horde_Serialize::JSON));
 // complex compactly nested array
-var_dump(Horde_Serialize::unserialize($str4, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($str4, Horde_Serialize::JSON));
 // super complex compactly nested array
-var_dump(Horde_Serialize::unserialize($str5, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($str5, Horde_Serialize::JSON));
 
 ?>
 --EXPECT--
diff --git a/framework/Serialize/test/Horde/Serialize/json_object.phpt b/framework/Serialize/test/Horde/Serialize/json_object.phpt
index 4a40324b2..81f05c213 100644
--- a/framework/Serialize/test/Horde/Serialize/json_object.phpt
+++ b/framework/Serialize/test/Horde/Serialize/json_object.phpt
@@ -22,17 +22,17 @@ $obj1_j = '{"car1":{"color":"tan","model":"sedan"},"car2":{"color":"red","model"
 /* Types test */
 
 // checking whether decoded type is object
-out(gettype(Horde_Serialize::unserialize($obj_j, SERIALIZE_JSON)));
+out(gettype(Horde_Serialize::unserialize($obj_j, Horde_Serialize::JSON)));
 
 /* Encode test */
 
 // object - strict: Object with nested objects
-out(Horde_Serialize::serialize($obj1, SERIALIZE_JSON));
+out(Horde_Serialize::serialize($obj1, Horde_Serialize::JSON));
 
 /* Decode/encode test */
 
 // object case
-out(Horde_Serialize::serialize(Horde_Serialize::unserialize($obj_j, SERIALIZE_JSON), SERIALIZE_JSON));
+out(Horde_Serialize::serialize(Horde_Serialize::unserialize($obj_j, Horde_Serialize::JSON), Horde_Serialize::JSON));
 
 ?>
 --EXPECT--
diff --git a/framework/Serialize/test/Horde/Serialize/json_spaces_comments.phpt b/framework/Serialize/test/Horde/Serialize/json_spaces_comments.phpt
index 2dec96c3a..206cbcee7 100644
--- a/framework/Serialize/test/Horde/Serialize/json_spaces_comments.phpt
+++ b/framework/Serialize/test/Horde/Serialize/json_spaces_comments.phpt
@@ -31,24 +31,24 @@ $obj_jc4 = '{\'a_string\': "\"he\":llo}:{world",
                 "obj": {"a_number":123}}';
 
 // Base result
-var_dump(Horde_Serialize::unserialize($obj_j, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($obj_j, Horde_Serialize::JSON));
 
 /* Spaces tests */
 
 // checking whether notation with spaces works
-var_dump(Horde_Serialize::unserialize($obj_js, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($obj_js, Horde_Serialize::JSON));
 
 /* Comments tests */
 
 // checking whether notation with single line comments works
-var_dump(Horde_Serialize::unserialize($obj_jc1, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($obj_jc1, Horde_Serialize::JSON));
 
 // checking whether notation with multiline comments works
-var_dump(Horde_Serialize::unserialize($obj_jc2, SERIALIZE_JSON));
-var_dump(Horde_Serialize::unserialize($obj_jc3, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($obj_jc2, Horde_Serialize::JSON));
+var_dump(Horde_Serialize::unserialize($obj_jc3, Horde_Serialize::JSON));
 
 // checking whether notation with single-quotes and multiline comments works
-var_dump(Horde_Serialize::unserialize($obj_jc4, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($obj_jc4, Horde_Serialize::JSON));
 
 ?>
 --EXPECT--
diff --git a/framework/Serialize/test/Horde/Serialize/json_unquoted_keys.phpt b/framework/Serialize/test/Horde/Serialize/json_unquoted_keys.phpt
index ae54c80f2..cc95c8c23 100644
--- a/framework/Serialize/test/Horde/Serialize/json_unquoted_keys.phpt
+++ b/framework/Serialize/test/Horde/Serialize/json_unquoted_keys.phpt
@@ -24,13 +24,13 @@ $arrs_jo = '{"1":"one",2:"two","5":\'fi"ve\'}';
 // associative arrays, and some numeric keys thrown in
 // ...unless the input array has some numeric indeces, in which case the
 // behavior is to degrade to a regular array
-var_dump(Horde_Serialize::unserialize($arn_ja, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($arn_ja, Horde_Serialize::JSON));
 
 // sparse numeric assoc array: associative array with unquoted keys,
 // single-quoted values, numeric keys which are not fully populated in a range
 // of 0 to length-1
 // Test a sparsely populated numerically indexed associative array
-var_dump(Horde_Serialize::unserialize($arrs_jo, SERIALIZE_JSON));
+var_dump(Horde_Serialize::unserialize($arrs_jo, Horde_Serialize::JSON));
 
 ?>
 --EXPECT--
diff --git a/framework/SessionObjects/lib/Horde/SessionObjects.php b/framework/SessionObjects/lib/Horde/SessionObjects.php
index e3dbce1e4..a6a08e834 100644
--- a/framework/SessionObjects/lib/Horde/SessionObjects.php
+++ b/framework/SessionObjects/lib/Horde/SessionObjects.php
@@ -157,10 +157,10 @@ class Horde_SessionObjects
             if (!is_null($this->_sdata)) {
                 $data = $this->_sdata;
             } else {
-                $modes[] = SERIALIZE_BASIC;
+                $modes[] = Horde_Serialize::BASIC;
             }
-            if (Horde_Serialize::hasCapability(SERIALIZE_LZF)) {
-                $modes[] = SERIALIZE_LZF;
+            if (Horde_Serialize::hasCapability(Horde_Serialize::LZF)) {
+                $modes[] = Horde_Serialize::LZF;
             }
             $ptr[$oid] = array(
                 'data' => ((empty($modes)) ? $data : Horde_Serialize::serialize($data, $modes)),
@@ -209,10 +209,10 @@ class Horde_SessionObjects
             $object = false;
         } else {
             $modes = array();
-            if (Horde_Serialize::hasCapability(SERIALIZE_LZF)) {
-                $modes[] = SERIALIZE_LZF;
+            if (Horde_Serialize::hasCapability(Horde_Serialize::LZF)) {
+                $modes[] = Horde_Serialize::LZF;
             }
-            $object = Horde_Serialize::unserialize($_SESSION[$this->_name][$oid]['data'], array_merge($modes, array(SERIALIZE_BASIC)));
+            $object = Horde_Serialize::unserialize($_SESSION[$this->_name][$oid]['data'], array_merge($modes, array(Horde_Serialize::BASIC)));
             if (is_a($object, 'PEAR_Error')) {
                 $this->setPruneFlag($oid, true);
                 $object = false;