@@ -43,10 +43,10 @@ discard block |
||
43 | 43 | * @param array $mapping Associative list of field position in CSV as key and domain item key as value |
44 | 44 | * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor |
45 | 45 | */ |
46 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
47 | - \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null ) |
|
46 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
47 | + \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null) |
|
48 | 48 | { |
49 | - parent::__construct( $context, $mapping, $object ); |
|
49 | + parent::__construct($context, $mapping, $object); |
|
50 | 50 | |
51 | 51 | /** controller/common/product/import/csv/processor/attribute/listtypes |
52 | 52 | * Names of the product list types for attributes that are updated or removed |
@@ -67,9 +67,9 @@ discard block |
||
67 | 67 | * @see controller/common/product/import/csv/processor/price/listtypes |
68 | 68 | * @see controller/common/product/import/csv/processor/text/listtypes |
69 | 69 | */ |
70 | - $this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/attribute/listtypes'); |
|
70 | + $this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/attribute/listtypes'); |
|
71 | 71 | |
72 | - $this->cache = $this->getCache( 'attribute' ); |
|
72 | + $this->cache = $this->getCache('attribute'); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | |
@@ -80,71 +80,71 @@ discard block |
||
80 | 80 | * @param array $data List of CSV fields with position as key and data as value |
81 | 81 | * @return array List of data which hasn't been imported |
82 | 82 | */ |
83 | - public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data ) |
|
83 | + public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data) |
|
84 | 84 | { |
85 | 85 | $context = $this->getContext(); |
86 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' ); |
|
87 | - $listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' ); |
|
88 | - $separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" ); |
|
86 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'attribute'); |
|
87 | + $listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists'); |
|
88 | + $separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n"); |
|
89 | 89 | |
90 | 90 | $manager->begin(); |
91 | 91 | |
92 | 92 | try |
93 | 93 | { |
94 | 94 | $listMap = []; |
95 | - $map = $this->getMappedChunk( $data, $this->getMapping() ); |
|
96 | - $listItems = $product->getListItems( 'attribute', $this->listTypes ); |
|
95 | + $map = $this->getMappedChunk($data, $this->getMapping()); |
|
96 | + $listItems = $product->getListItems('attribute', $this->listTypes); |
|
97 | 97 | |
98 | - foreach( $listItems as $listItem ) |
|
98 | + foreach ($listItems as $listItem) |
|
99 | 99 | { |
100 | - if( ( $refItem = $listItem->getRefItem() ) !== null ) { |
|
101 | - $listMap[ $refItem->getCode() ][ $listItem->getType() ] = $listItem; |
|
100 | + if (($refItem = $listItem->getRefItem()) !== null) { |
|
101 | + $listMap[$refItem->getCode()][$listItem->getType()] = $listItem; |
|
102 | 102 | } |
103 | 103 | } |
104 | 104 | |
105 | - foreach( $map as $pos => $list ) |
|
105 | + foreach ($map as $pos => $list) |
|
106 | 106 | { |
107 | - if( $this->checkEntry( $list ) === false ) { |
|
107 | + if ($this->checkEntry($list) === false) { |
|
108 | 108 | continue; |
109 | 109 | } |
110 | 110 | |
111 | - $codes = explode( $separator, $list['attribute.code'] ); |
|
111 | + $codes = explode($separator, $list['attribute.code']); |
|
112 | 112 | |
113 | - foreach( $codes as $code ) |
|
113 | + foreach ($codes as $code) |
|
114 | 114 | { |
115 | - $attrItem = $this->getAttributeItem( $code, $list['attribute.type'] ); |
|
116 | - $attrItem->fromArray( $list ); |
|
117 | - $attrItem->setCode( $code ); |
|
118 | - $manager->saveItem( $attrItem ); |
|
115 | + $attrItem = $this->getAttributeItem($code, $list['attribute.type']); |
|
116 | + $attrItem->fromArray($list); |
|
117 | + $attrItem->setCode($code); |
|
118 | + $manager->saveItem($attrItem); |
|
119 | 119 | |
120 | - $typecode = $this->getValue( $list, 'product.lists.type', 'default' ); |
|
121 | - $list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'attribute', $typecode ); |
|
120 | + $typecode = $this->getValue($list, 'product.lists.type', 'default'); |
|
121 | + $list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'attribute', $typecode); |
|
122 | 122 | $list['product.lists.refid'] = $attrItem->getId(); |
123 | 123 | $list['product.lists.parentid'] = $product->getId(); |
124 | 124 | $list['product.lists.domain'] = 'attribute'; |
125 | 125 | |
126 | - if( isset( $listMap[$code][$typecode] ) ) |
|
126 | + if (isset($listMap[$code][$typecode])) |
|
127 | 127 | { |
128 | 128 | $listItem = $listMap[$code][$typecode]; |
129 | - unset( $listItems[ $listItem->getId() ] ); |
|
129 | + unset($listItems[$listItem->getId()]); |
|
130 | 130 | } |
131 | 131 | else |
132 | 132 | { |
133 | 133 | $listItem = $listManager->createItem(); |
134 | 134 | } |
135 | 135 | |
136 | - $listItem->fromArray( $this->addListItemDefaults( $list, $pos ) ); |
|
137 | - $listManager->saveItem( $listItem ); |
|
136 | + $listItem->fromArray($this->addListItemDefaults($list, $pos)); |
|
137 | + $listManager->saveItem($listItem); |
|
138 | 138 | } |
139 | 139 | } |
140 | 140 | |
141 | - $listManager->deleteItems( array_keys( $listItems ) ); |
|
141 | + $listManager->deleteItems(array_keys($listItems)); |
|
142 | 142 | |
143 | - $data = $this->getObject()->process( $product, $data ); |
|
143 | + $data = $this->getObject()->process($product, $data); |
|
144 | 144 | |
145 | 145 | $manager->commit(); |
146 | 146 | } |
147 | - catch( \Exception $e ) |
|
147 | + catch (\Exception $e) |
|
148 | 148 | { |
149 | 149 | $manager->rollback(); |
150 | 150 | throw $e; |
@@ -160,11 +160,11 @@ discard block |
||
160 | 160 | * @param array $list Associative list of key/value pairs from the mapped data |
161 | 161 | * @return boolean True if the entry is valid, false if not |
162 | 162 | */ |
163 | - protected function checkEntry( array $list ) |
|
163 | + protected function checkEntry(array $list) |
|
164 | 164 | { |
165 | - if( !isset( $list['attribute.code'] ) || $list['attribute.code'] === '' || $list['attribute.type'] === '' |
|
166 | - || isset( $list['product.lists.type'] ) && $this->listTypes !== null |
|
167 | - && !in_array( $list['product.lists.type'], (array) $this->listTypes ) |
|
165 | + if (!isset($list['attribute.code']) || $list['attribute.code'] === '' || $list['attribute.type'] === '' |
|
166 | + || isset($list['product.lists.type']) && $this->listTypes !== null |
|
167 | + && !in_array($list['product.lists.type'], (array) $this->listTypes) |
|
168 | 168 | ) { |
169 | 169 | return false; |
170 | 170 | } |
@@ -180,22 +180,22 @@ discard block |
||
180 | 180 | * @param string $type Attribute type |
181 | 181 | * @return \Aimeos\MShop\Attribute\Item\Iface Attribute item object |
182 | 182 | */ |
183 | - protected function getAttributeItem( $code, $type ) |
|
183 | + protected function getAttributeItem($code, $type) |
|
184 | 184 | { |
185 | - if( ( $item = $this->cache->get( $code, $type ) ) === null ) |
|
185 | + if (($item = $this->cache->get($code, $type)) === null) |
|
186 | 186 | { |
187 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' ); |
|
187 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute'); |
|
188 | 188 | |
189 | 189 | $item = $manager->createItem(); |
190 | - $item->setTypeId( $this->getTypeId( 'attribute/type', 'product', $type ) ); |
|
191 | - $item->setDomain( 'product' ); |
|
192 | - $item->setLabel( $type . ' ' . $code ); |
|
193 | - $item->setCode( $code ); |
|
194 | - $item->setStatus( 1 ); |
|
190 | + $item->setTypeId($this->getTypeId('attribute/type', 'product', $type)); |
|
191 | + $item->setDomain('product'); |
|
192 | + $item->setLabel($type . ' ' . $code); |
|
193 | + $item->setCode($code); |
|
194 | + $item->setStatus(1); |
|
195 | 195 | |
196 | - $manager->saveItem( $item ); |
|
196 | + $manager->saveItem($item); |
|
197 | 197 | |
198 | - $this->cache->set( $item ); |
|
198 | + $this->cache->set($item); |
|
199 | 199 | } |
200 | 200 | |
201 | 201 | return $item; |
@@ -42,10 +42,10 @@ discard block |
||
42 | 42 | * @param array $mapping Associative list of field position in CSV as key and domain item key as value |
43 | 43 | * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor |
44 | 44 | */ |
45 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
46 | - \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null ) |
|
45 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
46 | + \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null) |
|
47 | 47 | { |
48 | - parent::__construct( $context, $mapping, $object ); |
|
48 | + parent::__construct($context, $mapping, $object); |
|
49 | 49 | |
50 | 50 | /** controller/common/product/import/csv/processor/price/listtypes |
51 | 51 | * Names of the product list types for prices that are updated or removed |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * @see controller/common/product/import/csv/processor/product/listtypes |
67 | 67 | * @see controller/common/product/import/csv/processor/text/listtypes |
68 | 68 | */ |
69 | - $this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/price/listtypes' ); |
|
69 | + $this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/price/listtypes'); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | |
@@ -77,40 +77,40 @@ discard block |
||
77 | 77 | * @param array $data List of CSV fields with position as key and data as value |
78 | 78 | * @return array List of data which hasn't been imported |
79 | 79 | */ |
80 | - public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data ) |
|
80 | + public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data) |
|
81 | 81 | { |
82 | - $listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' ); |
|
83 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'price' ); |
|
82 | + $listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists'); |
|
83 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'price'); |
|
84 | 84 | $manager->begin(); |
85 | 85 | |
86 | 86 | try |
87 | 87 | { |
88 | 88 | $delete = $listMap = []; |
89 | - $map = $this->getMappedChunk( $data, $this->getMapping() ); |
|
90 | - $listItems = $product->getListItems( 'price', $this->listTypes ); |
|
89 | + $map = $this->getMappedChunk($data, $this->getMapping()); |
|
90 | + $listItems = $product->getListItems('price', $this->listTypes); |
|
91 | 91 | |
92 | - foreach( $listItems as $listItem ) |
|
92 | + foreach ($listItems as $listItem) |
|
93 | 93 | { |
94 | - if( ( $refItem = $listItem->getRefItem() ) !== null ) { |
|
95 | - $listMap[ $refItem->getValue() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem; |
|
94 | + if (($refItem = $listItem->getRefItem()) !== null) { |
|
95 | + $listMap[$refItem->getValue()][$refItem->getType()][$listItem->getType()] = $listItem; |
|
96 | 96 | } |
97 | 97 | } |
98 | 98 | |
99 | - foreach( $map as $pos => $list ) |
|
99 | + foreach ($map as $pos => $list) |
|
100 | 100 | { |
101 | - if( $this->checkEntry( $list ) === false ) { |
|
101 | + if ($this->checkEntry($list) === false) { |
|
102 | 102 | continue; |
103 | 103 | } |
104 | 104 | |
105 | - $value = ( isset( $list['price.value'] ) ? $list['price.value'] : '0.00' ); |
|
106 | - $type = ( isset( $list['price.type'] ) ? $list['price.type'] : 'default' ); |
|
107 | - $typecode = ( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' ); |
|
105 | + $value = (isset($list['price.value']) ? $list['price.value'] : '0.00'); |
|
106 | + $type = (isset($list['price.type']) ? $list['price.type'] : 'default'); |
|
107 | + $typecode = (isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default'); |
|
108 | 108 | |
109 | - if( isset( $listMap[$value][$type][$typecode] ) ) |
|
109 | + if (isset($listMap[$value][$type][$typecode])) |
|
110 | 110 | { |
111 | 111 | $listItem = $listMap[$value][$type][$typecode]; |
112 | 112 | $refItem = $listItem->getRefItem(); |
113 | - unset( $listItems[ $listItem->getId() ] ); |
|
113 | + unset($listItems[$listItem->getId()]); |
|
114 | 114 | } |
115 | 115 | else |
116 | 116 | { |
@@ -118,33 +118,33 @@ discard block |
||
118 | 118 | $refItem = $manager->createItem(); |
119 | 119 | } |
120 | 120 | |
121 | - $list['price.typeid'] = $this->getTypeId( 'price/type', 'product', $type ); |
|
121 | + $list['price.typeid'] = $this->getTypeId('price/type', 'product', $type); |
|
122 | 122 | $list['price.domain'] = 'product'; |
123 | 123 | |
124 | - $refItem->fromArray( $this->addItemDefaults( $list ) ); |
|
125 | - $manager->saveItem( $refItem ); |
|
124 | + $refItem->fromArray($this->addItemDefaults($list)); |
|
125 | + $manager->saveItem($refItem); |
|
126 | 126 | |
127 | - $list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'price', $typecode ); |
|
127 | + $list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'price', $typecode); |
|
128 | 128 | $list['product.lists.parentid'] = $product->getId(); |
129 | 129 | $list['product.lists.refid'] = $refItem->getId(); |
130 | 130 | $list['product.lists.domain'] = 'price'; |
131 | 131 | |
132 | - $listItem->fromArray( $this->addListItemDefaults( $list, $pos ) ); |
|
133 | - $listManager->saveItem( $listItem ); |
|
132 | + $listItem->fromArray($this->addListItemDefaults($list, $pos)); |
|
133 | + $listManager->saveItem($listItem); |
|
134 | 134 | } |
135 | 135 | |
136 | - foreach( $listItems as $listItem ) { |
|
136 | + foreach ($listItems as $listItem) { |
|
137 | 137 | $delete[] = $listItem->getRefId(); |
138 | 138 | } |
139 | 139 | |
140 | - $manager->deleteItems( $delete ); |
|
141 | - $listManager->deleteItems( array_keys( $listItems ) ); |
|
140 | + $manager->deleteItems($delete); |
|
141 | + $listManager->deleteItems(array_keys($listItems)); |
|
142 | 142 | |
143 | - $data = $this->getObject()->process( $product, $data ); |
|
143 | + $data = $this->getObject()->process($product, $data); |
|
144 | 144 | |
145 | 145 | $manager->commit(); |
146 | 146 | } |
147 | - catch( \Exception $e ) |
|
147 | + catch (\Exception $e) |
|
148 | 148 | { |
149 | 149 | $manager->rollback(); |
150 | 150 | throw $e; |
@@ -160,17 +160,17 @@ discard block |
||
160 | 160 | * @param array $list Associative list of domain item keys and their values, e.g. "price.status" => 1 |
161 | 161 | * @return array Given associative list enriched by default values if they were not already set |
162 | 162 | */ |
163 | - protected function addItemDefaults( array $list ) |
|
163 | + protected function addItemDefaults(array $list) |
|
164 | 164 | { |
165 | - if( !isset( $list['price.currencyid'] ) ) { |
|
165 | + if (!isset($list['price.currencyid'])) { |
|
166 | 166 | $list['price.currencyid'] = $this->getContext()->getLocale()->getCurrencyId(); |
167 | 167 | } |
168 | 168 | |
169 | - if( !isset( $list['price.label'] ) ) { |
|
169 | + if (!isset($list['price.label'])) { |
|
170 | 170 | $list['price.label'] = $list['price.currencyid'] . ' ' . $list['price.value']; |
171 | 171 | } |
172 | 172 | |
173 | - if( !isset( $list['price.status'] ) ) { |
|
173 | + if (!isset($list['price.status'])) { |
|
174 | 174 | $list['price.status'] = 1; |
175 | 175 | } |
176 | 176 | |
@@ -184,10 +184,10 @@ discard block |
||
184 | 184 | * @param array $list Associative list of key/value pairs from the mapping |
185 | 185 | * @return boolean True if valid, false if not |
186 | 186 | */ |
187 | - protected function checkEntry( array $list ) |
|
187 | + protected function checkEntry(array $list) |
|
188 | 188 | { |
189 | - if( !isset( $list['price.value'] ) || $list['price.value'] === '' || isset( $list['product.lists.type'] ) |
|
190 | - && $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes ) |
|
189 | + if (!isset($list['price.value']) || $list['price.value'] === '' || isset($list['product.lists.type']) |
|
190 | + && $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes) |
|
191 | 191 | ) { |
192 | 192 | return false; |
193 | 193 | } |
@@ -42,10 +42,10 @@ discard block |
||
42 | 42 | * @param array $mapping Associative list of field position in CSV as key and domain item key as value |
43 | 43 | * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor |
44 | 44 | */ |
45 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
46 | - \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null ) |
|
45 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
46 | + \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null) |
|
47 | 47 | { |
48 | - parent::__construct( $context, $mapping, $object ); |
|
48 | + parent::__construct($context, $mapping, $object); |
|
49 | 49 | |
50 | 50 | /** controller/common/product/import/csv/processor/media/listtypes |
51 | 51 | * Names of the product list types for media that are updated or removed |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * @see controller/common/product/import/csv/processor/price/listtypes |
67 | 67 | * @see controller/common/product/import/csv/processor/text/listtypes |
68 | 68 | */ |
69 | - $this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/media/listtypes' ); |
|
69 | + $this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/media/listtypes'); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | |
@@ -77,45 +77,45 @@ discard block |
||
77 | 77 | * @param array $data List of CSV fields with position as key and data as value |
78 | 78 | * @return array List of data which hasn't been imported |
79 | 79 | */ |
80 | - public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data ) |
|
80 | + public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data) |
|
81 | 81 | { |
82 | 82 | $context = $this->getContext(); |
83 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'media' ); |
|
84 | - $listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' ); |
|
85 | - $separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" ); |
|
83 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'media'); |
|
84 | + $listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists'); |
|
85 | + $separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n"); |
|
86 | 86 | |
87 | 87 | $manager->begin(); |
88 | 88 | |
89 | 89 | try |
90 | 90 | { |
91 | 91 | $delete = $listMap = []; |
92 | - $map = $this->getMappedChunk( $data, $this->getMapping() ); |
|
93 | - $listItems = $product->getListItems( 'media', $this->listTypes ); |
|
92 | + $map = $this->getMappedChunk($data, $this->getMapping()); |
|
93 | + $listItems = $product->getListItems('media', $this->listTypes); |
|
94 | 94 | |
95 | - foreach( $listItems as $listItem ) |
|
95 | + foreach ($listItems as $listItem) |
|
96 | 96 | { |
97 | - if( ( $refItem = $listItem->getRefItem() ) !== null ) { |
|
98 | - $listMap[ $refItem->getUrl() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem; |
|
97 | + if (($refItem = $listItem->getRefItem()) !== null) { |
|
98 | + $listMap[$refItem->getUrl()][$refItem->getType()][$listItem->getType()] = $listItem; |
|
99 | 99 | } |
100 | 100 | } |
101 | 101 | |
102 | - foreach( $map as $pos => $list ) |
|
102 | + foreach ($map as $pos => $list) |
|
103 | 103 | { |
104 | - if( $this->checkEntry( $list ) === false ) { |
|
104 | + if ($this->checkEntry($list) === false) { |
|
105 | 105 | continue; |
106 | 106 | } |
107 | 107 | |
108 | - $urls = explode( $separator, $list['media.url'] ); |
|
109 | - $type = $this->getValue( $list, 'media.type', 'default' ); |
|
110 | - $typecode = $this->getValue( $list, 'product.lists.type', 'default' ); |
|
108 | + $urls = explode($separator, $list['media.url']); |
|
109 | + $type = $this->getValue($list, 'media.type', 'default'); |
|
110 | + $typecode = $this->getValue($list, 'product.lists.type', 'default'); |
|
111 | 111 | |
112 | - foreach( $urls as $url ) |
|
112 | + foreach ($urls as $url) |
|
113 | 113 | { |
114 | - if( isset( $listMap[$url][$type][$typecode] ) ) |
|
114 | + if (isset($listMap[$url][$type][$typecode])) |
|
115 | 115 | { |
116 | 116 | $listItem = $listMap[$url][$type][$typecode]; |
117 | 117 | $refItem = $listItem->getRefItem(); |
118 | - unset( $listItems[ $listItem->getId() ] ); |
|
118 | + unset($listItems[$listItem->getId()]); |
|
119 | 119 | } |
120 | 120 | else |
121 | 121 | { |
@@ -123,35 +123,35 @@ discard block |
||
123 | 123 | $refItem = $manager->createItem(); |
124 | 124 | } |
125 | 125 | |
126 | - $list['media.typeid'] = $this->getTypeId( 'media/type', 'product', $type ); |
|
126 | + $list['media.typeid'] = $this->getTypeId('media/type', 'product', $type); |
|
127 | 127 | $list['media.domain'] = 'product'; |
128 | 128 | $list['media.url'] = $url; |
129 | 129 | |
130 | - $refItem->fromArray( $this->addItemDefaults( $list ) ); |
|
131 | - $manager->saveItem( $refItem ); |
|
130 | + $refItem->fromArray($this->addItemDefaults($list)); |
|
131 | + $manager->saveItem($refItem); |
|
132 | 132 | |
133 | - $list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'media', $typecode ); |
|
133 | + $list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'media', $typecode); |
|
134 | 134 | $list['product.lists.parentid'] = $product->getId(); |
135 | 135 | $list['product.lists.refid'] = $refItem->getId(); |
136 | 136 | $list['product.lists.domain'] = 'media'; |
137 | 137 | |
138 | - $listItem->fromArray( $this->addListItemDefaults( $list, $pos++ ) ); |
|
139 | - $listManager->saveItem( $listItem ); |
|
138 | + $listItem->fromArray($this->addListItemDefaults($list, $pos++)); |
|
139 | + $listManager->saveItem($listItem); |
|
140 | 140 | } |
141 | 141 | } |
142 | 142 | |
143 | - foreach( $listItems as $listItem ) { |
|
143 | + foreach ($listItems as $listItem) { |
|
144 | 144 | $delete[] = $listItem->getRefId(); |
145 | 145 | } |
146 | 146 | |
147 | - $manager->deleteItems( $delete ); |
|
148 | - $listManager->deleteItems( array_keys( $listItems ) ); |
|
147 | + $manager->deleteItems($delete); |
|
148 | + $listManager->deleteItems(array_keys($listItems)); |
|
149 | 149 | |
150 | - $data = $this->getObject()->process( $product, $data ); |
|
150 | + $data = $this->getObject()->process($product, $data); |
|
151 | 151 | |
152 | 152 | $manager->commit(); |
153 | 153 | } |
154 | - catch( \Exception $e ) |
|
154 | + catch (\Exception $e) |
|
155 | 155 | { |
156 | 156 | $manager->rollback(); |
157 | 157 | throw $e; |
@@ -167,17 +167,17 @@ discard block |
||
167 | 167 | * @param array $list Associative list of domain item keys and their values, e.g. "media.status" => 1 |
168 | 168 | * @return array Given associative list enriched by default values if they were not already set |
169 | 169 | */ |
170 | - protected function addItemDefaults( array $list ) |
|
170 | + protected function addItemDefaults(array $list) |
|
171 | 171 | { |
172 | - if( !isset( $list['media.label'] ) ) { |
|
172 | + if (!isset($list['media.label'])) { |
|
173 | 173 | $list['media.label'] = $list['media.url']; |
174 | 174 | } |
175 | 175 | |
176 | - if( !isset( $list['media.preview'] ) ) { |
|
176 | + if (!isset($list['media.preview'])) { |
|
177 | 177 | $list['media.preview'] = $list['media.url']; |
178 | 178 | } |
179 | 179 | |
180 | - if( !isset( $list['media.status'] ) ) { |
|
180 | + if (!isset($list['media.status'])) { |
|
181 | 181 | $list['media.status'] = 1; |
182 | 182 | } |
183 | 183 | |
@@ -191,10 +191,10 @@ discard block |
||
191 | 191 | * @param array $list Associative list of key/value pairs from the mapping |
192 | 192 | * @return boolean True if valid, false if not |
193 | 193 | */ |
194 | - protected function checkEntry( array $list ) |
|
194 | + protected function checkEntry(array $list) |
|
195 | 195 | { |
196 | - if( !isset( $list['media.url'] ) || $list['media.url'] === '' || isset( $list['product.lists.type'] ) |
|
197 | - && $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes ) |
|
196 | + if (!isset($list['media.url']) || $list['media.url'] === '' || isset($list['product.lists.type']) |
|
197 | + && $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes) |
|
198 | 198 | ) { |
199 | 199 | return false; |
200 | 200 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function getName() |
30 | 30 | { |
31 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Product site map' ); |
|
31 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Product site map'); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | */ |
40 | 40 | public function getDescription() |
41 | 41 | { |
42 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Creates a product site map for search engines' ); |
|
42 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Creates a product site map for search engines'); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | { |
53 | 53 | $container = $this->createContainer(); |
54 | 54 | |
55 | - $files = $this->export( $container ); |
|
56 | - $this->createSitemapIndex( $container, $files ); |
|
55 | + $files = $this->export($container); |
|
56 | + $this->createSitemapIndex($container, $files); |
|
57 | 57 | |
58 | 58 | $container->close(); |
59 | 59 | } |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | * @param \Aimeos\MW\Container\Content\Iface $content File content object |
66 | 66 | * @param \Aimeos\MShop\Product\Item\Iface[] $items List of product items |
67 | 67 | */ |
68 | - protected function addItems( \Aimeos\MW\Container\Content\Iface $content, array $items ) |
|
68 | + protected function addItems(\Aimeos\MW\Container\Content\Iface $content, array $items) |
|
69 | 69 | { |
70 | 70 | $config = $this->getContext()->getConfig(); |
71 | 71 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | * @see controller/jobs/product/export/sitemap/max-items |
97 | 97 | * @see controller/jobs/product/export/sitemap/max-query |
98 | 98 | */ |
99 | - $changefreq = $config->get( 'controller/jobs/product/export/sitemap/changefreq', 'daily' ); |
|
99 | + $changefreq = $config->get('controller/jobs/product/export/sitemap/changefreq', 'daily'); |
|
100 | 100 | |
101 | 101 | /** controller/jobs/product/export/sitemap/standard/template-items |
102 | 102 | * Relative path to the XML items template of the product site map job controller. |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | $view->siteItems = $items; |
130 | 130 | $view->siteFreq = $changefreq; |
131 | 131 | |
132 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
132 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | * @see controller/jobs/product/export/sitemap/max-query |
176 | 176 | * @see controller/jobs/product/export/sitemap/changefreq |
177 | 177 | */ |
178 | - $location = $config->get( 'controller/jobs/product/export/sitemap/location', sys_get_temp_dir() ); |
|
178 | + $location = $config->get('controller/jobs/product/export/sitemap/location', sys_get_temp_dir()); |
|
179 | 179 | |
180 | 180 | /** controller/jobs/product/export/sitemap/container/options |
181 | 181 | * List of file container options for the site map files |
@@ -196,10 +196,10 @@ discard block |
||
196 | 196 | * @see controller/jobs/product/export/sitemap/max-query |
197 | 197 | * @see controller/jobs/product/export/sitemap/changefreq |
198 | 198 | */ |
199 | - $default = array( 'gzip-mode' => 'wb' ); |
|
200 | - $options = $config->get( 'controller/jobs/product/export/sitemap/container/options', $default ); |
|
199 | + $default = array('gzip-mode' => 'wb'); |
|
200 | + $options = $config->get('controller/jobs/product/export/sitemap/container/options', $default); |
|
201 | 201 | |
202 | - return \Aimeos\MW\Container\Factory::getContainer( $location, 'Directory', 'Gzip', $options ); |
|
202 | + return \Aimeos\MW\Container\Factory::getContainer($location, 'Directory', 'Gzip', $options); |
|
203 | 203 | } |
204 | 204 | |
205 | 205 | |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | * @param integer $filenum New file number |
211 | 211 | * @return \Aimeos\MW\Container\Content\Iface New content object |
212 | 212 | */ |
213 | - protected function createContent( \Aimeos\MW\Container\Iface $container, $filenum ) |
|
213 | + protected function createContent(\Aimeos\MW\Container\Iface $container, $filenum) |
|
214 | 214 | { |
215 | 215 | /** controller/jobs/product/export/sitemap/standard/template-header |
216 | 216 | * Relative path to the XML site map header template of the product site map job controller. |
@@ -240,9 +240,9 @@ discard block |
||
240 | 240 | $context = $this->getContext(); |
241 | 241 | $view = $context->getView(); |
242 | 242 | |
243 | - $content = $container->create( $this->getFilename( $filenum ) ); |
|
244 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
245 | - $container->add( $content ); |
|
243 | + $content = $container->create($this->getFilename($filenum)); |
|
244 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
245 | + $container->add($content); |
|
246 | 246 | |
247 | 247 | return $content; |
248 | 248 | } |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | * |
254 | 254 | * @param \Aimeos\MW\Container\Content\Iface $content |
255 | 255 | */ |
256 | - protected function closeContent( \Aimeos\MW\Container\Content\Iface $content ) |
|
256 | + protected function closeContent(\Aimeos\MW\Container\Content\Iface $content) |
|
257 | 257 | { |
258 | 258 | /** controller/jobs/product/export/sitemap/standard/template-footer |
259 | 259 | * Relative path to the XML site map footer template of the product site map job controller. |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | $context = $this->getContext(); |
284 | 284 | $view = $context->getView(); |
285 | 285 | |
286 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
286 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
287 | 287 | } |
288 | 288 | |
289 | 289 | |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | * @param \Aimeos\MW\Container\Iface $container File container object |
294 | 294 | * @param array $files List of generated site map file names |
295 | 295 | */ |
296 | - protected function createSitemapIndex( \Aimeos\MW\Container\Iface $container, array $files ) |
|
296 | + protected function createSitemapIndex(\Aimeos\MW\Container\Iface $container, array $files) |
|
297 | 297 | { |
298 | 298 | /** controller/jobs/product/export/sitemap/standard/template-index |
299 | 299 | * Relative path to the XML site map index template of the product site map job controller. |
@@ -325,9 +325,9 @@ discard block |
||
325 | 325 | |
326 | 326 | $view->siteFiles = $files; |
327 | 327 | |
328 | - $content = $container->create( 'aimeos-sitemap-index.xml' ); |
|
329 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
330 | - $container->add( $content ); |
|
328 | + $content = $container->create('aimeos-sitemap-index.xml'); |
|
329 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
330 | + $container->add($content); |
|
331 | 331 | } |
332 | 332 | |
333 | 333 | |
@@ -338,11 +338,11 @@ discard block |
||
338 | 338 | * @param mixed $default Default value if name is unknown |
339 | 339 | * @return mixed Configuration value |
340 | 340 | */ |
341 | - protected function getConfig( $name, $default = null ) |
|
341 | + protected function getConfig($name, $default = null) |
|
342 | 342 | { |
343 | 343 | $config = $this->getContext()->getConfig(); |
344 | 344 | |
345 | - switch( $name ) |
|
345 | + switch ($name) |
|
346 | 346 | { |
347 | 347 | case 'domain': |
348 | 348 | return []; |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | * @see controller/jobs/product/export/sitemap/max-query |
370 | 370 | * @see controller/jobs/product/export/sitemap/changefreq |
371 | 371 | */ |
372 | - return $config->get( 'controller/jobs/product/export/sitemap/max-items', 50000 ); |
|
372 | + return $config->get('controller/jobs/product/export/sitemap/max-items', 50000); |
|
373 | 373 | |
374 | 374 | case 'max-query': |
375 | 375 | /** controller/jobs/product/export/sitemap/max-query |
@@ -389,7 +389,7 @@ discard block |
||
389 | 389 | * @see controller/jobs/product/export/sitemap/max-items |
390 | 390 | * @see controller/jobs/product/export/sitemap/changefreq |
391 | 391 | */ |
392 | - return $config->get( 'controller/jobs/product/export/sitemap/max-query', 1000 ); |
|
392 | + return $config->get('controller/jobs/product/export/sitemap/max-query', 1000); |
|
393 | 393 | } |
394 | 394 | |
395 | 395 | return $default; |
@@ -402,8 +402,8 @@ discard block |
||
402 | 402 | * @param integer $number Current file number |
403 | 403 | * @return string New file name |
404 | 404 | */ |
405 | - protected function getFilename( $number ) |
|
405 | + protected function getFilename($number) |
|
406 | 406 | { |
407 | - return sprintf( 'aimeos-sitemap-%d.xml', $number ); |
|
407 | + return sprintf('aimeos-sitemap-%d.xml', $number); |
|
408 | 408 | } |
409 | 409 | } |