Do not call "toArray" if private or not an object

cakephp · Nov 15, 2016 · 71878d2 · 71878d2
1 parent b5cc45c
commit 71878d2
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/Utility/Xml.php b/src/Utility/Xml.php
@@ -203,8 +203,8 @@ protected static function _loadXml($input, $options)
      */
     public static function fromArray($input, $options = [])
     {
-        if (is_object($input) && method_exists($input, 'toArray')) {
-            $input = $input->toArray();
+        if (is_object($input) && method_exists($input, 'toArray') && is_callable([$input, 'toArray'])) {
+            $input = call_user_func([$input, 'toArray']);
         }
         if (!is_array($input) || count($input) !== 1) {
             throw new XmlException('Invalid input.');
@@ -257,8 +257,8 @@ protected static function _fromArray($dom, $node, &$data, $format)
         }
         foreach ($data as $key => $value) {
             if (is_string($key)) {
-                if (is_object($value) && method_exists($value, 'toArray')) {
-                    $value = $value->toArray();
+                if (is_object($value) && method_exists($value, 'toArray') && is_callable([$value, 'toArray'])) {
+                    $value = call_user_func([$value, 'toArray']);
                 }
 
                 if (!is_array($value)) {
@@ -323,8 +323,8 @@ protected static function _createChild($data)
     {
         extract($data);
         $childNS = $childValue = null;
-        if (is_object($value) && method_exists($value, 'toArray')) {
-            $value = $value->toArray();
+        if (is_object($value) && method_exists($value, 'toArray') && is_callable([$value, 'toArray'])) {
+            $value = call_user_func([$value, 'toArray']);
         }
         if (is_array($value)) {
             if (isset($value['@'])) {