Merge remote-tracking branch 'upstream/master'

1 files changed, 14 insertions, 1 deletions

diff --git a/php.html.markdown b/php.html.markdown
index 6944390c..6c2b38c8 100644
--- a/php.html.markdown
+++ b/php.html.markdown
@@ -539,10 +539,23 @@ class MyClass
         print 'MyClass';
     }
 
-    //final keyword would make a function unoverridable
+    // final keyword would make a function unoverridable
     final function youCannotOverrideMe()
     {
     }
+    
+    // Magic Methods
+    
+    // what to do if Object is treated as a String
+    public function __toString() {
+        return $property;
+    }
+    
+    // opposite to __construct()
+    // called when object is no longer referenced
+    public function __destruct() {
+        print "Destroying";
+    }
 
 /*
  * Declaring class properties or methods as static makes them accessible without