Merge pull request #16 from Superbalist/fix-toarray-call-on-swift-mailer

Lorti · web-flow · commit aeb02aff0a13 · 2016-10-14T17:22:57.000+02:00
ensure that toArray method actually exists on object when calling convertObjectToArray
diff --git a/src/Engines/HandlebarsEngine.php b/src/Engines/HandlebarsEngine.php
@@ -63,7 +63,7 @@ protected function evaluatePath($__path, $__data)
 
     protected function convertObjectToArray($item)
     {
-        if (is_object($item) && is_callable([$item, 'toArray'])) {
+        if (is_object($item) && method_exists($item, 'toArray') && is_callable([$item, 'toArray'])) {
             $item = $item->toArray();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ protected function evaluatePath($__path, $__data)`
`63`	`63`
`64`	`64`	`protected function convertObjectToArray($item)`
`65`	`65`	`{`
`66`		`- if (is_object($item) && is_callable([$item, 'toArray'])) {`
	`66`	`+ if (is_object($item) && method_exists($item, 'toArray') && is_callable([$item, 'toArray'])) {`
`67`	`67`	`$item = $item->toArray();`
`68`	`68`	`}`
`69`	`69`