xervice / data-provider

src/Xervice/DataProvider/Parser/XmlMerger.php

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
 
                 if (!isset($this->mergedXml[$dataProvider][$fieldName])) {
                     $this->mergedXml[$dataProvider][$fieldName] = $this->getElementData($element);
-                }
-                else {
+                } else {
                     $this->mergedXml[$dataProvider][$fieldName] = array_merge(
                         $this->mergedXml[$dataProvider][$fieldName],
                         $this->getElementData($element)

src/Xervice/DataProvider/DataProvider/AbstractDataProvider.php

Braces +2 added lines, -4 removed lines

@@ -60,14 +60,12 @@
                 $getMethod = 'get' . $fieldname;
                 if ($element['is_dataprovider'] && $provider->{$getMethod}() instanceof AbstractDataProvider) {
                     $data[$fieldname] = $this->convertToArray($provider->{$getMethod}());
-                }
-                elseif ($element['is_collection']) {
+                } elseif ($element['is_collection']) {
                     $data[$fieldname] = [];
                     foreach ($provider->{$getMethod}() as $child) {
                         $data[$fieldname][] = $child->toArray();
                     }
-                }
-                else {
+                } else {
                     $data[$fieldname] = $provider->{$getMethod}();
                 }
             }