Changeset 1266

Timestamp:

01/20/08 13:17:10 (1 year ago)

Author:

mikey

Message:

fixed coding style issues

Files:

• trunk/src/main/php/net/stubbles/php/serializer/stubPHPSerializer.php (modified) (5 diffs)
• trunk/src/main/php/net/stubbles/php/serializer/stubPHPSerializerObjectMapping.php (modified) (1 diff)
• trunk/src/main/php/net/stubbles/php/serializer/stubPHPSerializerSPLSerializableMapping.php (modified) (1 diff)

trunk/src/main/php/net/stubbles/php/serializer/stubPHPSerializer.php

@@ -245 +245 @@
-                return ''; // ignore (resources can't be serialized)
-
- {
+
-                $mapping = $this->findMappingFor($data);
-                if (null !== $mapping) {
@@ -252 +252 @@
-
-                return $this->defaultObjectMapping->serialize($this, $data, $context);
-            }
-
-            default: 
@@ -272 +271 @@
-        $token = $serialized->getCharAt($start);
-        switch ($token) {
-
+
+
-                $serialized->moveOffset(2);
-                return null;
-}
-
-case 'b': { 
-
-
-}
-
-case 'i': { 
-
-
-}
-
-case 'd': { 
-
-
-}
-
-case 's': { 
+
+case 'b':
+
+
+ 
+
+case 'i':
+
+
+ 
+
+case 'd':
+
+
+ 
+
+case 's':
+
-                $serialized->moveOffset(2);
-                return $serialized->consumeString();
-
-
-case 'a': { 
+
+
+
-                $serialized->moveOffset(2);
-                $a    = array();
@@ -309 +309 @@
-                $serialized->moveOffset();  // closing "}"
-                return $a;
-}
-
-case 'O': { 
+
+case 'O':
+
-                return $this->defaultObjectMapping->unserialize($this, $serialized, $context);
-
-
-default: {  
+
+
+
-                if (isset($this->mappings[$token]) == false) {
-                    throw new stubFormatException('Cannot unserialize unknown type "' . $token . '" (' . $serialized . ')');
@@ -321 +321 @@
-
-                return $this->mappings[$token]->unserialize($this, $serialized, $context);
-            }
-        }
-    }

trunk/src/main/php/net/stubbles/php/serializer/stubPHPSerializerObjectMapping.php

@@ -67 +67 @@
-        // casting the object to an array gives us access to protected
-        // and private properties as well
-
+ 
-        if (method_exists($object, '__sleep') == true) {
-            $propsToSerialize = $object->__sleep();

trunk/src/main/php/net/stubbles/php/serializer/stubPHPSerializerSPLSerializableMapping.php

@@ -82 +82 @@
-        $serialized->moveOffset(2); // token
-        $className = $serialized->consumeString();
-
+ 
-        //                      C   :   info about classname length  :   classname          in "  :   info about data size : data in {}
-        $endOffset = ($offset + 1 + 1 + strlen(strlen($className)) + 1 + strlen($className) + 2 + 1 + strlen($size) + 1 + $size + 2);