@@ -78,8 +78,7 @@ |
||
78 | 78 | |
79 | 79 | $this->controller->setAddress( $entry->id, null ); |
80 | 80 | } |
81 | - } |
|
82 | - else |
|
81 | + } else |
|
83 | 82 | { |
84 | 83 | $this->controller->setAddress( $relId, null ); |
85 | 84 | } |
@@ -78,8 +78,7 @@ |
||
78 | 78 | |
79 | 79 | $this->controller->deleteProduct( $entry->id ); |
80 | 80 | } |
81 | - } |
|
82 | - else |
|
81 | + } else |
|
83 | 82 | { |
84 | 83 | $this->controller->deleteProduct( $relId ); |
85 | 84 | } |
@@ -78,8 +78,7 @@ |
||
78 | 78 | |
79 | 79 | $this->controller->deleteCoupon( $entry->id ); |
80 | 80 | } |
81 | - } |
|
82 | - else |
|
81 | + } else |
|
83 | 82 | { |
84 | 83 | $this->controller->deleteCoupon( $relId ); |
85 | 84 | } |
@@ -35,8 +35,7 @@ discard block |
||
35 | 35 | } |
36 | 36 | |
37 | 37 | |
38 | -$entryFcn = function( \Aimeos\MShop\Supplier\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) |
|
39 | -{ |
|
38 | +$entryFcn = function( \Aimeos\MShop\Supplier\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) { |
|
40 | 39 | $id = $item->getId(); |
41 | 40 | $type = $item->getResourceType(); |
42 | 41 | $params = array( 'resource' => $type, 'id' => $id ); |
@@ -83,8 +82,7 @@ discard block |
||
83 | 82 | }; |
84 | 83 | |
85 | 84 | |
86 | -$refFcn = function( \Aimeos\MShop\Common\Item\Iface $item, array $map ) use ( $fields, $target, $cntl, $action, $config, &$refFcn ) |
|
87 | -{ |
|
85 | +$refFcn = function( \Aimeos\MShop\Common\Item\Iface $item, array $map ) use ( $fields, $target, $cntl, $action, $config, &$refFcn ) { |
|
88 | 86 | $id = $item->getId(); |
89 | 87 | $type = $item->getResourceType(); |
90 | 88 | |
@@ -132,8 +130,7 @@ discard block |
||
132 | 130 | }; |
133 | 131 | |
134 | 132 | |
135 | -$inclFcn = function( \Aimeos\MShop\Common\Item\Iface $item ) use ( $refFcn ) |
|
136 | -{ |
|
133 | +$inclFcn = function( \Aimeos\MShop\Common\Item\Iface $item ) use ( $refFcn ) { |
|
137 | 134 | $map = []; |
138 | 135 | |
139 | 136 | if( $item instanceof \Aimeos\MShop\Supplier\Item\Iface ) |
@@ -164,8 +161,7 @@ discard block |
||
164 | 161 | }; |
165 | 162 | |
166 | 163 | |
167 | -$flatFcn = function( array $map ) |
|
168 | -{ |
|
164 | +$flatFcn = function( array $map ) { |
|
169 | 165 | $result = []; |
170 | 166 | |
171 | 167 | foreach( $map as $list ) |
@@ -230,8 +226,7 @@ discard block |
||
230 | 226 | $data[] = $entryFcn( $item ); |
231 | 227 | $included = array_merge( $included, $flatFcn( $inclFcn( $item ) ) ); |
232 | 228 | } |
233 | - } |
|
234 | - else |
|
229 | + } else |
|
235 | 230 | { |
236 | 231 | $data = $entryFcn( $items ); |
237 | 232 | $included = $flatFcn( $inclFcn( $items ) ); |
@@ -101,8 +101,7 @@ discard block |
||
101 | 101 | } |
102 | 102 | |
103 | 103 | |
104 | -$entryFcn = function( \Aimeos\MShop\Product\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) |
|
105 | -{ |
|
104 | +$entryFcn = function( \Aimeos\MShop\Product\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) { |
|
106 | 105 | $id = $item->getId(); |
107 | 106 | $attributes = $item->toArray(); |
108 | 107 | $type = $item->getResourceType(); |
@@ -150,8 +149,7 @@ discard block |
||
150 | 149 | }; |
151 | 150 | |
152 | 151 | |
153 | -$refFcn = function( \Aimeos\MShop\Common\Item\Iface $item, array $map ) use ( $fields, &$refFcn ) |
|
154 | -{ |
|
152 | +$refFcn = function( \Aimeos\MShop\Common\Item\Iface $item, array $map ) use ( $fields, &$refFcn ) { |
|
155 | 153 | $id = $item->getId(); |
156 | 154 | $type = $item->getResourceType(); |
157 | 155 | |
@@ -199,8 +197,7 @@ discard block |
||
199 | 197 | }; |
200 | 198 | |
201 | 199 | |
202 | -$inclFcn = function( \Aimeos\MShop\Common\Item\Iface $item ) use ( $refFcn ) |
|
203 | -{ |
|
200 | +$inclFcn = function( \Aimeos\MShop\Common\Item\Iface $item ) use ( $refFcn ) { |
|
204 | 201 | $map = []; |
205 | 202 | |
206 | 203 | if( $item instanceof \Aimeos\MShop\Common\Item\ListRef\Iface ) |
@@ -224,8 +221,7 @@ discard block |
||
224 | 221 | }; |
225 | 222 | |
226 | 223 | |
227 | -$flatFcn = function( array $map ) |
|
228 | -{ |
|
224 | +$flatFcn = function( array $map ) { |
|
229 | 225 | $result = []; |
230 | 226 | |
231 | 227 | foreach( $map as $list ) |
@@ -290,8 +286,7 @@ discard block |
||
290 | 286 | $data[] = $entryFcn( $item ); |
291 | 287 | $included = array_merge( $included, $flatFcn( $inclFcn( $item, [] ) ) ); |
292 | 288 | } |
293 | - } |
|
294 | - else |
|
289 | + } else |
|
295 | 290 | { |
296 | 291 | $data = $entryFcn( $items ); |
297 | 292 | $included = $flatFcn( $inclFcn( $items, [] ) ); |
@@ -24,8 +24,7 @@ discard block |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | |
27 | -$entryFcn = function( \Aimeos\MShop\Order\Item\Iface $item, \Aimeos\MShop\Common\Helper\Form\Iface $form = null ) use ( $fields, $target, $cntl, $action, $config ) |
|
28 | -{ |
|
27 | +$entryFcn = function( \Aimeos\MShop\Order\Item\Iface $item, \Aimeos\MShop\Common\Helper\Form\Iface $form = null ) use ( $fields, $target, $cntl, $action, $config ) { |
|
29 | 28 | $id = $item->getId(); |
30 | 29 | $attributes = $item->toArray(); |
31 | 30 | $type = $item->getResourceType(); |
@@ -96,8 +95,7 @@ discard block |
||
96 | 95 | foreach( $items as $item ) { |
97 | 96 | $data[] = $entryFcn( $item, $this->get( 'form' ) ); |
98 | 97 | } |
99 | - } |
|
100 | - else |
|
98 | + } else |
|
101 | 99 | { |
102 | 100 | $data = $entryFcn( $items, $this->get( 'form' ) ); |
103 | 101 | } |
@@ -35,8 +35,7 @@ discard block |
||
35 | 35 | } |
36 | 36 | |
37 | 37 | |
38 | -$entryFcn = function( \Aimeos\MShop\Attribute\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) |
|
39 | -{ |
|
38 | +$entryFcn = function( \Aimeos\MShop\Attribute\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) { |
|
40 | 39 | $id = $item->getId(); |
41 | 40 | $type = $item->getResourceType(); |
42 | 41 | $params = array( 'resource' => $type, 'id' => $id ); |
@@ -83,8 +82,7 @@ discard block |
||
83 | 82 | }; |
84 | 83 | |
85 | 84 | |
86 | -$refFcn = function( \Aimeos\MShop\Common\Item\Iface $item, array $map ) use ( $fields, &$refFcn ) |
|
87 | -{ |
|
85 | +$refFcn = function( \Aimeos\MShop\Common\Item\Iface $item, array $map ) use ( $fields, &$refFcn ) { |
|
88 | 86 | $id = $item->getId(); |
89 | 87 | $type = $item->getResourceType(); |
90 | 88 | |
@@ -132,8 +130,7 @@ discard block |
||
132 | 130 | }; |
133 | 131 | |
134 | 132 | |
135 | -$inclFcn = function( \Aimeos\MShop\Common\Item\Iface $item ) use ( $refFcn ) |
|
136 | -{ |
|
133 | +$inclFcn = function( \Aimeos\MShop\Common\Item\Iface $item ) use ( $refFcn ) { |
|
137 | 134 | $map = []; |
138 | 135 | |
139 | 136 | if( $item instanceof \Aimeos\MShop\Common\Item\ListRef\Iface ) |
@@ -157,8 +154,7 @@ discard block |
||
157 | 154 | }; |
158 | 155 | |
159 | 156 | |
160 | -$flatFcn = function( array $map ) |
|
161 | -{ |
|
157 | +$flatFcn = function( array $map ) { |
|
162 | 158 | $result = []; |
163 | 159 | |
164 | 160 | foreach( $map as $list ) |
@@ -222,8 +218,7 @@ discard block |
||
222 | 218 | $data[] = $entryFcn( $attrItem ); |
223 | 219 | $included = array_merge( $included, $flatFcn( $inclFcn( $attrItem ) ) ); |
224 | 220 | } |
225 | - } |
|
226 | - else |
|
221 | + } else |
|
227 | 222 | { |
228 | 223 | $data = $entryFcn( $items ); |
229 | 224 | $included = $flatFcn( $inclFcn( $items ) ); |
@@ -29,8 +29,7 @@ discard block |
||
29 | 29 | } |
30 | 30 | |
31 | 31 | |
32 | -$entryFcn = function( \Aimeos\MShop\Locale\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) |
|
33 | -{ |
|
32 | +$entryFcn = function( \Aimeos\MShop\Locale\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) { |
|
34 | 33 | $id = $item->getId(); |
35 | 34 | $attributes = $item->toArray(); |
36 | 35 | $type = $item->getResourceType(); |
@@ -98,8 +97,7 @@ discard block |
||
98 | 97 | foreach( $items as $localeItem ) { |
99 | 98 | $data[] = $entryFcn( $localeItem ); |
100 | 99 | } |
101 | - } |
|
102 | - else |
|
100 | + } else |
|
103 | 101 | { |
104 | 102 | $data = $entryFcn( $items ); |
105 | 103 | } |
@@ -35,8 +35,7 @@ discard block |
||
35 | 35 | } |
36 | 36 | |
37 | 37 | |
38 | -$entryFcn = function( \Aimeos\MShop\Stock\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) |
|
39 | -{ |
|
38 | +$entryFcn = function( \Aimeos\MShop\Stock\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) { |
|
40 | 39 | $id = $item->getId(); |
41 | 40 | $type = $item->getResourceType(); |
42 | 41 | $params = array( 'resource' => $type, 'id' => $id ); |
@@ -111,8 +110,7 @@ discard block |
||
111 | 110 | foreach( $items as $item ) { |
112 | 111 | $data[] = $entryFcn( $item ); |
113 | 112 | } |
114 | - } |
|
115 | - else |
|
113 | + } else |
|
116 | 114 | { |
117 | 115 | $data = $entryFcn( $items ); |
118 | 116 | } |