@@ -152,8 +152,7 @@ discard block |
||
152 | 152 | if ($element['default']) { |
153 | 153 | $default = $this->getDefaultValue($element); |
154 | 154 | $param->setDefaultValue($default); |
155 | - } |
|
156 | - elseif ($element['allownull']) { |
|
155 | + } elseif ($element['allownull']) { |
|
157 | 156 | $param->setDefaultValue(null); |
158 | 157 | } |
159 | 158 | } |
@@ -199,8 +198,7 @@ discard block |
||
199 | 198 | if ($element['default']) { |
200 | 199 | $default = $this->getDefaultValue($element); |
201 | 200 | $property->setValue($default); |
202 | - } |
|
203 | - elseif (strpos($element['type'], '[]') !== false) { |
|
201 | + } elseif (strpos($element['type'], '[]') !== false) { |
|
204 | 202 | $property->setValue([]); |
205 | 203 | } |
206 | 204 | } |
@@ -55,17 +55,13 @@ discard block |
||
55 | 55 | { |
56 | 56 | if (strpos($element['type'], 'DataProviderInterface[]') !== false) { |
57 | 57 | $this->setChildData($data, $element, $fieldname); |
58 | - } |
|
59 | - elseif (strpos($element['type'], 'DataProviderInterface') !== false) { |
|
58 | + } elseif (strpos($element['type'], 'DataProviderInterface') !== false) { |
|
60 | 59 | $this->setAnyDataProviderValues($data, $element, $fieldname); |
61 | - } |
|
62 | - elseif ($element['is_dataprovider']) { |
|
60 | + } elseif ($element['is_dataprovider']) { |
|
63 | 61 | $this->setOneDataProviderValue($data, $element, $fieldname); |
64 | - } |
|
65 | - elseif ($element['is_collection']) { |
|
62 | + } elseif ($element['is_collection']) { |
|
66 | 63 | $this->setCollectionValues($data, $element, $fieldname); |
67 | - } |
|
68 | - else { |
|
64 | + } else { |
|
69 | 65 | $this->{$element['name']} = $data[$fieldname]; |
70 | 66 | } |
71 | 67 | } |
@@ -83,21 +79,17 @@ discard block |
||
83 | 79 | $getMethod = 'get' . $fieldname; |
84 | 80 | if (strpos($element['type'], 'DataProviderInterface[]') !== false) { |
85 | 81 | $data = $this->getDataProviderCollectionData($provider, $fieldname, $data, $getMethod); |
86 | - } |
|
87 | - elseif ( |
|
82 | + } elseif ( |
|
88 | 83 | strpos($element['type'], 'DataProviderInterface') !== false |
89 | 84 | && $provider->{$getMethod}() instanceof DataProviderInterface |
90 | 85 | ) { |
91 | 86 | $anyDataProvider = new AnyDataProvider($provider->{$getMethod}()); |
92 | 87 | $data[$fieldname] = $anyDataProvider->toArray(); |
93 | - } |
|
94 | - elseif ($element['is_dataprovider'] && $provider->{$getMethod}() instanceof DataProviderInterface) { |
|
88 | + } elseif ($element['is_dataprovider'] && $provider->{$getMethod}() instanceof DataProviderInterface) { |
|
95 | 89 | $data[$fieldname] = $this->convertToArray($provider->{$getMethod}()); |
96 | - } |
|
97 | - elseif ($element['is_collection']) { |
|
90 | + } elseif ($element['is_collection']) { |
|
98 | 91 | $data = $this->getCollectionData($provider, $fieldname, $data, $getMethod); |
99 | - } |
|
100 | - else { |
|
92 | + } else { |
|
101 | 93 | $data[$fieldname] = $provider->{$getMethod}(); |
102 | 94 | } |
103 | 95 | return $data; |
@@ -32,8 +32,7 @@ |
||
32 | 32 | $this->mergedXml[$dataProvider]['elements'][$fieldName], |
33 | 33 | $this->getElementData($element, $this->mergedXml[$dataProvider]) |
34 | 34 | ); |
35 | - } |
|
36 | - else { |
|
35 | + } else { |
|
37 | 36 | $this->mergedXml[$dataProvider]['elements'][$fieldName] = $this->getElementData($element, $this->mergedXml[$dataProvider]); |
38 | 37 | } |
39 | 38 | } |