Changeset 725

Timestamp:

06/10/07 12:17:02 (1 year ago)

Author:

mikey

Message:

take care that no instances of stubReflectionClass are serialized but the required information to restore all instances after unserializing (fixes ticket #63)

Files:

• trunk/src/main/php/net/stubbles/reflection/annotations/stubAbstractAnnotation.php (modified) (2 diffs)
• trunk/src/test/php/net/stubbles/integration/AnnotationClass.php (added)
• trunk/src/test/php/net/stubbles/integration/AnnotationTestCase.php (added)
• trunk/src/test/runIntegration.php (modified) (1 diff)

trunk/src/main/php/net/stubbles/reflection/annotations/stubAbstractAnnotation.php

@@ -22 +22 @@
-     */
-    protected $annotationName;
+    /**
+     * a list of reflected class instances used in the annotation
+     * 
+     * This property should only be used by this class. We can not make this
+     * property private because the serializung mechanism will not work then.
+     *
+     * @var  array<string,string>
+     */
+    protected $reflectedClasses = array();
-
-    /**
@@ -49 +58 @@
-    {
-        foreach (get_object_vars($this) as $name => $value) {
-is_object($value) == true && 
+
-                $this->$name = clone $this->$name;
-            }
-        }
-    }
+
+    /**
+     * store only the names of the property and the reflected class names,
+     * not the reflection class itself because it can not be serialized
+     *
+     * @return  array<string>
+     */
+    public function __sleep()
+    {
+        $propertiesToSerialize = array();
+        foreach (get_object_vars($this) as $name => $value) {
+            if ($value instanceof stubReflectionClass) {
+                $this->reflectedClasses[$name] = $value->getFullQualifiedClassName();
+            } else {
+                $propertiesToSerialize[] = $name;
+            }
+        }
+        
+        return $propertiesToSerialize;
+    }
+
+    /**
+     * restore all properties containing an instance of a reflection class
+     */
+    public function __wakeup()
+    {
+        foreach ($this->reflectedClasses as $propertyName => $reflectedClasses) {
+            $this->$propertyName = new stubReflectionClass($reflectedClasses);
+        }
+        
+        $this->reflectedClasses = array();
+    }
-}
-?>

trunk/src/test/runIntegration.php

@@ -31 +31 @@
-        $testSuite = new TestSuite('All tests.');
-        
+        $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/integration/AnnotationTestCase.php');
-        $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/integration/DatabaseTestCase.php');
-        $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/integration/InterceptorTestCase.php');