Merge branch 'master' into pluggable

Author: Nik Barham

README.md

@@ -1,11 +1,12 @@
 <img src='http://www.automatorm.com/img/logo.png?2'>
 
-
-
-automatorm [![Build Status](https://travis-ci.org/brokencube/automatorm.svg?branch=master)](https://travis-ci.org/brokencube/automatorm) [![Code Climate](https://codeclimate.com/github/brokencube/automatorm/badges/gpa.svg)](https://codeclimate.com/github/brokencube/automatorm)
+AutomatORM 
 ==========
+[![Latest Stable Version](https://poser.pugx.org/brokencube/automatorm/v/stable)](https://packagist.org/packages/brokencube/automatorm) 
+[![Build Status](https://travis-ci.org/brokencube/automatorm.svg?branch=master)](https://travis-ci.org/brokencube/automatorm) 
+[![Code Climate](https://codeclimate.com/github/brokencube/automatorm/badges/gpa.svg)](https://codeclimate.com/github/brokencube/automatorm) 
 
 A simple to use ORM in PHP, that reads your database schema directly, without having to run code generators, or create schema documents.
 
 Requirements:
-PHP 5.4 + PDO, composer
+PHP 5.6 + PDO, composer

src/Orm/Data.php

@@ -69,22 +69,46 @@ public function __clone()
         $this->__external = array();
     }
 
-    // Create a open cloned copy of this object, ready to reinsert as a new row.
-    public function duplicate()
+    /**
+     * Create a open cloned copy of this object, ready to reinsert as a new row.
+     *
+     * @param bool $clone_M2M_properties Clone M2M properties as well
+     * @return self
+     */
+    public function duplicate($clone_M2M_properties = false)
     {
         $clone = clone $this;
         $clone->__new = true;
         $clone->__delete = false;
         unset($clone->__data['id']);
+        
+        // Clone M-M joins
+        if ($clone_M2M_properties) {
+            foreach ($this->__model['many-to-many'] as $key => $model) {
+                $clone->__external[$key] = $this->{$key};
+            }
+        }
+        
         return $clone;
     }
+
+    /**
+     * Lock id of the object. Once locked, this data object will always represent the id specified.
+     *
+     * @return self
+     */
 
     public function lock()
     {
         $this->__locked = true;
         return $this;
     }
 
+    /**
+     * Mark data object for deletion when commited
+     *
+     * @return self
+     */
     public function delete()
     {
         if ($this->__new) {
@@ -601,7 +625,7 @@ public function __set($var, $value)
             } elseif ($value instanceof Model) {
                 // Trying to pass in the wrong table for the relationship!
                 // That is, the table name on the foreign key does not match the table name in the passed Model object
-                $value_table = Schema::normaliseCase($value->data(true)->__table);
+                $value_table = Schema::normaliseCase($value->dataOriginal()->__table);
                 $expected_table = $this->__model['many-to-one'][$var];
 
                 if ($value_table !== $expected_table) {

src/Orm/Model.php

@@ -380,13 +380,14 @@ public function __wakeup()
         return $this;
     }
 
-    final public function data($returnOriginal = false)
+    final public function data()
     {
-        if ($returnOriginal) {
-            return $this->_data;
-        } else {
-            return clone $this->_data;
-        }
+        return clone $this->_data;    
+    }
+    
+    final public function dataOriginal()
+    {
+        return $this->_data;
     }
 
     // Swap out the Data object in this Model for an updated one (i.e. after doing an update)