@@ -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 | } |
@@ -105,10 +105,10 @@ discard block |
||
| 105 | 105 | private function addGetter(ClassType $dataProvider, array $element, array $configs): void |
| 106 | 106 | { |
| 107 | 107 | $dataProvider->addMethod('get' . $this->formatElementName($element['name'], $configs)) |
| 108 | - ->addComment('@return ' . $element['type']) |
|
| 109 | - ->setVisibility('public') |
|
| 110 | - ->setBody('return $this->' . $element['name'] . ';') |
|
| 111 | - ->setReturnType($this->getTypeHint($element['type'], $element['allownull'])) |
|
| 108 | + ->addComment('@return ' . $element['type']) |
|
| 109 | + ->setVisibility('public') |
|
| 110 | + ->setBody('return $this->' . $element['name'] . ';') |
|
| 111 | + ->setReturnType($this->getTypeHint($element['type'], $element['allownull'])) |
|
| 112 | 112 | ; |
| 113 | 113 | } |
| 114 | 114 | |
@@ -120,9 +120,9 @@ discard block |
||
| 120 | 120 | private function addUnsetter(ClassType $dataProvider, array $element, array $configs): void |
| 121 | 121 | { |
| 122 | 122 | $dataProvider->addMethod('unset' . $this->formatElementName($element['name'], $configs)) |
| 123 | - ->addComment('@return ' . $dataProvider->getName()) |
|
| 124 | - ->setVisibility('public') |
|
| 125 | - ->setBody('$this->' . $element['name'] . ' = null;' . PHP_EOL . PHP_EOL . 'return $this;') |
|
| 123 | + ->addComment('@return ' . $dataProvider->getName()) |
|
| 124 | + ->setVisibility('public') |
|
| 125 | + ->setBody('$this->' . $element['name'] . ' = null;' . PHP_EOL . PHP_EOL . 'return $this;') |
|
| 126 | 126 | ; |
| 127 | 127 | } |
| 128 | 128 | |
@@ -134,11 +134,11 @@ discard block |
||
| 134 | 134 | private function addHas(ClassType $dataProvider, array $element, array $configs): void |
| 135 | 135 | { |
| 136 | 136 | $dataProvider->addMethod('has' . $this->formatElementName($element['name'], $configs)) |
| 137 | - ->addComment('@return bool') |
|
| 138 | - ->setVisibility('public') |
|
| 139 | - ->setBody( |
|
| 140 | - 'return ($this->' . $element['name'] . ' !== null && $this->' . $element['name'] . ' !== []);' |
|
| 141 | - ) |
|
| 137 | + ->addComment('@return bool') |
|
| 138 | + ->setVisibility('public') |
|
| 139 | + ->setBody( |
|
| 140 | + 'return ($this->' . $element['name'] . ' !== null && $this->' . $element['name'] . ' !== []);' |
|
| 141 | + ) |
|
| 142 | 142 | ; |
| 143 | 143 | } |
| 144 | 144 | |
@@ -150,16 +150,16 @@ discard block |
||
| 150 | 150 | private function addSetter(ClassType $dataProvider, array $element, array $configs): void |
| 151 | 151 | { |
| 152 | 152 | $setter = $dataProvider->addMethod('set' . $this->formatElementName($element['name'], $configs)) |
| 153 | - ->addComment( |
|
| 154 | - '@param ' . $element['type'] . ' $' |
|
| 155 | - . $element['name'] |
|
| 156 | - ) |
|
| 157 | - ->addComment('@return ' . $dataProvider->getName()) |
|
| 158 | - ->setVisibility('public') |
|
| 159 | - ->setBody( |
|
| 160 | - '$this->' . $element['name'] . ' = $' . $element['name'] . ';' . PHP_EOL . PHP_EOL |
|
| 161 | - . 'return $this;' |
|
| 162 | - ) |
|
| 153 | + ->addComment( |
|
| 154 | + '@param ' . $element['type'] . ' $' |
|
| 155 | + . $element['name'] |
|
| 156 | + ) |
|
| 157 | + ->addComment('@return ' . $dataProvider->getName()) |
|
| 158 | + ->setVisibility('public') |
|
| 159 | + ->setBody( |
|
| 160 | + '$this->' . $element['name'] . ' = $' . $element['name'] . ';' . PHP_EOL . PHP_EOL |
|
| 161 | + . 'return $this;' |
|
| 162 | + ) |
|
| 163 | 163 | ; |
| 164 | 164 | |
| 165 | 165 | $param = $setter->addParameter($element['name']) |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | ; |
| 205 | 205 | |
| 206 | 206 | $singleSetter->addParameter($element['singleton']) |
| 207 | - ->setTypeHint($element['singleton_type']) |
|
| 207 | + ->setTypeHint($element['singleton_type']) |
|
| 208 | 208 | ; |
| 209 | 209 | } |
| 210 | 210 | } |
@@ -216,8 +216,8 @@ discard block |
||
| 216 | 216 | private function addProperty(ClassType $dataProvider, array $element): void |
| 217 | 217 | { |
| 218 | 218 | $property = $dataProvider->addProperty($element['name']) |
| 219 | - ->setVisibility('protected') |
|
| 220 | - ->addComment('@var ' . $element['type']) |
|
| 219 | + ->setVisibility('protected') |
|
| 220 | + ->addComment('@var ' . $element['type']) |
|
| 221 | 221 | ; |
| 222 | 222 | |
| 223 | 223 | if ($element['default']) { |
@@ -255,10 +255,10 @@ discard block |
||
| 255 | 255 | private function addElementsGetter(ClassType $dataProvider, array $elements): void |
| 256 | 256 | { |
| 257 | 257 | $dataProvider->addMethod('getElements') |
| 258 | - ->setReturnType('array') |
|
| 259 | - ->setVisibility('protected') |
|
| 260 | - ->addComment('@return array') |
|
| 261 | - ->setBody('return ' . var_export($elements, true) . ';') |
|
| 258 | + ->setReturnType('array') |
|
| 259 | + ->setVisibility('protected') |
|
| 260 | + ->addComment('@return array') |
|
| 261 | + ->setBody('return ' . var_export($elements, true) . ';') |
|
| 262 | 262 | ; |
| 263 | 263 | } |
| 264 | 264 | |
@@ -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 | } |