@@ -209,7 +209,7 @@ |
||
209 | 209 | { |
210 | 210 | return preg_replace_callback( |
211 | 211 | '@\_([a-z]{1,1})@', |
212 | - function ($matches) { |
|
212 | + function($matches) { |
|
213 | 213 | return strtoupper($matches[1] ?? ''); |
214 | 214 | }, |
215 | 215 | $methodName |
@@ -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; |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $dataProvider = $this->parseDataProvider($xmlDataProvider); |
26 | 26 | |
27 | 27 | foreach ($xmlDataProvider->DataElement as $element) { |
28 | - $fieldName = (string)$element->attributes()['name']; |
|
28 | + $fieldName = (string) $element->attributes()['name']; |
|
29 | 29 | |
30 | 30 | if (isset($this->mergedXml[$dataProvider]['elements'][$fieldName])) { |
31 | 31 | $this->mergedXml[$dataProvider]['elements'][$fieldName] = array_merge( |
@@ -57,12 +57,12 @@ discard block |
||
57 | 57 | */ |
58 | 58 | private function parseDataProvider(\SimpleXMLElement $xmlDataProvider): string |
59 | 59 | { |
60 | - $dataProvider = (string)$xmlDataProvider->attributes()['name']; |
|
60 | + $dataProvider = (string) $xmlDataProvider->attributes()['name']; |
|
61 | 61 | if (!isset($this->mergedXml[$dataProvider])) { |
62 | 62 | $this->mergedXml[$dataProvider] = [ |
63 | 63 | 'configs' => [ |
64 | - 'convertUnderlines' => (bool)$xmlDataProvider->attributes()['ConvertUnderlines'] ?? false, |
|
65 | - 'deprecated' => (bool)$xmlDataProvider->attributes()['deprecated'] ?? false |
|
64 | + 'convertUnderlines' => (bool) $xmlDataProvider->attributes()['ConvertUnderlines'] ?? false, |
|
65 | + 'deprecated' => (bool) $xmlDataProvider->attributes()['deprecated'] ?? false |
|
66 | 66 | ], |
67 | 67 | 'elements' => [] |
68 | 68 | ]; |
@@ -78,21 +78,21 @@ discard block |
||
78 | 78 | */ |
79 | 79 | private function getElementData(\SimpleXMLElement $element, array $dataProvider): array |
80 | 80 | { |
81 | - $type = (string)$element->attributes()['type']; |
|
81 | + $type = (string) $element->attributes()['type']; |
|
82 | 82 | |
83 | 83 | $data = [ |
84 | - 'name' => (string)$element->attributes()['name'], |
|
85 | - 'allownull' => (bool)$element->attributes()['allownull'], |
|
86 | - 'default' => (string)$element->attributes()['default'], |
|
84 | + 'name' => (string) $element->attributes()['name'], |
|
85 | + 'allownull' => (bool) $element->attributes()['allownull'], |
|
86 | + 'default' => (string) $element->attributes()['default'], |
|
87 | 87 | 'type' => $this->getVariableType($type), |
88 | 88 | 'is_collection' => $this->isCollection($type), |
89 | 89 | 'is_dataprovider' => $this->isDataProvider($type), |
90 | 90 | 'isCamelCase' => $dataProvider['configs']['convertUnderlines'] |
91 | 91 | ]; |
92 | 92 | |
93 | - $singleton = (string)$element->attributes()['singleton']; |
|
93 | + $singleton = (string) $element->attributes()['singleton']; |
|
94 | 94 | if ($singleton !== '') { |
95 | - $data['singleton'] = (string)$element->attributes()['singleton']; |
|
95 | + $data['singleton'] = (string) $element->attributes()['singleton']; |
|
96 | 96 | $data['singleton_type'] = $this->getSingleVariableType($type); |
97 | 97 | } |
98 | 98 |
@@ -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 | } |