Merge branch 'hotfix/0.4.6'

lindyhopchris · lindyhopchris · commit 7fc441663ecb · 2016-09-01T06:04:25.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file. This project adheres to
 [Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
 
+## [0.4.6] - 2016-09-01
+
+### Fixed
+- Return value from hydrator was not being used in the Eloquent controller. The hydrator interface defines that the
+hydrated object should be returned, so the controller has been amended to respect this return value.
+
 ## [0.4.5] - 2016-08-26
 
 ### Change
diff --git a/src/Http/Controllers/EloquentController.php b/src/Http/Controllers/EloquentController.php
@@ -228,9 +228,7 @@ protected function hydrate(ResourceInterface $resource, Model $model)
             return $this->methodNotAllowed();
         }
 
-        $this->hydrator->hydrate($resource, $model);
-
-        return $model;
+        return $this->hydrator->hydrate($resource, $model);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -228,9 +228,7 @@ protected function hydrate(ResourceInterface $resource, Model $model)`
`228`	`228`	`return $this->methodNotAllowed();`
`229`	`229`	`}`
`230`	`230`
`231`		`- $this->hydrator->hydrate($resource, $model);`
`232`		`-`
`233`		`- return $model;`
	`231`	`+ return $this->hydrator->hydrate($resource, $model);`
`234`	`232`	`}`
`235`	`233`
`236`	`234`	`/**`