@@ -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][$fieldName])) { |
31 | 31 | $this->mergedXml[$dataProvider][$fieldName] = array_merge( |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | */ |
57 | 57 | private function parseDataProvider(\SimpleXMLElement $xmlDataProvider): string |
58 | 58 | { |
59 | - $dataProvider = (string)$xmlDataProvider->attributes()['name']; |
|
59 | + $dataProvider = (string) $xmlDataProvider->attributes()['name']; |
|
60 | 60 | if (!isset($this->mergedXml[$dataProvider])) { |
61 | 61 | $this->mergedXml[$dataProvider] = []; |
62 | 62 | } |
@@ -71,20 +71,20 @@ discard block |
||
71 | 71 | */ |
72 | 72 | private function getElementData(\SimpleXMLElement $element): array |
73 | 73 | { |
74 | - $type = (string)$element->attributes()['type']; |
|
74 | + $type = (string) $element->attributes()['type']; |
|
75 | 75 | |
76 | 76 | $data = [ |
77 | - 'name' => (string)$element->attributes()['name'], |
|
78 | - 'allownull' => (bool)$element->attributes()['allownull'], |
|
79 | - 'default' => (string)$element->attributes()['default'], |
|
77 | + 'name' => (string) $element->attributes()['name'], |
|
78 | + 'allownull' => (bool) $element->attributes()['allownull'], |
|
79 | + 'default' => (string) $element->attributes()['default'], |
|
80 | 80 | 'type' => $this->getVariableType($type), |
81 | 81 | 'is_collection' => $this->isCollection($type), |
82 | 82 | 'is_dataprovider' => $this->isDataProvider($type) |
83 | 83 | ]; |
84 | 84 | |
85 | - $singleton = (string)$element->attributes()['singleton']; |
|
85 | + $singleton = (string) $element->attributes()['singleton']; |
|
86 | 86 | if ($singleton !== '') { |
87 | - $data['singleton'] = (string)$element->attributes()['singleton']; |
|
87 | + $data['singleton'] = (string) $element->attributes()['singleton']; |
|
88 | 88 | $data['singleton_type'] = $this->getSingleVariableType($type); |
89 | 89 | } |
90 | 90 |
@@ -63,7 +63,7 @@ |
||
63 | 63 | foreach ($this->parser->getDataProvider() as $providerName => $providerElements) { |
64 | 64 | $namespace = new PhpNamespace($this->namespace); |
65 | 65 | $dataProvider = $this->createDataProviderClass($providerName, $providerElements, $namespace); |
66 | - $classContent = (string)$namespace; |
|
66 | + $classContent = (string) $namespace; |
|
67 | 67 | $classContent = str_replace('\?', '?', $classContent); |
68 | 68 | $classContent = Helpers::tabsToSpaces($classContent, 4); |
69 | 69 | $this->fileWriter->writeToFile($dataProvider->getName() . '.php', $classContent); |
@@ -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 | } |
@@ -104,10 +104,10 @@ discard block |
||
104 | 104 | private function addGetter(ClassType $dataProvider, array $element): void |
105 | 105 | { |
106 | 106 | $dataProvider->addMethod('get' . $element['name']) |
107 | - ->addComment('@return ' . $element['type']) |
|
108 | - ->setVisibility('public') |
|
109 | - ->setBody('return $this->' . $element['name'] . ';') |
|
110 | - ->setReturnType($this->getTypeHint($element['type'], $element['allownull'])) |
|
107 | + ->addComment('@return ' . $element['type']) |
|
108 | + ->setVisibility('public') |
|
109 | + ->setBody('return $this->' . $element['name'] . ';') |
|
110 | + ->setReturnType($this->getTypeHint($element['type'], $element['allownull'])) |
|
111 | 111 | ; |
112 | 112 | } |
113 | 113 | |
@@ -118,9 +118,9 @@ discard block |
||
118 | 118 | private function addUnsetter(ClassType $dataProvider, array $element): void |
119 | 119 | { |
120 | 120 | $dataProvider->addMethod('unset' . $element['name']) |
121 | - ->addComment('@return ' . $dataProvider->getName()) |
|
122 | - ->setVisibility('public') |
|
123 | - ->setBody('$this->' . $element['name'] . ' = null;' . PHP_EOL . PHP_EOL . 'return $this;') |
|
121 | + ->addComment('@return ' . $dataProvider->getName()) |
|
122 | + ->setVisibility('public') |
|
123 | + ->setBody('$this->' . $element['name'] . ' = null;' . PHP_EOL . PHP_EOL . 'return $this;') |
|
124 | 124 | ; |
125 | 125 | } |
126 | 126 | |
@@ -131,11 +131,11 @@ discard block |
||
131 | 131 | private function addHas(ClassType $dataProvider, array $element): void |
132 | 132 | { |
133 | 133 | $dataProvider->addMethod('has' . $element['name']) |
134 | - ->addComment('@return bool') |
|
135 | - ->setVisibility('public') |
|
136 | - ->setBody( |
|
137 | - 'return ($this->' . $element['name'] . ' !== null && $this->' . $element['name'] . ' !== []);' |
|
138 | - ) |
|
134 | + ->addComment('@return bool') |
|
135 | + ->setVisibility('public') |
|
136 | + ->setBody( |
|
137 | + 'return ($this->' . $element['name'] . ' !== null && $this->' . $element['name'] . ' !== []);' |
|
138 | + ) |
|
139 | 139 | ; |
140 | 140 | } |
141 | 141 | |
@@ -146,16 +146,16 @@ discard block |
||
146 | 146 | private function addSetter(ClassType $dataProvider, array $element): void |
147 | 147 | { |
148 | 148 | $setter = $dataProvider->addMethod('set' . $element['name']) |
149 | - ->addComment( |
|
150 | - '@param ' . $element['type'] . ' $' |
|
151 | - . $element['name'] |
|
152 | - ) |
|
153 | - ->addComment('@return ' . $dataProvider->getName()) |
|
154 | - ->setVisibility('public') |
|
155 | - ->setBody( |
|
156 | - '$this->' . $element['name'] . ' = $' . $element['name'] . ';' . PHP_EOL . PHP_EOL |
|
157 | - . 'return $this;' |
|
158 | - ) |
|
149 | + ->addComment( |
|
150 | + '@param ' . $element['type'] . ' $' |
|
151 | + . $element['name'] |
|
152 | + ) |
|
153 | + ->addComment('@return ' . $dataProvider->getName()) |
|
154 | + ->setVisibility('public') |
|
155 | + ->setBody( |
|
156 | + '$this->' . $element['name'] . ' = $' . $element['name'] . ';' . PHP_EOL . PHP_EOL |
|
157 | + . 'return $this;' |
|
158 | + ) |
|
159 | 159 | ; |
160 | 160 | |
161 | 161 | $param = $setter->addParameter($element['name']) |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | ; |
196 | 196 | |
197 | 197 | $singleSetter->addParameter($element['singleton']) |
198 | - ->setTypeHint($element['singleton_type']) |
|
198 | + ->setTypeHint($element['singleton_type']) |
|
199 | 199 | ; |
200 | 200 | } |
201 | 201 | } |
@@ -207,8 +207,8 @@ discard block |
||
207 | 207 | private function addProperty(ClassType $dataProvider, array $element): void |
208 | 208 | { |
209 | 209 | $property = $dataProvider->addProperty($element['name']) |
210 | - ->setVisibility('protected') |
|
211 | - ->addComment('@var ' . $element['type']) |
|
210 | + ->setVisibility('protected') |
|
211 | + ->addComment('@var ' . $element['type']) |
|
212 | 212 | ; |
213 | 213 | |
214 | 214 | if ($element['default']) { |
@@ -246,10 +246,10 @@ discard block |
||
246 | 246 | private function addElementsGetter(ClassType $dataProvider, array $elements): void |
247 | 247 | { |
248 | 248 | $dataProvider->addMethod('getElements') |
249 | - ->setReturnType('array') |
|
250 | - ->setVisibility('protected') |
|
251 | - ->addComment('@return array') |
|
252 | - ->setBody('return ' . var_export($elements, true) . ';') |
|
249 | + ->setReturnType('array') |
|
250 | + ->setVisibility('protected') |
|
251 | + ->addComment('@return array') |
|
252 | + ->setBody('return ' . var_export($elements, true) . ';') |
|
253 | 253 | ; |
254 | 254 | } |
255 | 255 |
@@ -58,17 +58,13 @@ discard block |
||
58 | 58 | { |
59 | 59 | if (strpos($element['type'], 'DataProviderInterface[]') !== false) { |
60 | 60 | $this->setChildData($data, $fieldname); |
61 | - } |
|
62 | - elseif (strpos($element['type'], 'DataProviderInterface') !== false) { |
|
61 | + } elseif (strpos($element['type'], 'DataProviderInterface') !== false) { |
|
63 | 62 | $this->setAnyDataProviderValues($data, $fieldname); |
64 | - } |
|
65 | - elseif ($element['is_dataprovider']) { |
|
63 | + } elseif ($element['is_dataprovider']) { |
|
66 | 64 | $this->setOneDataProviderValue($data, $element, $fieldname); |
67 | - } |
|
68 | - elseif ($element['is_collection']) { |
|
65 | + } elseif ($element['is_collection']) { |
|
69 | 66 | $this->setCollectionValues($data, $element, $fieldname); |
70 | - } |
|
71 | - else { |
|
67 | + } else { |
|
72 | 68 | $this->{$fieldname} = $data[$fieldname]; |
73 | 69 | } |
74 | 70 | } |
@@ -86,21 +82,17 @@ discard block |
||
86 | 82 | $getMethod = 'get' . $fieldname; |
87 | 83 | if (strpos($element['type'], 'DataProviderInterface[]') !== false) { |
88 | 84 | $data = $this->getDataProviderCollectionData($provider, $fieldname, $data, $getMethod); |
89 | - } |
|
90 | - elseif ( |
|
85 | + } elseif ( |
|
91 | 86 | strpos($element['type'], 'DataProviderInterface') !== false |
92 | 87 | && $provider->{$getMethod}() instanceof DataProviderInterface |
93 | 88 | ) { |
94 | 89 | $anyDataProvider = new AnyDataProvider($provider->{$getMethod}()); |
95 | 90 | $data[$fieldname] = $anyDataProvider->toArray(); |
96 | - } |
|
97 | - elseif ($element['is_dataprovider'] && $provider->{$getMethod}() instanceof DataProviderInterface) { |
|
91 | + } elseif ($element['is_dataprovider'] && $provider->{$getMethod}() instanceof DataProviderInterface) { |
|
98 | 92 | $data[$fieldname] = $this->convertToArray($provider->{$getMethod}()); |
99 | - } |
|
100 | - elseif ($element['is_collection']) { |
|
93 | + } elseif ($element['is_collection']) { |
|
101 | 94 | $data = $this->getCollectionData($provider, $fieldname, $data, $getMethod); |
102 | - } |
|
103 | - else { |
|
95 | + } else { |
|
104 | 96 | $data[$fieldname] = $provider->{$getMethod}(); |
105 | 97 | } |
106 | 98 | return $data; |