@@ -96,8 +96,7 @@ |
||
96 | 96 | $files[] = $entry->getPathname(); |
97 | 97 | } |
98 | 98 | } |
99 | - } |
|
100 | - else |
|
99 | + } else |
|
101 | 100 | { |
102 | 101 | $files[] = $location; |
103 | 102 | } |
@@ -81,8 +81,7 @@ discard block |
||
81 | 81 | foreach( $manager->search( $search ) as $item ) { |
82 | 82 | $this->listTypes[$item->getCode()] = $item->getCode(); |
83 | 83 | } |
84 | - } |
|
85 | - else |
|
84 | + } else |
|
86 | 85 | { |
87 | 86 | $this->listTypes = array_flip( $this->listTypes ); |
88 | 87 | } |
@@ -159,8 +158,7 @@ discard block |
||
159 | 158 | $listItem = $listMap[$url][$type][$listtype]; |
160 | 159 | $refItem = $listItem->getRefItem(); |
161 | 160 | unset( $listItems[$listItem->getId()] ); |
162 | - } |
|
163 | - else |
|
161 | + } else |
|
164 | 162 | { |
165 | 163 | $listItem = $listManager->create()->setType( $listtype ); |
166 | 164 | $refItem = $manager->create()->setType( $type ); |
@@ -81,8 +81,7 @@ discard block |
||
81 | 81 | foreach( $manager->search( $search ) as $item ) { |
82 | 82 | $this->listTypes[$item->getCode()] = $item->getCode(); |
83 | 83 | } |
84 | - } |
|
85 | - else |
|
84 | + } else |
|
86 | 85 | { |
87 | 86 | $this->listTypes = array_flip( $this->listTypes ); |
88 | 87 | } |
@@ -137,8 +136,7 @@ discard block |
||
137 | 136 | $listItem = $listMap[$content][$type][$listtype]; |
138 | 137 | $refItem = $listItem->getRefItem(); |
139 | 138 | unset( $listItems[$listItem->getId()] ); |
140 | - } |
|
141 | - else |
|
139 | + } else |
|
142 | 140 | { |
143 | 141 | $listItem = $listManager->create()->setType( $listtype ); |
144 | 142 | $refItem = $manager->create()->setType( $type ); |
@@ -65,8 +65,7 @@ |
||
65 | 65 | { |
66 | 66 | $item = $propMap[$value][$type]; |
67 | 67 | $items->remove( $item->getId() ); |
68 | - } |
|
69 | - else |
|
68 | + } else |
|
70 | 69 | { |
71 | 70 | $item = $manager->create()->setType( $type ); |
72 | 71 | } |
@@ -81,8 +81,7 @@ discard block |
||
81 | 81 | foreach( $manager->search( $search ) as $item ) { |
82 | 82 | $this->listTypes[$item->getCode()] = $item->getCode(); |
83 | 83 | } |
84 | - } |
|
85 | - else |
|
84 | + } else |
|
86 | 85 | { |
87 | 86 | $this->listTypes = array_flip( $this->listTypes ); |
88 | 87 | } |
@@ -166,8 +165,7 @@ discard block |
||
166 | 165 | { |
167 | 166 | $listItem = $listMap[$catid][$listtype]; |
168 | 167 | unset( $listItems[$listItem->getId()] ); |
169 | - } |
|
170 | - else |
|
168 | + } else |
|
171 | 169 | { |
172 | 170 | $listItem = $listManager->create()->setType( $listtype ); |
173 | 171 | } |
@@ -81,8 +81,7 @@ discard block |
||
81 | 81 | foreach( $manager->search( $search ) as $item ) { |
82 | 82 | $this->listTypes[$item->getCode()] = $item->getCode(); |
83 | 83 | } |
84 | - } |
|
85 | - else |
|
84 | + } else |
|
86 | 85 | { |
87 | 86 | $this->listTypes = array_flip( $this->listTypes ); |
88 | 87 | } |
@@ -141,8 +140,7 @@ discard block |
||
141 | 140 | $listItem = $listMap[$content][$language][$type][$listtype]; |
142 | 141 | $refItem = $listItem->getRefItem(); |
143 | 142 | unset( $listItems[$listItem->getId()] ); |
144 | - } |
|
145 | - else |
|
143 | + } else |
|
146 | 144 | { |
147 | 145 | $listItem = $listManager->create()->setType( $listtype ); |
148 | 146 | $refItem = $manager->create()->setType( $type ); |
@@ -86,8 +86,7 @@ |
||
86 | 86 | $listItem = $map[$parentid][$type]; |
87 | 87 | unset( $listItems[$map[$parentid][$type]->getId()] ); |
88 | 88 | unset( $map[$parentid][$type] ); |
89 | - } |
|
90 | - else |
|
89 | + } else |
|
91 | 90 | { |
92 | 91 | $listItem = $listManager->create(); |
93 | 92 | } |
@@ -95,8 +95,7 @@ discard block |
||
95 | 95 | $files[] = $entry->getPathname(); |
96 | 96 | } |
97 | 97 | } |
98 | - } |
|
99 | - else |
|
98 | + } else |
|
100 | 99 | { |
101 | 100 | $files[] = $location; |
102 | 101 | } |
@@ -240,7 +239,9 @@ discard block |
||
240 | 239 | |
241 | 240 | return $currentid; |
242 | 241 | } |
243 | - catch( \Aimeos\MShop\Exception $e ) {} // not found, create new |
|
242 | + catch( \Aimeos\MShop\Exception $e ) |
|
243 | + { |
|
244 | +} // not found, create new |
|
244 | 245 | } |
245 | 246 | |
246 | 247 | $item = $this->process( $manager->create(), $node ); |
@@ -278,13 +279,11 @@ discard block |
||
278 | 279 | |
279 | 280 | $currentid = $this->importNode( $node, $domains, $parentid, $childMap ); |
280 | 281 | $total++; |
281 | - } |
|
282 | - elseif( $xml->nodeType === \XMLReader::ELEMENT && $xml->name === 'catalog' ) |
|
282 | + } elseif( $xml->nodeType === \XMLReader::ELEMENT && $xml->name === 'catalog' ) |
|
283 | 283 | { |
284 | 284 | $this->importTree( $xml, $domains, $currentid, $childMap ); |
285 | 285 | $childMap = []; |
286 | - } |
|
287 | - elseif( $xml->nodeType === \XMLReader::END_ELEMENT && $xml->name === 'catalog' ) |
|
286 | + } elseif( $xml->nodeType === \XMLReader::END_ELEMENT && $xml->name === 'catalog' ) |
|
288 | 287 | { |
289 | 288 | \Aimeos\MShop::create( $this->getContext(), 'catalog' )->delete( $map ); |
290 | 289 | break; |
@@ -82,8 +82,7 @@ discard block |
||
82 | 82 | foreach( $manager->search( $search ) as $item ) { |
83 | 83 | $this->listTypes[$item->getCode()] = $item->getCode(); |
84 | 84 | } |
85 | - } |
|
86 | - else |
|
85 | + } else |
|
87 | 86 | { |
88 | 87 | $this->listTypes = array_flip( $this->listTypes ); |
89 | 88 | } |
@@ -147,8 +146,7 @@ discard block |
||
147 | 146 | { |
148 | 147 | $listItem = $listMap[$code][$attrType][$listtype]; |
149 | 148 | unset( $listItems[$listItem->getId()] ); |
150 | - } |
|
151 | - else |
|
149 | + } else |
|
152 | 150 | { |
153 | 151 | $listItem = $listManager->create()->setType( $listtype ); |
154 | 152 | } |