simplify getSourceAsArray

h7io · h7io · commit fe9860888899 · 2016-10-16T01:32:20.000+03:00
diff --git a/code/DropdownImageField.php b/code/DropdownImageField.php
@@ -89,13 +89,9 @@ public function getSourceAsArray() {
         $source = $this->getSource();
         if (is_array($source)) {
             return $source;
-        } else {
-            $sourceArray = array();
-            foreach ($source as $object) {
-                $sourceArray[$object->{$this->keyField}] = $object->{$this->labelField};
-            }
         }
-        return $sourceArray;
+        
+        return $source->map($this->keyField, $this->labelField)->toArray();
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -89,13 +89,9 @@ public function getSourceAsArray() {`
`89`	`89`	`$source = $this->getSource();`
`90`	`90`	`if (is_array($source)) {`
`91`	`91`	`return $source;`
`92`		`- } else {`
`93`		`- $sourceArray = array();`
`94`		`- foreach ($source as $object) {`
`95`		`- $sourceArray[$object->{$this->keyField}] = $object->{$this->labelField};`
`96`		`- }`
`97`	`92`	`}`
`98`		`- return $sourceArray;`
	`93`	`+`
	`94`	`+ return $source->map($this->keyField, $this->labelField)->toArray();`
`99`	`95`	`}`
`100`	`96`
`101`	`97`	`}`