@@ -25,8 +25,7 @@ |
||
| 25 | 25 | |
| 26 | 26 | if (!isset($this->mergedXml[$dataProvider][$fieldName])) { |
| 27 | 27 | $this->mergedXml[$dataProvider][$fieldName] = $this->getElementData($element); |
| 28 | - } |
|
| 29 | - else { |
|
| 28 | + } else { |
|
| 30 | 29 | $this->mergedXml[$dataProvider][$fieldName] = array_merge( |
| 31 | 30 | $this->mergedXml[$dataProvider][$fieldName], |
| 32 | 31 | $this->getElementData($element) |
@@ -84,10 +84,10 @@ discard block |
||
| 84 | 84 | private function addGetter(ClassType $dataProvider, $element): void |
| 85 | 85 | { |
| 86 | 86 | $dataProvider->addMethod('get' . $element['name']) |
| 87 | - ->addComment('@return ' . $element['type']) |
|
| 88 | - ->setVisibility('public') |
|
| 89 | - ->setBody('return $this->' . $element['name'] . ';') |
|
| 90 | - ->setReturnType($this->getTypeHint($element['type'])); |
|
| 87 | + ->addComment('@return ' . $element['type']) |
|
| 88 | + ->setVisibility('public') |
|
| 89 | + ->setBody('return $this->' . $element['name'] . ';') |
|
| 90 | + ->setReturnType($this->getTypeHint($element['type'])); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | /** |
@@ -97,9 +97,9 @@ discard block |
||
| 97 | 97 | private function addUnsetter(ClassType $dataProvider, $element): void |
| 98 | 98 | { |
| 99 | 99 | $dataProvider->addMethod('unset' . $element['name']) |
| 100 | - ->addComment('@return ' . $dataProvider->getName()) |
|
| 101 | - ->setVisibility('public') |
|
| 102 | - ->setBody('$this->' . $element['name'] . ' = null;' . PHP_EOL . PHP_EOL . 'return $this;'); |
|
| 100 | + ->addComment('@return ' . $dataProvider->getName()) |
|
| 101 | + ->setVisibility('public') |
|
| 102 | + ->setBody('$this->' . $element['name'] . ' = null;' . PHP_EOL . PHP_EOL . 'return $this;'); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | /** |
@@ -109,9 +109,9 @@ discard block |
||
| 109 | 109 | private function addHas(ClassType $dataProvider, $element): void |
| 110 | 110 | { |
| 111 | 111 | $dataProvider->addMethod('has' . $element['name']) |
| 112 | - ->addComment('@return bool') |
|
| 113 | - ->setVisibility('public') |
|
| 114 | - ->setBody('return ($this->' . $element['name'] . ' !== null && $this->' . $element['name'] . ' !== []);'); |
|
| 112 | + ->addComment('@return bool') |
|
| 113 | + ->setVisibility('public') |
|
| 114 | + ->setBody('return ($this->' . $element['name'] . ' !== null && $this->' . $element['name'] . ' !== []);'); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | /** |
@@ -121,16 +121,16 @@ discard block |
||
| 121 | 121 | private function addSetter(ClassType $dataProvider, $element): void |
| 122 | 122 | { |
| 123 | 123 | $setter = $dataProvider->addMethod('set' . $element['name']) |
| 124 | - ->addComment( |
|
| 125 | - '@param ' . $element['type'] . ' $' |
|
| 126 | - . $element['name'] |
|
| 127 | - ) |
|
| 128 | - ->addComment('@return ' . $dataProvider->getName()) |
|
| 129 | - ->setVisibility('public') |
|
| 130 | - ->setBody( |
|
| 131 | - '$this->' . $element['name'] . ' = $' . $element['name'] . ';' . PHP_EOL . PHP_EOL |
|
| 132 | - . 'return $this;' |
|
| 133 | - ); |
|
| 124 | + ->addComment( |
|
| 125 | + '@param ' . $element['type'] . ' $' |
|
| 126 | + . $element['name'] |
|
| 127 | + ) |
|
| 128 | + ->addComment('@return ' . $dataProvider->getName()) |
|
| 129 | + ->setVisibility('public') |
|
| 130 | + ->setBody( |
|
| 131 | + '$this->' . $element['name'] . ' = $' . $element['name'] . ';' . PHP_EOL . PHP_EOL |
|
| 132 | + . 'return $this;' |
|
| 133 | + ); |
|
| 134 | 134 | |
| 135 | 135 | $param = $setter->addParameter($element['name']) |
| 136 | 136 | ->setTypeHint($this->getTypeHint($element['type'])); |
@@ -151,17 +151,17 @@ discard block |
||
| 151 | 151 | { |
| 152 | 152 | if (isset($element['singleton']) && $element['singleton'] !== '') { |
| 153 | 153 | $singleSetter = $dataProvider->addMethod('add' . $element['singleton']) |
| 154 | - ->addComment( |
|
| 155 | - '@param ' . $element['singleton_type'] . ' $' |
|
| 156 | - . $element['singleton'] |
|
| 157 | - ) |
|
| 158 | - ->setVisibility('public') |
|
| 159 | - ->setBody( |
|
| 160 | - '$this->' . $element['name'] . '[] = $' . $element['singleton'] . ';' |
|
| 161 | - ); |
|
| 154 | + ->addComment( |
|
| 155 | + '@param ' . $element['singleton_type'] . ' $' |
|
| 156 | + . $element['singleton'] |
|
| 157 | + ) |
|
| 158 | + ->setVisibility('public') |
|
| 159 | + ->setBody( |
|
| 160 | + '$this->' . $element['name'] . '[] = $' . $element['singleton'] . ';' |
|
| 161 | + ); |
|
| 162 | 162 | |
| 163 | 163 | $singleSetter->addParameter($element['singleton']) |
| 164 | - ->setTypeHint($element['singleton_type']); |
|
| 164 | + ->setTypeHint($element['singleton_type']); |
|
| 165 | 165 | } |
| 166 | 166 | } |
| 167 | 167 | |
@@ -172,8 +172,8 @@ discard block |
||
| 172 | 172 | private function addProperty(ClassType $dataProvider, $element): void |
| 173 | 173 | { |
| 174 | 174 | $property = $dataProvider->addProperty($element['name']) |
| 175 | - ->setVisibility('protected') |
|
| 176 | - ->addComment('@var ' . $element['type']); |
|
| 175 | + ->setVisibility('protected') |
|
| 176 | + ->addComment('@var ' . $element['type']); |
|
| 177 | 177 | |
| 178 | 178 | if ($element['default']) { |
| 179 | 179 | $property->setValue($element['default']); |
@@ -203,10 +203,10 @@ discard block |
||
| 203 | 203 | private function addElementsGetter($dataProvider, $elements): void |
| 204 | 204 | { |
| 205 | 205 | $dataProvider->addMethod('getElements') |
| 206 | - ->setReturnType('array') |
|
| 207 | - ->setVisibility('protected') |
|
| 208 | - ->addComment('@return array') |
|
| 209 | - ->setBody('return ' . var_export($elements, true) . ';'); |
|
| 206 | + ->setReturnType('array') |
|
| 207 | + ->setVisibility('protected') |
|
| 208 | + ->addComment('@return array') |
|
| 209 | + ->setBody('return ' . var_export($elements, true) . ';'); |
|
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | /** |
@@ -60,14 +60,12 @@ |
||
| 60 | 60 | $getMethod = 'get' . $fieldname; |
| 61 | 61 | if ($element['is_dataprovider'] && $provider->{$getMethod}() instanceof AbstractDataProvider) { |
| 62 | 62 | $data[$fieldname] = $this->convertToArray($provider->{$getMethod}()); |
| 63 | - } |
|
| 64 | - elseif ($element['is_collection']) { |
|
| 63 | + } elseif ($element['is_collection']) { |
|
| 65 | 64 | $data[$fieldname] = []; |
| 66 | 65 | foreach ($provider->{$getMethod}() as $child) { |
| 67 | 66 | $data[$fieldname][] = $child->toArray(); |
| 68 | 67 | } |
| 69 | - } |
|
| 70 | - else { |
|
| 68 | + } else { |
|
| 71 | 69 | $data[$fieldname] = $provider->{$getMethod}(); |
| 72 | 70 | } |
| 73 | 71 | } |