Merge branch 'v1.3.0-rc'

Conflicts: CHANGELOG.md lib/Pheasant/Mapper/RowMapper.php
lox · May 29, 2014 · e4a90b5 · e4a90b5
2 parents 66a9197 + ddcaeac
commit e4a90b5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+Changes between Pheasant 1.2.1 and 1.3.0
+========================================
+
+  - Documentation fixes (#58) c53a4a6
+  - Fixed decimal marshalling in specific locales (#103) e0f78a1
+  - Connections can be overridden on a per-class basis (#104) c05883d
+  - Distinguish NULL from empty string (#106) 790dcd1
+  - Connection respects PHEASANT_DEBUG env 303fe4c
+  - SQL binding improvements e0f78a1
+
 Changes between Pheasant 1.2.0 and 1.2.1
 ========================================
 

diff --git a/lib/Pheasant/Mapper/RowMapper.php b/lib/Pheasant/Mapper/RowMapper.php
@@ -134,7 +134,7 @@ public function query(Criteria $criteria=null, $alias=null)
      */
     public function find($class, Criteria $criteria=null)
     {
-        return new Collection($class, 
+        return new Collection($class,
             $this->query($criteria, $this->_pheasant->schema($class)->alias()));
     }