@@ -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/text/listtypes |
51 | 51 | * Names of the product list types for texts 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/product/listtypes |
68 | 68 | */ |
69 | - $this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/text/listtypes' ); |
|
69 | + $this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/text/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(), 'text' ); |
|
82 | + $listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists'); |
|
83 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'text'); |
|
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( 'text', $this->listTypes ); |
|
89 | + $map = $this->getMappedChunk($data, $this->getMapping()); |
|
90 | + $listItems = $product->getListItems('text', $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->getContent() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem; |
|
94 | + if (($refItem = $listItem->getRefItem()) !== null) { |
|
95 | + $listMap[$refItem->getContent()][$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 | - $content = trim( $list['text.content'] ); |
|
106 | - $type = trim( isset( $list['text.type'] ) ? $list['text.type'] : 'name' ); |
|
107 | - $typecode = trim( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' ); |
|
105 | + $content = trim($list['text.content']); |
|
106 | + $type = trim(isset($list['text.type']) ? $list['text.type'] : 'name'); |
|
107 | + $typecode = trim(isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default'); |
|
108 | 108 | |
109 | - if( isset( $listMap[$content][$type][$typecode] ) ) |
|
109 | + if (isset($listMap[$content][$type][$typecode])) |
|
110 | 110 | { |
111 | 111 | $listItem = $listMap[$content][$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['text.typeid'] = $this->getTypeId( 'text/type', 'product', $type ); |
|
121 | + $list['text.typeid'] = $this->getTypeId('text/type', 'product', $type); |
|
122 | 122 | $list['text.domain'] = 'product'; |
123 | 123 | |
124 | - $refItem->fromArray( $this->addItemDefaults( $list ) ); |
|
125 | - $refItem = $manager->saveItem( $refItem ); |
|
124 | + $refItem->fromArray($this->addItemDefaults($list)); |
|
125 | + $refItem = $manager->saveItem($refItem); |
|
126 | 126 | |
127 | - $list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'text', $typecode ); |
|
127 | + $list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'text', $typecode); |
|
128 | 128 | $list['product.lists.parentid'] = $product->getId(); |
129 | 129 | $list['product.lists.refid'] = $refItem->getId(); |
130 | 130 | $list['product.lists.domain'] = 'text'; |
131 | 131 | |
132 | - $listItem->fromArray( $this->addListItemDefaults( $list, $pos ) ); |
|
133 | - $listManager->saveItem( $listItem, false ); |
|
132 | + $listItem->fromArray($this->addListItemDefaults($list, $pos)); |
|
133 | + $listManager->saveItem($listItem, false); |
|
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. "text.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['text.label'] ) ) { |
|
166 | - $list['text.label'] = mb_strcut( trim( $list['text.content'] ), 0, 255 ); |
|
165 | + if (!isset($list['text.label'])) { |
|
166 | + $list['text.label'] = mb_strcut(trim($list['text.content']), 0, 255); |
|
167 | 167 | } |
168 | 168 | |
169 | - if( !isset( $list['text.languageid'] ) ) { |
|
169 | + if (!isset($list['text.languageid'])) { |
|
170 | 170 | $list['text.languageid'] = $this->getContext()->getLocale()->getLanguageId(); |
171 | 171 | } |
172 | 172 | |
173 | - if( !isset( $list['text.status'] ) ) { |
|
173 | + if (!isset($list['text.status'])) { |
|
174 | 174 | $list['text.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['text.content'] ) || trim( $list['text.content'] ) === '' || isset( $list['product.lists.type'] ) |
|
190 | - && $this->listTypes !== null && !in_array( trim( $list['product.lists.type'] ), (array) $this->listTypes ) |
|
189 | + if (!isset($list['text.content']) || trim($list['text.content']) === '' || isset($list['product.lists.type']) |
|
190 | + && $this->listTypes !== null && !in_array(trim($list['product.lists.type']), (array) $this->listTypes) |
|
191 | 191 | ) { |
192 | 192 | return false; |
193 | 193 | } |
@@ -111,8 +111,7 @@ discard block |
||
111 | 111 | $listItem = $listMap[$content][$type][$typecode]; |
112 | 112 | $refItem = $listItem->getRefItem(); |
113 | 113 | unset( $listItems[ $listItem->getId() ] ); |
114 | - } |
|
115 | - else |
|
114 | + } else |
|
116 | 115 | { |
117 | 116 | $listItem = $listManager->createItem(); |
118 | 117 | $refItem = $manager->createItem(); |
@@ -143,8 +142,7 @@ discard block |
||
143 | 142 | $data = $this->getObject()->process( $product, $data ); |
144 | 143 | |
145 | 144 | $manager->commit(); |
146 | - } |
|
147 | - catch( \Exception $e ) |
|
145 | + } catch( \Exception $e ) |
|
148 | 146 | { |
149 | 147 | $manager->rollback(); |
150 | 148 | throw $e; |
@@ -40,54 +40,54 @@ discard block |
||
40 | 40 | * @param array $data List of CSV fields with position as key and data as value |
41 | 41 | * @return array List of data which hasn't been imported |
42 | 42 | */ |
43 | - public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data ) |
|
43 | + public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data) |
|
44 | 44 | { |
45 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property' ); |
|
45 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property'); |
|
46 | 46 | $manager->begin(); |
47 | 47 | |
48 | 48 | try |
49 | 49 | { |
50 | 50 | $propMap = []; |
51 | - $map = $this->getMappedChunk( $data, $this->getMapping() ); |
|
52 | - $items = $this->getPropertyItems( $product->getId() ); |
|
51 | + $map = $this->getMappedChunk($data, $this->getMapping()); |
|
52 | + $items = $this->getPropertyItems($product->getId()); |
|
53 | 53 | |
54 | - foreach( $items as $item ) { |
|
55 | - $propMap[ $item->getValue() ][ $item->getType() ] = $item; |
|
54 | + foreach ($items as $item) { |
|
55 | + $propMap[$item->getValue()][$item->getType()] = $item; |
|
56 | 56 | } |
57 | 57 | |
58 | - foreach( $map as $list ) |
|
58 | + foreach ($map as $list) |
|
59 | 59 | { |
60 | - $typecode = trim( $list['product.property.type'] ); |
|
61 | - $value = trim( $list['product.property.value'] ); |
|
60 | + $typecode = trim($list['product.property.type']); |
|
61 | + $value = trim($list['product.property.value']); |
|
62 | 62 | |
63 | - if( $typecode == '' || $value == '' ) { |
|
63 | + if ($typecode == '' || $value == '') { |
|
64 | 64 | continue; |
65 | 65 | } |
66 | 66 | |
67 | - $list['product.property.typeid'] = $this->getTypeId( 'product/property/type', 'product', $typecode ); |
|
67 | + $list['product.property.typeid'] = $this->getTypeId('product/property/type', 'product', $typecode); |
|
68 | 68 | $list['product.property.parentid'] = $product->getId(); |
69 | 69 | |
70 | - if( isset( $propMap[$value][$typecode] ) ) |
|
70 | + if (isset($propMap[$value][$typecode])) |
|
71 | 71 | { |
72 | 72 | $item = $propMap[$value][$typecode]; |
73 | - unset( $items[ $item->getId() ] ); |
|
73 | + unset($items[$item->getId()]); |
|
74 | 74 | } |
75 | 75 | else |
76 | 76 | { |
77 | 77 | $item = $manager->createItem(); |
78 | 78 | } |
79 | 79 | |
80 | - $item->fromArray( $list ); |
|
81 | - $manager->saveItem( $item, false ); |
|
80 | + $item->fromArray($list); |
|
81 | + $manager->saveItem($item, false); |
|
82 | 82 | } |
83 | 83 | |
84 | - $manager->deleteItems( array_keys( $items ) ); |
|
84 | + $manager->deleteItems(array_keys($items)); |
|
85 | 85 | |
86 | - $data = $this->getObject()->process( $product, $data ); |
|
86 | + $data = $this->getObject()->process($product, $data); |
|
87 | 87 | |
88 | 88 | $manager->commit(); |
89 | 89 | } |
90 | - catch( \Exception $e ) |
|
90 | + catch (\Exception $e) |
|
91 | 91 | { |
92 | 92 | $manager->rollback(); |
93 | 93 | throw $e; |
@@ -103,13 +103,13 @@ discard block |
||
103 | 103 | * @param string $prodid Unique product ID |
104 | 104 | * @return array Associative list of product property items |
105 | 105 | */ |
106 | - protected function getPropertyItems( $prodid ) |
|
106 | + protected function getPropertyItems($prodid) |
|
107 | 107 | { |
108 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property' ); |
|
108 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property'); |
|
109 | 109 | |
110 | 110 | $search = $manager->createSearch(); |
111 | - $search->setConditions( $search->compare( '==', 'product.property.parentid', $prodid ) ); |
|
111 | + $search->setConditions($search->compare('==', 'product.property.parentid', $prodid)); |
|
112 | 112 | |
113 | - return $manager->searchItems( $search ); |
|
113 | + return $manager->searchItems($search); |
|
114 | 114 | } |
115 | 115 | } |
@@ -71,8 +71,7 @@ discard block |
||
71 | 71 | { |
72 | 72 | $item = $propMap[$value][$typecode]; |
73 | 73 | unset( $items[ $item->getId() ] ); |
74 | - } |
|
75 | - else |
|
74 | + } else |
|
76 | 75 | { |
77 | 76 | $item = $manager->createItem(); |
78 | 77 | } |
@@ -86,8 +85,7 @@ discard block |
||
86 | 85 | $data = $this->getObject()->process( $product, $data ); |
87 | 86 | |
88 | 87 | $manager->commit(); |
89 | - } |
|
90 | - catch( \Exception $e ) |
|
88 | + } catch( \Exception $e ) |
|
91 | 89 | { |
92 | 90 | $manager->rollback(); |
93 | 91 | throw $e; |
@@ -40,21 +40,21 @@ |
||
40 | 40 | * @param array $data List of CSV fields with position as key and data as value |
41 | 41 | * @return array List of data which hasn't been imported |
42 | 42 | */ |
43 | - public function process( \Aimeos\MShop\Coupon\Item\Code\Iface $item, array $data ) |
|
43 | + public function process(\Aimeos\MShop\Coupon\Item\Code\Iface $item, array $data) |
|
44 | 44 | { |
45 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' ); |
|
46 | - $map = $this->getMappedChunk( $data, $this->getMapping() ); |
|
45 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code'); |
|
46 | + $map = $this->getMappedChunk($data, $this->getMapping()); |
|
47 | 47 | |
48 | - foreach( $map as $list ) |
|
48 | + foreach ($map as $list) |
|
49 | 49 | { |
50 | - if( trim( $list['coupon.code.code'] ) == '' ) { |
|
50 | + if (trim($list['coupon.code.code']) == '') { |
|
51 | 51 | continue; |
52 | 52 | } |
53 | 53 | |
54 | - $item->fromArray( $list ); |
|
55 | - $manager->saveItem( $item ); |
|
54 | + $item->fromArray($list); |
|
55 | + $manager->saveItem($item); |
|
56 | 56 | } |
57 | 57 | |
58 | - return $this->getObject()->process( $item, $data ); |
|
58 | + return $this->getObject()->process($item, $data); |
|
59 | 59 | } |
60 | 60 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function getName() |
30 | 30 | { |
31 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Product export' ); |
|
31 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Product export'); |
|
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', 'Exports all available products' ); |
|
42 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Exports all available products'); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | public function run() |
52 | 52 | { |
53 | 53 | $container = $this->createContainer(); |
54 | - $this->export( $container ); |
|
54 | + $this->export($container); |
|
55 | 55 | $container->close(); |
56 | 56 | } |
57 | 57 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | * @param \Aimeos\MW\Container\Content\Iface $content File content object |
63 | 63 | * @param \Aimeos\MShop\Product\Item\Iface[] $items List of product items |
64 | 64 | */ |
65 | - protected function addItems( \Aimeos\MW\Container\Content\Iface $content, array $items ) |
|
65 | + protected function addItems(\Aimeos\MW\Container\Content\Iface $content, array $items) |
|
66 | 66 | { |
67 | 67 | /** controller/jobs/product/export/standard/template-items |
68 | 68 | * Relative path to the XML items template of the product site map job controller. |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | |
95 | 95 | $view->exportItems = $items; |
96 | 96 | |
97 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
97 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | * @see controller/jobs/product/export/max-items |
124 | 124 | * @see controller/jobs/product/export/max-query |
125 | 125 | */ |
126 | - $location = $config->get( 'controller/jobs/product/export/location' ); |
|
126 | + $location = $config->get('controller/jobs/product/export/location'); |
|
127 | 127 | |
128 | 128 | /** controller/jobs/product/export/standard/container/type |
129 | 129 | * List of file container options for the export files |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | * @see controller/jobs/product/export/max-items |
141 | 141 | * @see controller/jobs/product/export/max-query |
142 | 142 | */ |
143 | - $container = $config->get( 'controller/jobs/product/export/standard/container/type', 'Directory' ); |
|
143 | + $container = $config->get('controller/jobs/product/export/standard/container/type', 'Directory'); |
|
144 | 144 | |
145 | 145 | /** controller/jobs/product/export/standard/container/content |
146 | 146 | * List of file container options for the export files |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | * @see controller/jobs/product/export/max-items |
158 | 158 | * @see controller/jobs/product/export/max-query |
159 | 159 | */ |
160 | - $content = $config->get( 'controller/jobs/product/export/standard/container/content', 'Binary' ); |
|
160 | + $content = $config->get('controller/jobs/product/export/standard/container/content', 'Binary'); |
|
161 | 161 | |
162 | 162 | /** controller/jobs/product/export/standard/container/options |
163 | 163 | * List of file container options for the export files |
@@ -174,15 +174,15 @@ discard block |
||
174 | 174 | * @see controller/jobs/product/export/max-items |
175 | 175 | * @see controller/jobs/product/export/max-query |
176 | 176 | */ |
177 | - $options = $config->get( 'controller/jobs/product/export/standard/container/options', [] ); |
|
177 | + $options = $config->get('controller/jobs/product/export/standard/container/options', []); |
|
178 | 178 | |
179 | - if( $location === null ) |
|
179 | + if ($location === null) |
|
180 | 180 | { |
181 | - $msg = sprintf( 'Required configuration for "%1$s" is missing', 'controller/jobs/product/export/location' ); |
|
182 | - throw new \Aimeos\Controller\Jobs\Exception( $msg ); |
|
181 | + $msg = sprintf('Required configuration for "%1$s" is missing', 'controller/jobs/product/export/location'); |
|
182 | + throw new \Aimeos\Controller\Jobs\Exception($msg); |
|
183 | 183 | } |
184 | 184 | |
185 | - return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options ); |
|
185 | + return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options); |
|
186 | 186 | } |
187 | 187 | |
188 | 188 | |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | * @param integer $filenum New file number |
194 | 194 | * @return \Aimeos\MW\Container\Content\Iface New content object |
195 | 195 | */ |
196 | - protected function createContent( \Aimeos\MW\Container\Iface $container, $filenum ) |
|
196 | + protected function createContent(\Aimeos\MW\Container\Iface $container, $filenum) |
|
197 | 197 | { |
198 | 198 | /** controller/jobs/product/export/standard/template-header |
199 | 199 | * Relative path to the XML site map header template of the product site map job controller. |
@@ -223,9 +223,9 @@ discard block |
||
223 | 223 | $context = $this->getContext(); |
224 | 224 | $view = $context->getView(); |
225 | 225 | |
226 | - $content = $container->create( $this->getFilename( $filenum ) ); |
|
227 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
228 | - $container->add( $content ); |
|
226 | + $content = $container->create($this->getFilename($filenum)); |
|
227 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
228 | + $container->add($content); |
|
229 | 229 | |
230 | 230 | return $content; |
231 | 231 | } |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | * |
237 | 237 | * @param \Aimeos\MW\Container\Content\Iface $content |
238 | 238 | */ |
239 | - protected function closeContent( \Aimeos\MW\Container\Content\Iface $content ) |
|
239 | + protected function closeContent(\Aimeos\MW\Container\Content\Iface $content) |
|
240 | 240 | { |
241 | 241 | /** controller/jobs/product/export/standard/template-footer |
242 | 242 | * Relative path to the XML site map footer template of the product site map job controller. |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | $context = $this->getContext(); |
267 | 267 | $view = $context->getView(); |
268 | 268 | |
269 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
269 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
270 | 270 | } |
271 | 271 | |
272 | 272 | |
@@ -276,45 +276,45 @@ discard block |
||
276 | 276 | * @param \Aimeos\MW\Container\Iface $container Container object |
277 | 277 | * @return array List of content (file) names |
278 | 278 | */ |
279 | - protected function export( \Aimeos\MW\Container\Iface $container ) |
|
279 | + protected function export(\Aimeos\MW\Container\Iface $container) |
|
280 | 280 | { |
281 | - $default = array( 'attribute', 'media', 'price', 'product', 'text' ); |
|
281 | + $default = array('attribute', 'media', 'price', 'product', 'text'); |
|
282 | 282 | |
283 | - $domains = $this->getConfig( 'domains', $default ); |
|
284 | - $maxItems = $this->getConfig( 'max-items', 10000 ); |
|
285 | - $maxQuery = $this->getConfig( 'max-query', 1000 ); |
|
283 | + $domains = $this->getConfig('domains', $default); |
|
284 | + $maxItems = $this->getConfig('max-items', 10000); |
|
285 | + $maxQuery = $this->getConfig('max-query', 1000); |
|
286 | 286 | |
287 | 287 | $start = 0; $filenum = 1; |
288 | 288 | $names = []; |
289 | 289 | |
290 | - $productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' ); |
|
290 | + $productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product'); |
|
291 | 291 | |
292 | - $search = $productManager->createSearch( true ); |
|
293 | - $search->setSortations( array( $search->sort( '+', 'product.id' ) ) ); |
|
294 | - $search->setSlice( 0, $maxQuery ); |
|
292 | + $search = $productManager->createSearch(true); |
|
293 | + $search->setSortations(array($search->sort('+', 'product.id'))); |
|
294 | + $search->setSlice(0, $maxQuery); |
|
295 | 295 | |
296 | - $content = $this->createContent( $container, $filenum ); |
|
296 | + $content = $this->createContent($container, $filenum); |
|
297 | 297 | $names[] = $content->getResource(); |
298 | 298 | |
299 | 299 | do |
300 | 300 | { |
301 | - $items = $productManager->searchItems( $search, $domains ); |
|
302 | - $this->addItems( $content, $items ); |
|
301 | + $items = $productManager->searchItems($search, $domains); |
|
302 | + $this->addItems($content, $items); |
|
303 | 303 | |
304 | - $count = count( $items ); |
|
304 | + $count = count($items); |
|
305 | 305 | $start += $count; |
306 | - $search->setSlice( $start, $maxQuery ); |
|
306 | + $search->setSlice($start, $maxQuery); |
|
307 | 307 | |
308 | - if( $start + $maxQuery > $maxItems * $filenum ) |
|
308 | + if ($start + $maxQuery > $maxItems * $filenum) |
|
309 | 309 | { |
310 | - $this->closeContent( $content ); |
|
311 | - $content = $this->createContent( $container, ++$filenum ); |
|
310 | + $this->closeContent($content); |
|
311 | + $content = $this->createContent($container, ++$filenum); |
|
312 | 312 | $names[] = $content->getResource(); |
313 | 313 | } |
314 | 314 | } |
315 | - while( $count >= $search->getSliceSize() ); |
|
315 | + while ($count >= $search->getSliceSize()); |
|
316 | 316 | |
317 | - $this->closeContent( $content ); |
|
317 | + $this->closeContent($content); |
|
318 | 318 | |
319 | 319 | return $names; |
320 | 320 | } |
@@ -327,11 +327,11 @@ discard block |
||
327 | 327 | * @param mixed $default Default value if name is unknown |
328 | 328 | * @return mixed Configuration value |
329 | 329 | */ |
330 | - protected function getConfig( $name, $default = null ) |
|
330 | + protected function getConfig($name, $default = null) |
|
331 | 331 | { |
332 | 332 | $config = $this->getContext()->getConfig(); |
333 | 333 | |
334 | - switch( $name ) |
|
334 | + switch ($name) |
|
335 | 335 | { |
336 | 336 | case 'domain': |
337 | 337 | /** controller/jobs/product/export/domains |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | * @see controller/jobs/product/export/max-items |
355 | 355 | * @see controller/jobs/product/export/max-query |
356 | 356 | */ |
357 | - return $config->get( 'controller/jobs/product/export/domains', $default ); |
|
357 | + return $config->get('controller/jobs/product/export/domains', $default); |
|
358 | 358 | |
359 | 359 | case 'max-items': |
360 | 360 | /** controller/jobs/product/export/max-items |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | * @see controller/jobs/product/export/max-query |
378 | 378 | * @see controller/jobs/product/export/domains |
379 | 379 | */ |
380 | - return $config->get( 'controller/jobs/product/export/max-items', $default ); |
|
380 | + return $config->get('controller/jobs/product/export/max-items', $default); |
|
381 | 381 | |
382 | 382 | case 'max-query': |
383 | 383 | /** controller/jobs/product/export/max-query |
@@ -400,7 +400,7 @@ discard block |
||
400 | 400 | * @see controller/jobs/product/export/max-items |
401 | 401 | * @see controller/jobs/product/export/domains |
402 | 402 | */ |
403 | - return $config->get( 'controller/jobs/product/export/max-query', $default ); |
|
403 | + return $config->get('controller/jobs/product/export/max-query', $default); |
|
404 | 404 | |
405 | 405 | case 'filename': |
406 | 406 | /** controller/jobs/product/export/filename |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | * @see controller/jobs/product/export/max-query |
422 | 422 | * @see controller/jobs/product/export/domains |
423 | 423 | */ |
424 | - return $config->get( 'controller/jobs/product/export/filename', $default ); |
|
424 | + return $config->get('controller/jobs/product/export/filename', $default); |
|
425 | 425 | } |
426 | 426 | |
427 | 427 | return $default; |
@@ -434,8 +434,8 @@ discard block |
||
434 | 434 | * @param integer $number Current file number |
435 | 435 | * @return string New file name |
436 | 436 | */ |
437 | - protected function getFilename( $number ) |
|
437 | + protected function getFilename($number) |
|
438 | 438 | { |
439 | - return sprintf( $this->getConfig( 'filename', 'aimeos-products-%1$d_%2$s.xml' ), $number, date( 'Y-m-d_H:i:s' ) ); |
|
439 | + return sprintf($this->getConfig('filename', 'aimeos-products-%1$d_%2$s.xml'), $number, date('Y-m-d_H:i:s')); |
|
440 | 440 | } |
441 | 441 | } |
@@ -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' ); |
|
178 | + $location = $config->get('controller/jobs/product/export/sitemap/location'); |
|
179 | 179 | |
180 | 180 | /** controller/jobs/product/export/sitemap/container/options |
181 | 181 | * List of file container options for the site map files |
@@ -196,16 +196,16 @@ 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 | - if( $location === null ) |
|
202 | + if ($location === null) |
|
203 | 203 | { |
204 | - $msg = sprintf( 'Required configuration for "%1$s" is missing', 'controller/jobs/product/export/sitemap/location' ); |
|
205 | - throw new \Aimeos\Controller\Jobs\Exception( $msg ); |
|
204 | + $msg = sprintf('Required configuration for "%1$s" is missing', 'controller/jobs/product/export/sitemap/location'); |
|
205 | + throw new \Aimeos\Controller\Jobs\Exception($msg); |
|
206 | 206 | } |
207 | 207 | |
208 | - return \Aimeos\MW\Container\Factory::getContainer( $location, 'Directory', 'Gzip', $options ); |
|
208 | + return \Aimeos\MW\Container\Factory::getContainer($location, 'Directory', 'Gzip', $options); |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | * @param integer $filenum New file number |
217 | 217 | * @return \Aimeos\MW\Container\Content\Iface New content object |
218 | 218 | */ |
219 | - protected function createContent( \Aimeos\MW\Container\Iface $container, $filenum ) |
|
219 | + protected function createContent(\Aimeos\MW\Container\Iface $container, $filenum) |
|
220 | 220 | { |
221 | 221 | /** controller/jobs/product/export/sitemap/standard/template-header |
222 | 222 | * Relative path to the XML site map header template of the product site map job controller. |
@@ -246,9 +246,9 @@ discard block |
||
246 | 246 | $context = $this->getContext(); |
247 | 247 | $view = $context->getView(); |
248 | 248 | |
249 | - $content = $container->create( $this->getFilename( $filenum ) ); |
|
250 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
251 | - $container->add( $content ); |
|
249 | + $content = $container->create($this->getFilename($filenum)); |
|
250 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
251 | + $container->add($content); |
|
252 | 252 | |
253 | 253 | return $content; |
254 | 254 | } |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | * |
260 | 260 | * @param \Aimeos\MW\Container\Content\Iface $content |
261 | 261 | */ |
262 | - protected function closeContent( \Aimeos\MW\Container\Content\Iface $content ) |
|
262 | + protected function closeContent(\Aimeos\MW\Container\Content\Iface $content) |
|
263 | 263 | { |
264 | 264 | /** controller/jobs/product/export/sitemap/standard/template-footer |
265 | 265 | * Relative path to the XML site map footer template of the product site map job controller. |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | $context = $this->getContext(); |
290 | 290 | $view = $context->getView(); |
291 | 291 | |
292 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
292 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
293 | 293 | } |
294 | 294 | |
295 | 295 | |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | * @param \Aimeos\MW\Container\Iface $container File container object |
300 | 300 | * @param array $files List of generated site map file names |
301 | 301 | */ |
302 | - protected function createSitemapIndex( \Aimeos\MW\Container\Iface $container, array $files ) |
|
302 | + protected function createSitemapIndex(\Aimeos\MW\Container\Iface $container, array $files) |
|
303 | 303 | { |
304 | 304 | /** controller/jobs/product/export/sitemap/standard/template-index |
305 | 305 | * Relative path to the XML site map index template of the product site map job controller. |
@@ -331,9 +331,9 @@ discard block |
||
331 | 331 | |
332 | 332 | $view->siteFiles = $files; |
333 | 333 | |
334 | - $content = $container->create( 'aimeos-sitemap-index.xml' ); |
|
335 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
336 | - $container->add( $content ); |
|
334 | + $content = $container->create('aimeos-sitemap-index.xml'); |
|
335 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
336 | + $container->add($content); |
|
337 | 337 | } |
338 | 338 | |
339 | 339 | |
@@ -344,11 +344,11 @@ discard block |
||
344 | 344 | * @param mixed $default Default value if name is unknown |
345 | 345 | * @return mixed Configuration value |
346 | 346 | */ |
347 | - protected function getConfig( $name, $default = null ) |
|
347 | + protected function getConfig($name, $default = null) |
|
348 | 348 | { |
349 | 349 | $config = $this->getContext()->getConfig(); |
350 | 350 | |
351 | - switch( $name ) |
|
351 | + switch ($name) |
|
352 | 352 | { |
353 | 353 | case 'domain': |
354 | 354 | return []; |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | * @see controller/jobs/product/export/sitemap/max-query |
376 | 376 | * @see controller/jobs/product/export/sitemap/changefreq |
377 | 377 | */ |
378 | - return $config->get( 'controller/jobs/product/export/sitemap/max-items', 50000 ); |
|
378 | + return $config->get('controller/jobs/product/export/sitemap/max-items', 50000); |
|
379 | 379 | |
380 | 380 | case 'max-query': |
381 | 381 | /** controller/jobs/product/export/sitemap/max-query |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | * @see controller/jobs/product/export/sitemap/max-items |
396 | 396 | * @see controller/jobs/product/export/sitemap/changefreq |
397 | 397 | */ |
398 | - return $config->get( 'controller/jobs/product/export/sitemap/max-query', 1000 ); |
|
398 | + return $config->get('controller/jobs/product/export/sitemap/max-query', 1000); |
|
399 | 399 | } |
400 | 400 | |
401 | 401 | return $default; |
@@ -408,8 +408,8 @@ discard block |
||
408 | 408 | * @param integer $number Current file number |
409 | 409 | * @return string New file name |
410 | 410 | */ |
411 | - protected function getFilename( $number ) |
|
411 | + protected function getFilename($number) |
|
412 | 412 | { |
413 | - return sprintf( 'aimeos-sitemap-%d.xml', $number ); |
|
413 | + return sprintf('aimeos-sitemap-%d.xml', $number); |
|
414 | 414 | } |
415 | 415 | } |
@@ -15,14 +15,14 @@ discard block |
||
15 | 15 | public static function bootstrap() |
16 | 16 | { |
17 | 17 | self::getAimeos(); |
18 | - \Aimeos\MShop\Factory::setCache( false ); |
|
18 | + \Aimeos\MShop\Factory::setCache(false); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | |
22 | - public static function getContext( $site = 'unittest' ) |
|
22 | + public static function getContext($site = 'unittest') |
|
23 | 23 | { |
24 | - if( !isset( self::$context[$site] ) ) { |
|
25 | - self::$context[$site] = self::createContext( $site ); |
|
24 | + if (!isset(self::$context[$site])) { |
|
25 | + self::$context[$site] = self::createContext($site); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | return clone self::$context[$site]; |
@@ -31,13 +31,13 @@ discard block |
||
31 | 31 | |
32 | 32 | public static function getAimeos() |
33 | 33 | { |
34 | - if( !isset( self::$aimeos ) ) |
|
34 | + if (!isset(self::$aimeos)) |
|
35 | 35 | { |
36 | 36 | require_once 'Bootstrap.php'; |
37 | - spl_autoload_register( 'Aimeos\\Bootstrap::autoload' ); |
|
37 | + spl_autoload_register('Aimeos\\Bootstrap::autoload'); |
|
38 | 38 | |
39 | - $extdir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ); |
|
40 | - self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true ); |
|
39 | + $extdir = dirname(dirname(dirname(dirname(dirname(__FILE__))))); |
|
40 | + self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | return self::$aimeos; |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | /** |
48 | 48 | * @param string $site |
49 | 49 | */ |
50 | - private static function createContext( $site ) |
|
50 | + private static function createContext($site) |
|
51 | 51 | { |
52 | 52 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
53 | 53 | $aimeos = self::getAimeos(); |
@@ -57,30 +57,30 @@ discard block |
||
57 | 57 | $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; |
58 | 58 | $file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser'; |
59 | 59 | |
60 | - $conf = new \Aimeos\MW\Config\PHPArray( [], $paths ); |
|
61 | - $conf = new \Aimeos\MW\Config\Decorator\Memory( $conf ); |
|
62 | - $conf = new \Aimeos\MW\Config\Decorator\Documentor( $conf, $file ); |
|
63 | - $ctx->setConfig( $conf ); |
|
60 | + $conf = new \Aimeos\MW\Config\PHPArray([], $paths); |
|
61 | + $conf = new \Aimeos\MW\Config\Decorator\Memory($conf); |
|
62 | + $conf = new \Aimeos\MW\Config\Decorator\Documentor($conf, $file); |
|
63 | + $ctx->setConfig($conf); |
|
64 | 64 | |
65 | 65 | |
66 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $conf ); |
|
67 | - $ctx->setDatabaseManager( $dbm ); |
|
66 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($conf); |
|
67 | + $ctx->setDatabaseManager($dbm); |
|
68 | 68 | |
69 | 69 | |
70 | - $logger = new \Aimeos\MW\Logger\File( 'unittest.log', \Aimeos\MW\Logger\Base::DEBUG ); |
|
71 | - $ctx->setLogger( $logger ); |
|
70 | + $logger = new \Aimeos\MW\Logger\File('unittest.log', \Aimeos\MW\Logger\Base::DEBUG); |
|
71 | + $ctx->setLogger($logger); |
|
72 | 72 | |
73 | 73 | |
74 | 74 | $session = new \Aimeos\MW\Session\None(); |
75 | - $ctx->setSession( $session ); |
|
75 | + $ctx->setSession($session); |
|
76 | 76 | |
77 | 77 | |
78 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx ); |
|
79 | - $locale = $localeManager->bootstrap( $site, '', '', false ); |
|
80 | - $ctx->setLocale( $locale ); |
|
78 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx); |
|
79 | + $locale = $localeManager->bootstrap($site, '', '', false); |
|
80 | + $ctx->setLocale($locale); |
|
81 | 81 | |
82 | 82 | |
83 | - $ctx->setEditor( 'core:controller/common' ); |
|
83 | + $ctx->setEditor('core:controller/common'); |
|
84 | 84 | |
85 | 85 | return $ctx; |
86 | 86 | } |