Merge branch 'master' of github.com:thefuzzy0ne/codeigniter-base-model into thefuzzy0ne-master

Conflicts:
	core/MY_Model.php

Author: jamierumbelow

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 vendor
-composer.lock
+composer.lock
+composer.phar

README.md

@@ -338,7 +338,7 @@ Install the testing framework (PHPUnit) with Composer:
 
 You can then run the tests using the `vendor/bin/phpunit` binary and specify the tests file:
 
-    $ vendor/bin/phpunit tests/MY_Model_test.php
+    $ vendor/bin/phpunit
 
 
 Contributing to MY_Model

core/MY_Model.php

@@ -121,22 +121,7 @@ public function __construct()
      */
     public function get($primary_value)
     {
-        $this->trigger('before_get');
-
-        if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
-        {
-            $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
-        }
-
-        $row = $this->_database->where($this->primary_key, $primary_value)
-                        ->get($this->_table)
-                        ->{$this->_return_type()}();
-        $this->_temporary_return_type = $this->return_type;
-
-        $row = $this->trigger('after_get', $row);
-
-        $this->_with = array();
-        return $row;
+		return $this->get_by($this->primary_key, $primary_value);
     }
 
     /**
@@ -146,12 +131,13 @@ public function get($primary_value)
     public function get_by()
     {
         $where = func_get_args();
-        $this->_set_where($where);
-
+        
         if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
         {
             $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
         }
+		
+		$this->_set_where($where);
 
         $this->trigger('before_get');
 
@@ -186,13 +172,14 @@ public function get_many($values)
     public function get_many_by()
     {
         $where = func_get_args();
-        $this->_set_where($where);
 
         if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
         {
             $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
         }
 
+        $this->_set_where($where);
+
         return $this->get_all();
     }
 

phpunit.xml

@@ -4,4 +4,9 @@
     colors="true"
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true">
+	<testsuites>
+        <testsuite name="MyModel Test Suite">
+            <file>./tests/MY_Model_test.php</file>
+        </testsuite>
+    </testsuites>
 </phpunit>