Changes between Version 5 and Version 6 of EC-CUBE標準規約/開発効率向上のためのTips

Timestamp:

2013/12/16 22:12:04 (13 years ago)

Author:

nanasess

Comment:

Fix toArray()

EC-CUBE標準規約/開発効率向上のためのTips

@@ -344 +344 @@
        * @return array 連想配列のプロパティの値
        */
-      public function toArray() {
-          $arrResults = array();
-          $objReflect = new ReflectionClass($this);
-          $arrProperties = $objReflect->getProperties();
-
-          foreach ($arrProperties as $objProperty) {
-              $objProperty->setAccessible(true);
-              $name = $objProperty->getName();
-              $arrResults[$name] = $objProperty->getValue($this);
-          }
-         // 親クラスがある場合は再帰的にプロパティを取得
-         $parentClass = $objReflect->getParentClass();
-         if (is_object($parentClass)) {
-             $arr = self::toArray($parentClass);
-             $arrResults = array_merge(self::toArray($parentClass), $arrResults);
-         }
-          return $arrResults;
-      }
+    public function toArray(ReflectionClass $parentClass = null) {
+        $objReflect = null;
+        if (is_object($parentClass)) {
+            $objReflect = $parentClass;
+        } else {
+            $objReflect = new ReflectionClass($this);
+        }
+        $arrProperties = $objReflect->getProperties();
+        foreach ($arrProperties as $objProperty) {
+            $objProperty->setAccessible(true);
+            $name = $objProperty->getName();
+            $arrResults[$name] = $objProperty->getValue($this);
+        }
+
+        // 親クラスがある場合は再帰的にプロパティを取得
+        $parentClass = $objReflect->getParentClass();
+        if (is_object($parentClass)) {
+            $arrParents = self::toArray($parentClass);
+            if (!is_array($arrParents)) {
+                $arrParents = array();
+            }
+            if (!is_array($arrResults)) {
+                $arrResults = array();
+            }
+            $arrResults = array_merge($arrParents, $arrResults);
+        }
+        return $arrResults;
+    }
   }
 }}}