@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function getName() |
31 | 31 | { |
32 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Removes unpaid orders' ); |
|
32 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Removes unpaid orders'); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function getDescription() |
42 | 42 | { |
43 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Deletes unpaid orders to keep the database clean' ); |
|
43 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Deletes unpaid orders to keep the database clean'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -52,9 +52,9 @@ discard block |
||
52 | 52 | public function run() |
53 | 53 | { |
54 | 54 | $context = $this->getContext(); |
55 | - $controller = \Aimeos\Controller\Common\Order\Factory::createController( $context ); |
|
56 | - $baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' ); |
|
57 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
55 | + $controller = \Aimeos\Controller\Common\Order\Factory::createController($context); |
|
56 | + $baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base'); |
|
57 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
58 | 58 | |
59 | 59 | /** controller/jobs/order/cleanup/unpaid/keep-days |
60 | 60 | * Removes all orders from the database that are unpaid |
@@ -71,35 +71,35 @@ discard block |
||
71 | 71 | * @since 2014.07 |
72 | 72 | * @category User |
73 | 73 | */ |
74 | - $days = $context->getConfig()->get( 'controller/jobs/order/cleanup/unpaid/keep-days', 3 ); |
|
75 | - $limit = date( 'Y-m-d H:i:s', time() - 86400 * $days ); |
|
74 | + $days = $context->getConfig()->get('controller/jobs/order/cleanup/unpaid/keep-days', 3); |
|
75 | + $limit = date('Y-m-d H:i:s', time() - 86400 * $days); |
|
76 | 76 | |
77 | 77 | $search = $manager->createSearch(); |
78 | 78 | $expr = array( |
79 | - $search->compare( '<', 'order.mtime', $limit ), |
|
80 | - $search->compare( '<', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_REFUND ), |
|
79 | + $search->compare('<', 'order.mtime', $limit), |
|
80 | + $search->compare('<', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_REFUND), |
|
81 | 81 | ); |
82 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
82 | + $search->setConditions($search->combine('&&', $expr)); |
|
83 | 83 | |
84 | 84 | $start = 0; |
85 | 85 | |
86 | 86 | do |
87 | 87 | { |
88 | 88 | $baseIds = []; |
89 | - $items = $manager->searchItems( $search ); |
|
89 | + $items = $manager->searchItems($search); |
|
90 | 90 | |
91 | - foreach( $items as $item ) |
|
91 | + foreach ($items as $item) |
|
92 | 92 | { |
93 | - $controller->unblock( $item ); |
|
93 | + $controller->unblock($item); |
|
94 | 94 | $baseIds[] = $item->getBaseId(); |
95 | 95 | } |
96 | 96 | |
97 | - $baseManager->deleteItems( $baseIds ); |
|
97 | + $baseManager->deleteItems($baseIds); |
|
98 | 98 | |
99 | - $count = count( $items ); |
|
99 | + $count = count($items); |
|
100 | 100 | $start += $count; |
101 | - $search->setSlice( $start ); |
|
101 | + $search->setSlice($start); |
|
102 | 102 | } |
103 | - while( $count >= $search->getSliceSize() ); |
|
103 | + while ($count >= $search->getSliceSize()); |
|
104 | 104 | } |
105 | 105 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function getName() |
31 | 31 | { |
32 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Removes unfinished orders' ); |
|
32 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Removes unfinished orders'); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function getDescription() |
42 | 42 | { |
43 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Deletes unfinished orders an makes their products and coupon codes available again' ); |
|
43 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Deletes unfinished orders an makes their products and coupon codes available again'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -52,9 +52,9 @@ discard block |
||
52 | 52 | public function run() |
53 | 53 | { |
54 | 54 | $context = $this->getContext(); |
55 | - $controller = \Aimeos\Controller\Common\Order\Factory::createController( $context ); |
|
56 | - $baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' ); |
|
57 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
55 | + $controller = \Aimeos\Controller\Common\Order\Factory::createController($context); |
|
56 | + $baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base'); |
|
57 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
58 | 58 | |
59 | 59 | /** controller/jobs/order/cleanup/unfinished/keep-hours |
60 | 60 | * Release the ordered products after the configured time if no payment was confirmed |
@@ -74,35 +74,35 @@ discard block |
||
74 | 74 | * @since 2014.07 |
75 | 75 | * @category User |
76 | 76 | */ |
77 | - $hours = $context->getConfig()->get( 'controller/jobs/order/cleanup/unfinished/keep-hours', 24 ); |
|
78 | - $limit = date( 'Y-m-d H:i:s', time() - 3600 * $hours ); |
|
77 | + $hours = $context->getConfig()->get('controller/jobs/order/cleanup/unfinished/keep-hours', 24); |
|
78 | + $limit = date('Y-m-d H:i:s', time() - 3600 * $hours); |
|
79 | 79 | |
80 | 80 | $search = $manager->createSearch(); |
81 | 81 | $expr = array( |
82 | - $search->compare( '<', 'order.mtime', $limit ), |
|
83 | - $search->compare( '==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED ), |
|
82 | + $search->compare('<', 'order.mtime', $limit), |
|
83 | + $search->compare('==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED), |
|
84 | 84 | ); |
85 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
85 | + $search->setConditions($search->combine('&&', $expr)); |
|
86 | 86 | |
87 | 87 | $start = 0; |
88 | 88 | |
89 | 89 | do |
90 | 90 | { |
91 | 91 | $baseIds = []; |
92 | - $items = $manager->searchItems( $search ); |
|
92 | + $items = $manager->searchItems($search); |
|
93 | 93 | |
94 | - foreach( $items as $item ) |
|
94 | + foreach ($items as $item) |
|
95 | 95 | { |
96 | - $controller->unblock( $item ); |
|
96 | + $controller->unblock($item); |
|
97 | 97 | $baseIds[] = $item->getBaseId(); |
98 | 98 | } |
99 | 99 | |
100 | - $baseManager->deleteItems( $baseIds ); |
|
100 | + $baseManager->deleteItems($baseIds); |
|
101 | 101 | |
102 | - $count = count( $items ); |
|
102 | + $count = count($items); |
|
103 | 103 | $start += $count; |
104 | - $search->setSlice( $start ); |
|
104 | + $search->setSlice($start); |
|
105 | 105 | } |
106 | - while( $count >= $search->getSliceSize() ); |
|
106 | + while ($count >= $search->getSliceSize()); |
|
107 | 107 | } |
108 | 108 | } |
@@ -40,15 +40,15 @@ discard block |
||
40 | 40 | * |
41 | 41 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
42 | 42 | */ |
43 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context ) |
|
43 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context) |
|
44 | 44 | { |
45 | - parent::__construct( $context ); |
|
45 | + parent::__construct($context); |
|
46 | 46 | |
47 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' ); |
|
48 | - $result = $manager->searchItems( $manager->createSearch() ); |
|
47 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'attribute'); |
|
48 | + $result = $manager->searchItems($manager->createSearch()); |
|
49 | 49 | |
50 | - foreach( $result as $id => $item ) { |
|
51 | - $this->attributes[ $item->getCode() ][ $item->getType() ] = $item; |
|
50 | + foreach ($result as $id => $item) { |
|
51 | + $this->attributes[$item->getCode()][$item->getType()] = $item; |
|
52 | 52 | } |
53 | 53 | } |
54 | 54 | |
@@ -60,24 +60,24 @@ discard block |
||
60 | 60 | * @param string|null $type Attribute type |
61 | 61 | * @return \Aimeos\MShop\Attribute\Item\Iface|null Attribute object or null if not found |
62 | 62 | */ |
63 | - public function get( $code, $type = null ) |
|
63 | + public function get($code, $type = null) |
|
64 | 64 | { |
65 | - if( isset( $this->attributes[$code] ) && isset( $this->attributes[$code][$type] ) ) { |
|
65 | + if (isset($this->attributes[$code]) && isset($this->attributes[$code][$type])) { |
|
66 | 66 | return $this->attributes[$code][$type]; |
67 | 67 | } |
68 | 68 | |
69 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' ); |
|
69 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute'); |
|
70 | 70 | |
71 | 71 | $search = $manager->createSearch(); |
72 | 72 | $expr = array( |
73 | - $search->compare( '==', 'attribute.code', $code ), |
|
74 | - $search->compare( '==', 'attribute.type.code', $type ), |
|
73 | + $search->compare('==', 'attribute.code', $code), |
|
74 | + $search->compare('==', 'attribute.type.code', $type), |
|
75 | 75 | ); |
76 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
76 | + $search->setConditions($search->combine('&&', $expr)); |
|
77 | 77 | |
78 | - $result = $manager->searchItems( $search ); |
|
78 | + $result = $manager->searchItems($search); |
|
79 | 79 | |
80 | - if( ( $item = reset( $result ) ) !== false ) |
|
80 | + if (($item = reset($result)) !== false) |
|
81 | 81 | { |
82 | 82 | $this->attributes[$code][$type] = $item; |
83 | 83 | return $item; |
@@ -90,14 +90,14 @@ discard block |
||
90 | 90 | * |
91 | 91 | * @param \Aimeos\MShop\Common\Item\Iface $item Attribute object |
92 | 92 | */ |
93 | - public function set( \Aimeos\MShop\Common\Item\Iface $item ) |
|
93 | + public function set(\Aimeos\MShop\Common\Item\Iface $item) |
|
94 | 94 | { |
95 | 95 | $code = $item->getCode(); |
96 | 96 | |
97 | - if( !isset( $this->attributes[$code] ) || !is_array( $this->attributes[$code] ) ) { |
|
97 | + if (!isset($this->attributes[$code]) || !is_array($this->attributes[$code])) { |
|
98 | 98 | $this->attributes[$code] = []; |
99 | 99 | } |
100 | 100 | |
101 | - $this->attributes[$code][ $item->getType() ] = $item; |
|
101 | + $this->attributes[$code][$item->getType()] = $item; |
|
102 | 102 | } |
103 | 103 | } |
104 | 104 | \ No newline at end of file |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function getName() |
31 | 31 | { |
32 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Products bought together' ); |
|
32 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Products bought together'); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function getDescription() |
42 | 42 | { |
43 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Creates bought together product suggestions' ); |
|
43 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Creates bought together product suggestions'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | * @see controller/jobs/product/bought/min-confidence |
73 | 73 | * @see controller/jobs/product/bought/limit-days |
74 | 74 | */ |
75 | - $maxItems = $config->get( 'controller/jobs/product/bought/max-items', 5 ); |
|
75 | + $maxItems = $config->get('controller/jobs/product/bought/max-items', 5); |
|
76 | 76 | |
77 | 77 | /** controller/jobs/product/bought/min-support |
78 | 78 | * Minimum support value to sort out all irrelevant combinations |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * @see controller/jobs/product/bought/min-confidence |
102 | 102 | * @see controller/jobs/product/bought/limit-days |
103 | 103 | */ |
104 | - $minSupport = $config->get( 'controller/jobs/product/bought/min-support', 0.02 ); |
|
104 | + $minSupport = $config->get('controller/jobs/product/bought/min-support', 0.02); |
|
105 | 105 | |
106 | 106 | /** controller/jobs/product/bought/min-confidence |
107 | 107 | * Minimum confidence value for high quality suggestions |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | * @see controller/jobs/product/bought/min-support |
127 | 127 | * @see controller/jobs/product/bought/limit-days |
128 | 128 | */ |
129 | - $minConfidence = $config->get( 'controller/jobs/product/bought/min-confidence', 0.66 ); |
|
129 | + $minConfidence = $config->get('controller/jobs/product/bought/min-confidence', 0.66); |
|
130 | 130 | |
131 | 131 | /** controller/jobs/product/bought/limit-days |
132 | 132 | * Only use orders placed in the past within the configured number of days for calculating bought together products |
@@ -150,45 +150,45 @@ discard block |
||
150 | 150 | * @see controller/jobs/product/bought/min-support |
151 | 151 | * @see controller/jobs/product/bought/min-confidence |
152 | 152 | */ |
153 | - $days = $config->get( 'controller/jobs/product/bought/limit-days', 180 ); |
|
154 | - $date = date( 'Y-m-d H:i:s', time() - $days * 86400 ); |
|
153 | + $days = $config->get('controller/jobs/product/bought/limit-days', 180); |
|
154 | + $date = date('Y-m-d H:i:s', time() - $days * 86400); |
|
155 | 155 | |
156 | 156 | |
157 | - $typeItem = $this->getTypeItem( 'product/lists/type', 'product', 'bought-together' ); |
|
157 | + $typeItem = $this->getTypeItem('product/lists/type', 'product', 'bought-together'); |
|
158 | 158 | |
159 | - $baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' ); |
|
159 | + $baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base'); |
|
160 | 160 | $search = $baseManager->createSearch(); |
161 | - $search->setConditions( $search->compare( '>', 'order.base.ctime', $date ) ); |
|
162 | - $search->setSlice( 0, 0 ); |
|
161 | + $search->setConditions($search->compare('>', 'order.base.ctime', $date)); |
|
162 | + $search->setSlice(0, 0); |
|
163 | 163 | $totalOrders = 0; |
164 | - $baseManager->searchItems( $search, [], $totalOrders ); |
|
164 | + $baseManager->searchItems($search, [], $totalOrders); |
|
165 | 165 | |
166 | - $baseProductManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' ); |
|
166 | + $baseProductManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/product'); |
|
167 | 167 | $search = $baseProductManager->createSearch(); |
168 | - $search->setConditions( $search->compare( '>', 'order.base.product.ctime', $date ) ); |
|
168 | + $search->setConditions($search->compare('>', 'order.base.product.ctime', $date)); |
|
169 | 169 | $start = 0; |
170 | 170 | |
171 | 171 | do |
172 | 172 | { |
173 | - $totalCounts = $baseProductManager->aggregate( $search, 'order.base.product.productid' ); |
|
174 | - $prodIds = array_keys( $totalCounts ); |
|
173 | + $totalCounts = $baseProductManager->aggregate($search, 'order.base.product.productid'); |
|
174 | + $prodIds = array_keys($totalCounts); |
|
175 | 175 | |
176 | - foreach( $totalCounts as $id => $count ) |
|
176 | + foreach ($totalCounts as $id => $count) |
|
177 | 177 | { |
178 | - $this->removeListItems( $id, $typeItem->getId() ); |
|
178 | + $this->removeListItems($id, $typeItem->getId()); |
|
179 | 179 | |
180 | - if( $count / $totalOrders > $minSupport ) |
|
180 | + if ($count / $totalOrders > $minSupport) |
|
181 | 181 | { |
182 | - $productIds = $this->getSuggestions( $id, $prodIds, $count, $totalOrders, $maxItems, $minSupport, $minConfidence, $date ); |
|
183 | - $this->addListItems( $id, $typeItem->getId(), $productIds ); |
|
182 | + $productIds = $this->getSuggestions($id, $prodIds, $count, $totalOrders, $maxItems, $minSupport, $minConfidence, $date); |
|
183 | + $this->addListItems($id, $typeItem->getId(), $productIds); |
|
184 | 184 | } |
185 | 185 | } |
186 | 186 | |
187 | - $count = count( $totalCounts ); |
|
187 | + $count = count($totalCounts); |
|
188 | 188 | $start += $count; |
189 | - $search->setSlice( $start ); |
|
189 | + $search->setSlice($start); |
|
190 | 190 | } |
191 | - while( $count >= $search->getSliceSize() ); |
|
191 | + while ($count >= $search->getSliceSize()); |
|
192 | 192 | } |
193 | 193 | |
194 | 194 | |
@@ -205,59 +205,59 @@ discard block |
||
205 | 205 | * @param string $date Date in YYYY-MM-DD HH:mm:ss format after which orders should be used for calculations |
206 | 206 | * @return array List of suggested product IDs as key and their confidence as value |
207 | 207 | */ |
208 | - protected function getSuggestions( $id, $prodIds, $count, $total, $maxItems, $minSupport, $minConfidence, $date ) |
|
208 | + protected function getSuggestions($id, $prodIds, $count, $total, $maxItems, $minSupport, $minConfidence, $date) |
|
209 | 209 | { |
210 | 210 | $refIds = []; |
211 | 211 | $context = $this->getContext(); |
212 | 212 | |
213 | - $catalogListManager = \Aimeos\MShop\Factory::createManager( $context, 'catalog/lists' ); |
|
214 | - $baseProductManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' ); |
|
213 | + $catalogListManager = \Aimeos\MShop\Factory::createManager($context, 'catalog/lists'); |
|
214 | + $baseProductManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/product'); |
|
215 | 215 | |
216 | 216 | |
217 | 217 | $search = $baseProductManager->createSearch(); |
218 | - $func = $search->createFunction( 'order.base.product.count', array( (string) $id ) ); |
|
218 | + $func = $search->createFunction('order.base.product.count', array((string) $id)); |
|
219 | 219 | $expr = array( |
220 | - $search->compare( '==', 'order.base.product.productid', $prodIds ), |
|
221 | - $search->compare( '>', 'order.base.product.ctime', $date ), |
|
222 | - $search->compare( '==', $func, 1 ), |
|
220 | + $search->compare('==', 'order.base.product.productid', $prodIds), |
|
221 | + $search->compare('>', 'order.base.product.ctime', $date), |
|
222 | + $search->compare('==', $func, 1), |
|
223 | 223 | ); |
224 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
224 | + $search->setConditions($search->combine('&&', $expr)); |
|
225 | 225 | |
226 | - $relativeCounts = $baseProductManager->aggregate( $search, 'order.base.product.productid' ); |
|
226 | + $relativeCounts = $baseProductManager->aggregate($search, 'order.base.product.productid'); |
|
227 | 227 | |
228 | 228 | |
229 | 229 | $search = $catalogListManager->createSearch(); |
230 | 230 | $expr = array( |
231 | - $search->compare( '==', 'catalog.lists.refid', array_keys( $relativeCounts ) ), |
|
232 | - $search->compare( '==', 'catalog.lists.domain', 'product' ), |
|
231 | + $search->compare('==', 'catalog.lists.refid', array_keys($relativeCounts)), |
|
232 | + $search->compare('==', 'catalog.lists.domain', 'product'), |
|
233 | 233 | ); |
234 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
234 | + $search->setConditions($search->combine('&&', $expr)); |
|
235 | 235 | |
236 | - foreach( $catalogListManager->searchItems( $search ) as $listItem ) { |
|
236 | + foreach ($catalogListManager->searchItems($search) as $listItem) { |
|
237 | 237 | $refIds[$listItem->getRefId()] = true; |
238 | 238 | } |
239 | 239 | |
240 | 240 | |
241 | - unset( $relativeCounts[$id] ); |
|
241 | + unset($relativeCounts[$id]); |
|
242 | 242 | $supportA = $count / $total; |
243 | 243 | $products = []; |
244 | 244 | |
245 | - foreach( $relativeCounts as $prodId => $relCnt ) |
|
245 | + foreach ($relativeCounts as $prodId => $relCnt) |
|
246 | 246 | { |
247 | - if( !isset( $refIds[$prodId] ) ) { |
|
247 | + if (!isset($refIds[$prodId])) { |
|
248 | 248 | continue; |
249 | 249 | } |
250 | 250 | |
251 | 251 | $supportAB = $relCnt / $total; |
252 | 252 | |
253 | - if( $supportAB > $minSupport && ( $conf = ( $supportAB / $supportA ) ) > $minConfidence ) { |
|
253 | + if ($supportAB > $minSupport && ($conf = ($supportAB / $supportA)) > $minConfidence) { |
|
254 | 254 | $products[$prodId] = $conf; |
255 | 255 | } |
256 | 256 | } |
257 | 257 | |
258 | - arsort( $products ); |
|
258 | + arsort($products); |
|
259 | 259 | |
260 | - return array_keys( array_slice( $products, 0, $maxItems, true ) ); |
|
260 | + return array_keys(array_slice($products, 0, $maxItems, true)); |
|
261 | 261 | } |
262 | 262 | |
263 | 263 | |
@@ -268,26 +268,26 @@ discard block |
||
268 | 268 | * @param integer $typeId Unique ID of the list type used for the referenced products |
269 | 269 | * @param array $productIds List of position as key and product ID as value |
270 | 270 | */ |
271 | - protected function addListItems( $productId, $typeId, array $productIds ) |
|
271 | + protected function addListItems($productId, $typeId, array $productIds) |
|
272 | 272 | { |
273 | - if( empty( $productIds ) ) { |
|
273 | + if (empty($productIds)) { |
|
274 | 274 | return; |
275 | 275 | } |
276 | 276 | |
277 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' ); |
|
277 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists'); |
|
278 | 278 | $item = $manager->createItem(); |
279 | 279 | |
280 | - foreach( $productIds as $pos => $refid ) |
|
280 | + foreach ($productIds as $pos => $refid) |
|
281 | 281 | { |
282 | - $item->setId( null ); |
|
283 | - $item->setParentId( $productId ); |
|
284 | - $item->setDomain( 'product' ); |
|
285 | - $item->setTypeId( $typeId ); |
|
286 | - $item->setPosition( $pos ); |
|
287 | - $item->setRefId( $refid ); |
|
288 | - $item->setStatus( 1 ); |
|
289 | - |
|
290 | - $manager->saveItem( $item, false ); |
|
282 | + $item->setId(null); |
|
283 | + $item->setParentId($productId); |
|
284 | + $item->setDomain('product'); |
|
285 | + $item->setTypeId($typeId); |
|
286 | + $item->setPosition($pos); |
|
287 | + $item->setRefId($refid); |
|
288 | + $item->setStatus(1); |
|
289 | + |
|
290 | + $manager->saveItem($item, false); |
|
291 | 291 | } |
292 | 292 | } |
293 | 293 | |
@@ -298,20 +298,20 @@ discard block |
||
298 | 298 | * @param string $productId Unique ID of the product the references should be removed from |
299 | 299 | * @param integer $typeId Unique ID of the list type the referenced products should be removed from |
300 | 300 | */ |
301 | - protected function removeListItems( $productId, $typeId ) |
|
301 | + protected function removeListItems($productId, $typeId) |
|
302 | 302 | { |
303 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' ); |
|
303 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists'); |
|
304 | 304 | |
305 | 305 | $search = $manager->createSearch(); |
306 | 306 | $expr = array( |
307 | - $search->compare( '==', 'product.lists.parentid', $productId ), |
|
308 | - $search->compare( '==', 'product.lists.domain', 'product' ), |
|
309 | - $search->compare( '==', 'product.lists.typeid', $typeId ), |
|
307 | + $search->compare('==', 'product.lists.parentid', $productId), |
|
308 | + $search->compare('==', 'product.lists.domain', 'product'), |
|
309 | + $search->compare('==', 'product.lists.typeid', $typeId), |
|
310 | 310 | ); |
311 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
311 | + $search->setConditions($search->combine('&&', $expr)); |
|
312 | 312 | |
313 | - $listItems = $manager->searchItems( $search ); |
|
313 | + $listItems = $manager->searchItems($search); |
|
314 | 314 | |
315 | - $manager->deleteItems( array_keys( $listItems ) ); |
|
315 | + $manager->deleteItems(array_keys($listItems)); |
|
316 | 316 | } |
317 | 317 | } |
@@ -17,16 +17,16 @@ discard block |
||
17 | 17 | |
18 | 18 | protected function setUp() |
19 | 19 | { |
20 | - \Aimeos\MShop\Factory::setCache( true ); |
|
20 | + \Aimeos\MShop\Factory::setCache(true); |
|
21 | 21 | |
22 | 22 | $this->context = \TestHelperCntl::getContext(); |
23 | - $this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, [] ); |
|
23 | + $this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, []); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | |
27 | 27 | protected function tearDown() |
28 | 28 | { |
29 | - \Aimeos\MShop\Factory::setCache( false ); |
|
29 | + \Aimeos\MShop\Factory::setCache(false); |
|
30 | 30 | \Aimeos\MShop\Factory::clear(); |
31 | 31 | } |
32 | 32 | |
@@ -43,21 +43,21 @@ discard block |
||
43 | 43 | 1 => '2000-01-01 00:00:00', |
44 | 44 | ); |
45 | 45 | |
46 | - $product = $this->create( 'job_csv_test' ); |
|
46 | + $product = $this->create('job_csv_test'); |
|
47 | 47 | |
48 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint ); |
|
49 | - $object->process( $product, $data ); |
|
48 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint); |
|
49 | + $object->process($product, $data); |
|
50 | 50 | |
51 | - $items = $this->getStockItems( $product->getCode() ); |
|
52 | - $this->delete( $product ); |
|
51 | + $items = $this->getStockItems($product->getCode()); |
|
52 | + $this->delete($product); |
|
53 | 53 | |
54 | 54 | |
55 | - $this->assertEquals( 1, count( $items ) ); |
|
55 | + $this->assertEquals(1, count($items)); |
|
56 | 56 | |
57 | - foreach( $items as $item ) |
|
57 | + foreach ($items as $item) |
|
58 | 58 | { |
59 | - $this->assertEquals( 100, $item->getStocklevel() ); |
|
60 | - $this->assertEquals( '2000-01-01 00:00:00', $item->getDateBack() ); |
|
59 | + $this->assertEquals(100, $item->getStocklevel()); |
|
60 | + $this->assertEquals('2000-01-01 00:00:00', $item->getDateBack()); |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | |
@@ -78,19 +78,19 @@ discard block |
||
78 | 78 | 3 => '200', |
79 | 79 | ); |
80 | 80 | |
81 | - $product = $this->create( 'job_csv_test' ); |
|
81 | + $product = $this->create('job_csv_test'); |
|
82 | 82 | |
83 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint ); |
|
84 | - $object->process( $product, $data ); |
|
83 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint); |
|
84 | + $object->process($product, $data); |
|
85 | 85 | |
86 | - $items = $this->getStockItems( $product->getCode() ); |
|
87 | - $this->delete( $product ); |
|
86 | + $items = $this->getStockItems($product->getCode()); |
|
87 | + $this->delete($product); |
|
88 | 88 | |
89 | 89 | |
90 | - $this->assertEquals( 2, count( $items ) ); |
|
90 | + $this->assertEquals(2, count($items)); |
|
91 | 91 | |
92 | - foreach( $items as $item ) { |
|
93 | - $this->assertEquals( 200, $item->getStocklevel() ); |
|
92 | + foreach ($items as $item) { |
|
93 | + $this->assertEquals(200, $item->getStocklevel()); |
|
94 | 94 | } |
95 | 95 | } |
96 | 96 | |
@@ -109,21 +109,21 @@ discard block |
||
109 | 109 | 0 => '20', |
110 | 110 | ); |
111 | 111 | |
112 | - $product = $this->create( 'job_csv_test' ); |
|
112 | + $product = $this->create('job_csv_test'); |
|
113 | 113 | |
114 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint ); |
|
114 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint); |
|
115 | 115 | |
116 | - $object->process( $product, $data ); |
|
117 | - $object->process( $product, $dataUpdate ); |
|
116 | + $object->process($product, $data); |
|
117 | + $object->process($product, $dataUpdate); |
|
118 | 118 | |
119 | - $items = $this->getStockItems( $product->getCode() ); |
|
120 | - $this->delete( $product ); |
|
119 | + $items = $this->getStockItems($product->getCode()); |
|
120 | + $this->delete($product); |
|
121 | 121 | |
122 | 122 | |
123 | - $item = reset( $items ); |
|
123 | + $item = reset($items); |
|
124 | 124 | |
125 | - $this->assertEquals( 1, count( $items ) ); |
|
126 | - $this->assertEquals( 20, $item->getStocklevel() ); |
|
125 | + $this->assertEquals(1, count($items)); |
|
126 | + $this->assertEquals(20, $item->getStocklevel()); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | |
@@ -137,19 +137,19 @@ discard block |
||
137 | 137 | 0 => 50, |
138 | 138 | ); |
139 | 139 | |
140 | - $product = $this->create( 'job_csv_test' ); |
|
140 | + $product = $this->create('job_csv_test'); |
|
141 | 141 | |
142 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint ); |
|
143 | - $object->process( $product, $data ); |
|
142 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint); |
|
143 | + $object->process($product, $data); |
|
144 | 144 | |
145 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, [], $this->endpoint ); |
|
146 | - $object->process( $product, [] ); |
|
145 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, [], $this->endpoint); |
|
146 | + $object->process($product, []); |
|
147 | 147 | |
148 | - $items = $this->getStockItems( $product->getCode() ); |
|
149 | - $this->delete( $product ); |
|
148 | + $items = $this->getStockItems($product->getCode()); |
|
149 | + $this->delete($product); |
|
150 | 150 | |
151 | 151 | |
152 | - $this->assertEquals( 0, count( $items ) ); |
|
152 | + $this->assertEquals(0, count($items)); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | |
@@ -167,20 +167,20 @@ discard block |
||
167 | 167 | 2 => '', |
168 | 168 | ); |
169 | 169 | |
170 | - $product = $this->create( 'job_csv_test' ); |
|
170 | + $product = $this->create('job_csv_test'); |
|
171 | 171 | |
172 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint ); |
|
173 | - $object->process( $product, $data ); |
|
172 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint); |
|
173 | + $object->process($product, $data); |
|
174 | 174 | |
175 | - $items = $this->getStockItems( $product->getCode() ); |
|
176 | - $this->delete( $product ); |
|
175 | + $items = $this->getStockItems($product->getCode()); |
|
176 | + $this->delete($product); |
|
177 | 177 | |
178 | - $this->assertEquals( 1, count( $items ) ); |
|
178 | + $this->assertEquals(1, count($items)); |
|
179 | 179 | |
180 | - foreach( $items as $item ) |
|
180 | + foreach ($items as $item) |
|
181 | 181 | { |
182 | - $this->assertEquals( null, $item->getStocklevel() ); |
|
183 | - $this->assertEquals( null, $item->getDateBack() ); |
|
182 | + $this->assertEquals(null, $item->getStocklevel()); |
|
183 | + $this->assertEquals(null, $item->getDateBack()); |
|
184 | 184 | } |
185 | 185 | } |
186 | 186 | |
@@ -188,41 +188,41 @@ discard block |
||
188 | 188 | /** |
189 | 189 | * @param string $code |
190 | 190 | */ |
191 | - protected function create( $code ) |
|
191 | + protected function create($code) |
|
192 | 192 | { |
193 | - $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context ); |
|
194 | - $typeManager = $manager->getSubManager( 'type' ); |
|
193 | + $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context); |
|
194 | + $typeManager = $manager->getSubManager('type'); |
|
195 | 195 | |
196 | 196 | $typeSearch = $typeManager->createSearch(); |
197 | - $typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) ); |
|
198 | - $typeResult = $typeManager->searchItems( $typeSearch ); |
|
197 | + $typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default')); |
|
198 | + $typeResult = $typeManager->searchItems($typeSearch); |
|
199 | 199 | |
200 | - if( ( $typeItem = reset( $typeResult ) ) === false ) { |
|
201 | - throw new \RuntimeException( 'No product type "default" found' ); |
|
200 | + if (($typeItem = reset($typeResult)) === false) { |
|
201 | + throw new \RuntimeException('No product type "default" found'); |
|
202 | 202 | } |
203 | 203 | |
204 | 204 | $item = $manager->createItem(); |
205 | - $item->setTypeid( $typeItem->getId() ); |
|
206 | - $item->setCode( $code ); |
|
205 | + $item->setTypeid($typeItem->getId()); |
|
206 | + $item->setCode($code); |
|
207 | 207 | |
208 | - return $manager->saveItem( $item ); |
|
208 | + return $manager->saveItem($item); |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | |
212 | - protected function delete( \Aimeos\MShop\Product\Item\Iface $product ) |
|
212 | + protected function delete(\Aimeos\MShop\Product\Item\Iface $product) |
|
213 | 213 | { |
214 | - $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context ); |
|
215 | - $manager->deleteItem( $product->getId() ); |
|
214 | + $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context); |
|
215 | + $manager->deleteItem($product->getId()); |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | |
219 | - protected function getStockItems( $code ) |
|
219 | + protected function getStockItems($code) |
|
220 | 220 | { |
221 | - $manager = \Aimeos\MShop\Factory::createManager( $this->context, 'stock' ); |
|
221 | + $manager = \Aimeos\MShop\Factory::createManager($this->context, 'stock'); |
|
222 | 222 | |
223 | 223 | $search = $manager->createSearch(); |
224 | - $search->setConditions( $search->compare( '==', 'stock.productcode', $code ) ); |
|
224 | + $search->setConditions($search->compare('==', 'stock.productcode', $code)); |
|
225 | 225 | |
226 | - return $manager->searchItems( $search ); |
|
226 | + return $manager->searchItems($search); |
|
227 | 227 | } |
228 | 228 | } |
229 | 229 | \ No newline at end of file |
@@ -16,8 +16,8 @@ discard block |
||
16 | 16 | $context = \TestHelperJobs::getContext(); |
17 | 17 | $aimeos = \TestHelperJobs::getAimeos(); |
18 | 18 | |
19 | - $obj = \Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController( $context, $aimeos ); |
|
20 | - $this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj ); |
|
19 | + $obj = \Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController($context, $aimeos); |
|
20 | + $this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | |
@@ -26,8 +26,8 @@ discard block |
||
26 | 26 | $context = \TestHelperJobs::getContext(); |
27 | 27 | $aimeos = \TestHelperJobs::getAimeos(); |
28 | 28 | |
29 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
30 | - \Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController( $context, $aimeos, 'Wrong$$$Name' ); |
|
29 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
30 | + \Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController($context, $aimeos, 'Wrong$$$Name'); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | |
@@ -36,8 +36,8 @@ discard block |
||
36 | 36 | $context = \TestHelperJobs::getContext(); |
37 | 37 | $aimeos = \TestHelperJobs::getAimeos(); |
38 | 38 | |
39 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
40 | - \Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController( $context, $aimeos, 'WrongClass' ); |
|
39 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
40 | + \Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController($context, $aimeos, 'WrongClass'); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | |
@@ -46,8 +46,8 @@ discard block |
||
46 | 46 | $context = \TestHelperJobs::getContext(); |
47 | 47 | $aimeos = \TestHelperJobs::getAimeos(); |
48 | 48 | |
49 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
50 | - \Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController( $context, $aimeos, 'Factory' ); |
|
49 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
50 | + \Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController($context, $aimeos, 'Factory'); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | } |
@@ -121,8 +121,7 @@ |
||
121 | 121 | } |
122 | 122 | |
123 | 123 | $this->export( $processors, $data, $maxcnt ); |
124 | - } |
|
125 | - catch( \Exception $e ) |
|
124 | + } catch( \Exception $e ) |
|
126 | 125 | { |
127 | 126 | $logger->log( 'Order export error: ' . $e->getMessage() ); |
128 | 127 | $logger->log( $e->getTraceAsString() ); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function getName() |
30 | 30 | { |
31 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Order export CSV' ); |
|
31 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Order export CSV'); |
|
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 orders to CSV file' ); |
|
42 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Exports orders to CSV file'); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | * @category Developer |
74 | 74 | * @see controller/common/order/export/csv/max-size |
75 | 75 | */ |
76 | - $mappings = $config->get( 'controller/common/order/export/csv/mapping', $mappings ); |
|
76 | + $mappings = $config->get('controller/common/order/export/csv/mapping', $mappings); |
|
77 | 77 | |
78 | 78 | /** controller/jobs/order/export/csv/mapping |
79 | 79 | * List of mappings between the position in the CSV file and item keys |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | * @category Developer |
89 | 89 | * @see controller/common/order/export/csv/max-size |
90 | 90 | */ |
91 | - $mappings = $config->get( 'controller/jobs/order/export/csv/mapping', $mappings ); |
|
91 | + $mappings = $config->get('controller/jobs/order/export/csv/mapping', $mappings); |
|
92 | 92 | |
93 | 93 | |
94 | 94 | /** controller/common/order/export/csv/max-size |
@@ -106,29 +106,29 @@ discard block |
||
106 | 106 | * @category Developer |
107 | 107 | * @see controller/common/order/export/csv/mapping |
108 | 108 | */ |
109 | - $maxcnt = (int) $config->get( 'controller/common/order/export/csv/max-size', 1000 ); |
|
109 | + $maxcnt = (int) $config->get('controller/common/order/export/csv/max-size', 1000); |
|
110 | 110 | |
111 | 111 | |
112 | - $processors = $this->getProcessors( $mappings ); |
|
113 | - $mq = $context->getMessageQueueManager()->get( 'mq-admin' )->getQueue( 'order-export' ); |
|
112 | + $processors = $this->getProcessors($mappings); |
|
113 | + $mq = $context->getMessageQueueManager()->get('mq-admin')->getQueue('order-export'); |
|
114 | 114 | |
115 | - while( ( $msg = $mq->get() ) !== null ) |
|
115 | + while (($msg = $mq->get()) !== null) |
|
116 | 116 | { |
117 | 117 | try |
118 | 118 | { |
119 | - if( ( $data = json_decode( $msg->getBody(), true ) ) === null ) { |
|
120 | - throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid message: %1$s', $msg->getBody() ) ); |
|
119 | + if (($data = json_decode($msg->getBody(), true)) === null) { |
|
120 | + throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid message: %1$s', $msg->getBody())); |
|
121 | 121 | } |
122 | 122 | |
123 | - $this->export( $processors, $data, $maxcnt ); |
|
123 | + $this->export($processors, $data, $maxcnt); |
|
124 | 124 | } |
125 | - catch( \Exception $e ) |
|
125 | + catch (\Exception $e) |
|
126 | 126 | { |
127 | - $logger->log( 'Order export error: ' . $e->getMessage() ); |
|
128 | - $logger->log( $e->getTraceAsString() ); |
|
127 | + $logger->log('Order export error: ' . $e->getMessage()); |
|
128 | + $logger->log($e->getTraceAsString()); |
|
129 | 129 | } |
130 | 130 | |
131 | - $mq->del( $msg ); |
|
131 | + $mq->del($msg); |
|
132 | 132 | } |
133 | 133 | } |
134 | 134 | |
@@ -139,15 +139,15 @@ discard block |
||
139 | 139 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item |
140 | 140 | * @param string $path Absolute path to the exported file |
141 | 141 | */ |
142 | - protected function addJob( $context, $path ) |
|
142 | + protected function addJob($context, $path) |
|
143 | 143 | { |
144 | - $manager = \Aimeos\MAdmin\Factory::createManager( $context, 'job' ); |
|
144 | + $manager = \Aimeos\MAdmin\Factory::createManager($context, 'job'); |
|
145 | 145 | |
146 | 146 | $item = $manager->createItem(); |
147 | - $item->setResult( ['file' => $path] ); |
|
148 | - $item->setLabel( $path ); |
|
147 | + $item->setResult(['file' => $path]); |
|
148 | + $item->setLabel($path); |
|
149 | 149 | |
150 | - $manager->saveItem( $item, false ); |
|
150 | + $manager->saveItem($item, false); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | * @see controller/jobs/order/export/csv/container/content |
178 | 178 | * @see controller/jobs/order/export/csv/container/options |
179 | 179 | */ |
180 | - $location = $config->get( 'controller/jobs/order/export/csv/location', sys_get_temp_dir() ); |
|
180 | + $location = $config->get('controller/jobs/order/export/csv/location', sys_get_temp_dir()); |
|
181 | 181 | |
182 | 182 | /** controller/jobs/order/export/csv/container/type |
183 | 183 | * Nave of the container type to read the data from |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | * @see controller/jobs/order/export/csv/container/content |
201 | 201 | * @see controller/jobs/order/export/csv/container/options |
202 | 202 | */ |
203 | - $container = $config->get( 'controller/jobs/order/export/csv/container/type', 'Directory' ); |
|
203 | + $container = $config->get('controller/jobs/order/export/csv/container/type', 'Directory'); |
|
204 | 204 | |
205 | 205 | /** controller/jobs/order/export/csv/container/content |
206 | 206 | * Name of the content type inside the container to read the data from |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | * @see controller/jobs/order/export/csv/container/type |
222 | 222 | * @see controller/jobs/order/export/csv/container/options |
223 | 223 | */ |
224 | - $content = $config->get( 'controller/jobs/order/export/csv/container/content', 'CSV' ); |
|
224 | + $content = $config->get('controller/jobs/order/export/csv/container/content', 'CSV'); |
|
225 | 225 | |
226 | 226 | /** controller/jobs/order/export/csv/container/options |
227 | 227 | * List of file container options for the order export files |
@@ -239,9 +239,9 @@ discard block |
||
239 | 239 | * @see controller/jobs/order/export/csv/container/content |
240 | 240 | * @see controller/jobs/order/export/csv/container/type |
241 | 241 | */ |
242 | - $options = $config->get( 'controller/jobs/order/export/csv/container/options', [] ); |
|
242 | + $options = $config->get('controller/jobs/order/export/csv/container/options', []); |
|
243 | 243 | |
244 | - return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options ); |
|
244 | + return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options); |
|
245 | 245 | } |
246 | 246 | |
247 | 247 | |
@@ -253,56 +253,56 @@ discard block |
||
253 | 253 | * @param integer $maxcnt Maximum number of retrieved orders at once |
254 | 254 | * @return string Path of the file containing the exported data |
255 | 255 | */ |
256 | - protected function export( array $processors, $msg, $maxcnt ) |
|
256 | + protected function export(array $processors, $msg, $maxcnt) |
|
257 | 257 | { |
258 | - $lcontext = $this->getLocaleContext( $msg ); |
|
258 | + $lcontext = $this->getLocaleContext($msg); |
|
259 | 259 | $baseRef = ['order/base/address', 'order/base/coupon', 'order/base/product', 'order/base/service']; |
260 | 260 | |
261 | - $manager = \Aimeos\MShop\Factory::createManager( $lcontext, 'order' ); |
|
262 | - $baseManager = \Aimeos\MShop\Factory::createManager( $lcontext, 'order/base' ); |
|
261 | + $manager = \Aimeos\MShop\Factory::createManager($lcontext, 'order'); |
|
262 | + $baseManager = \Aimeos\MShop\Factory::createManager($lcontext, 'order/base'); |
|
263 | 263 | |
264 | 264 | $container = $this->getContainer(); |
265 | - $content = $container->create( 'order-export_' . date( 'Y-m-d_H-i-s' ) ); |
|
266 | - $search = $this->initCriteria( $manager->createSearch()->setSlice( 0, 0x7fffffff ), $msg ); |
|
265 | + $content = $container->create('order-export_' . date('Y-m-d_H-i-s')); |
|
266 | + $search = $this->initCriteria($manager->createSearch()->setSlice(0, 0x7fffffff), $msg); |
|
267 | 267 | $start = 0; |
268 | 268 | |
269 | 269 | do |
270 | 270 | { |
271 | 271 | $baseIds = []; |
272 | - $search->setSlice( $start, $maxcnt ); |
|
273 | - $items = $manager->searchItems( $search ); |
|
272 | + $search->setSlice($start, $maxcnt); |
|
273 | + $items = $manager->searchItems($search); |
|
274 | 274 | |
275 | - foreach( $items as $item ) { |
|
275 | + foreach ($items as $item) { |
|
276 | 276 | $baseIds[] = $item->getBaseId(); |
277 | 277 | } |
278 | 278 | |
279 | 279 | $baseSearch = $baseManager->createSearch(); |
280 | - $baseSearch->setConditions( $baseSearch->compare( '==', 'order.base.id', $baseIds ) ); |
|
281 | - $baseSearch->setSlice( 0, count( $baseIds ) ); |
|
280 | + $baseSearch->setConditions($baseSearch->compare('==', 'order.base.id', $baseIds)); |
|
281 | + $baseSearch->setSlice(0, count($baseIds)); |
|
282 | 282 | |
283 | - $baseItems = $baseManager->searchItems( $baseSearch, $baseRef ); |
|
283 | + $baseItems = $baseManager->searchItems($baseSearch, $baseRef); |
|
284 | 284 | |
285 | - foreach( $items as $id => $item ) |
|
285 | + foreach ($items as $id => $item) |
|
286 | 286 | { |
287 | - foreach( $processors as $type => $processor ) |
|
287 | + foreach ($processors as $type => $processor) |
|
288 | 288 | { |
289 | - foreach( $processor->process( $item, $baseItems[$item->getBaseId()] ) as $line ) { |
|
290 | - $content->add( [0 => $type, 1 => $id] + $line ); |
|
289 | + foreach ($processor->process($item, $baseItems[$item->getBaseId()]) as $line) { |
|
290 | + $content->add([0 => $type, 1 => $id] + $line); |
|
291 | 291 | } |
292 | 292 | } |
293 | 293 | } |
294 | 294 | |
295 | - $count = count( $items ); |
|
295 | + $count = count($items); |
|
296 | 296 | $start += $count; |
297 | 297 | } |
298 | - while( $count === $search->getSliceSize() ); |
|
298 | + while ($count === $search->getSliceSize()); |
|
299 | 299 | |
300 | 300 | $path = $content->getResource(); |
301 | - $container->add( $content ); |
|
301 | + $container->add($content); |
|
302 | 302 | $container->close(); |
303 | 303 | |
304 | - $path = $this->moveFile( $lcontext, $path ); |
|
305 | - $this->addJob( $lcontext, $path ); |
|
304 | + $path = $this->moveFile($lcontext, $path); |
|
305 | + $this->addJob($lcontext, $path); |
|
306 | 306 | } |
307 | 307 | |
308 | 308 | |
@@ -312,15 +312,15 @@ discard block |
||
312 | 312 | * @param array $msg Message data including a "sitecode" value |
313 | 313 | * @return \Aimeos\MShop\Context\Item\Iface New context item with updated locale |
314 | 314 | */ |
315 | - protected function getLocaleContext( array $msg ) |
|
315 | + protected function getLocaleContext(array $msg) |
|
316 | 316 | { |
317 | 317 | $lcontext = clone $this->getContext(); |
318 | - $manager = \Aimeos\MShop\Factory::createManager( $lcontext, 'locale' ); |
|
318 | + $manager = \Aimeos\MShop\Factory::createManager($lcontext, 'locale'); |
|
319 | 319 | |
320 | - $sitecode = ( isset( $msg['sitecode'] ) ? $msg['sitecode'] : 'default' ); |
|
321 | - $localeItem = $manager->bootstrap( $sitecode, '', '', false, \Aimeos\MShop\Locale\Manager\Base::SITE_PATH ); |
|
320 | + $sitecode = (isset($msg['sitecode']) ? $msg['sitecode'] : 'default'); |
|
321 | + $localeItem = $manager->bootstrap($sitecode, '', '', false, \Aimeos\MShop\Locale\Manager\Base::SITE_PATH); |
|
322 | 322 | |
323 | - return $lcontext->setLocale( $localeItem ); |
|
323 | + return $lcontext->setLocale($localeItem); |
|
324 | 324 | } |
325 | 325 | |
326 | 326 | |
@@ -331,14 +331,14 @@ discard block |
||
331 | 331 | * @param array $msg Message data |
332 | 332 | * @return \Aimeos\MW\Criteria\Iface Initialized criteria object |
333 | 333 | */ |
334 | - protected function initCriteria( \Aimeos\MW\Criteria\Iface $criteria, array $msg ) |
|
334 | + protected function initCriteria(\Aimeos\MW\Criteria\Iface $criteria, array $msg) |
|
335 | 335 | { |
336 | - if( isset( $msg['filter'] ) ) { |
|
337 | - $criteria->setConditions( $criteria->toConditions( $msg['filter'] ) ); |
|
336 | + if (isset($msg['filter'])) { |
|
337 | + $criteria->setConditions($criteria->toConditions($msg['filter'])); |
|
338 | 338 | } |
339 | 339 | |
340 | - if( isset( $msg['sort'] ) ) { |
|
341 | - $criteria->setSortations( $criteria->toSortations( $msg['sort'] ) ); |
|
340 | + if (isset($msg['sort'])) { |
|
341 | + $criteria->setSortations($criteria->toSortations($msg['sort'])); |
|
342 | 342 | } |
343 | 343 | |
344 | 344 | return $criteria; |
@@ -352,12 +352,12 @@ discard block |
||
352 | 352 | * @param string $path Absolute path to the exported file |
353 | 353 | * @return string Relative path of the file in the storage |
354 | 354 | */ |
355 | - protected function moveFile( $context, $path ) |
|
355 | + protected function moveFile($context, $path) |
|
356 | 356 | { |
357 | - $filename = basename( $path ); |
|
358 | - $context->getFileSystemManager()->get( 'fs-admin' )->writef( $filename, $path ); |
|
357 | + $filename = basename($path); |
|
358 | + $context->getFileSystemManager()->get('fs-admin')->writef($filename, $path); |
|
359 | 359 | |
360 | - unlink( $path ); |
|
360 | + unlink($path); |
|
361 | 361 | return $filename; |
362 | 362 | } |
363 | 363 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * @param string|null $name Name of the controller or "Standard" if null |
30 | 30 | * @return \Aimeos\Controller\Jobs\Iface New controller object |
31 | 31 | */ |
32 | - public static function createController( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null ) |
|
32 | + public static function createController(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null) |
|
33 | 33 | { |
34 | 34 | /** controller/jobs/order/export/csv/name |
35 | 35 | * Class name of the used order suggestions scheduler controller implementation |
@@ -64,20 +64,20 @@ discard block |
||
64 | 64 | * @since 2015.01 |
65 | 65 | * @category Developer |
66 | 66 | */ |
67 | - if ( $name === null ) { |
|
67 | + if ($name === null) { |
|
68 | 68 | $name = $context->getConfig()->get('controller/jobs/order/export/csv/name', 'Standard'); |
69 | 69 | } |
70 | 70 | |
71 | - if ( ctype_alnum($name) === false ) |
|
71 | + if (ctype_alnum($name) === false) |
|
72 | 72 | { |
73 | 73 | $classname = is_string($name) ? '\\Aimeos\\Controller\\Jobs\\Order\\Export\\Csv\\' . $name : '<not a string>'; |
74 | - throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
|
74 | + throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname)); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | $iface = '\\Aimeos\\Controller\\Jobs\\Iface'; |
78 | 78 | $classname = '\\Aimeos\\Controller\\Jobs\\Order\\Export\\Csv\\' . $name; |
79 | 79 | |
80 | - $controller = self::createControllerBase( $context, $aimeos, $classname, $iface ); |
|
80 | + $controller = self::createControllerBase($context, $aimeos, $classname, $iface); |
|
81 | 81 | |
82 | 82 | /** controller/jobs/order/export/csv/decorators/excludes |
83 | 83 | * Excludes decorators added by the "common" option from the order export CSV job controller |
@@ -154,6 +154,6 @@ discard block |
||
154 | 154 | * @see controller/jobs/order/export/csv/decorators/excludes |
155 | 155 | * @see controller/jobs/order/export/csv/decorators/global |
156 | 156 | */ |
157 | - return self::addControllerDecorators( $context, $aimeos, $controller, 'order/export/csv' ); |
|
157 | + return self::addControllerDecorators($context, $aimeos, $controller, 'order/export/csv'); |
|
158 | 158 | } |
159 | 159 | } |
160 | 160 | \ No newline at end of file |
@@ -18,37 +18,37 @@ |
||
18 | 18 | ); |
19 | 19 | |
20 | 20 | |
21 | - $object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Coupon\Standard( $context, $mapping ); |
|
21 | + $object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Coupon\Standard($context, $mapping); |
|
22 | 22 | |
23 | - $invoice = $this->getInvoice( $context ); |
|
24 | - $order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->load( $invoice->getBaseId() ); |
|
23 | + $invoice = $this->getInvoice($context); |
|
24 | + $order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->load($invoice->getBaseId()); |
|
25 | 25 | |
26 | - $data = $object->process( $invoice, $order ); |
|
26 | + $data = $object->process($invoice, $order); |
|
27 | 27 | |
28 | 28 | |
29 | - $this->assertEquals( 2, count( $data ) ); |
|
29 | + $this->assertEquals(2, count($data)); |
|
30 | 30 | |
31 | - $this->assertEquals( 1, count( $data[0] ) ); |
|
32 | - $this->assertEquals( '5678', $data[0][0] ); |
|
31 | + $this->assertEquals(1, count($data[0])); |
|
32 | + $this->assertEquals('5678', $data[0][0]); |
|
33 | 33 | |
34 | - $this->assertEquals( 1, count( $data[1] ) ); |
|
35 | - $this->assertEquals( 'OPQR', $data[1][0] ); |
|
34 | + $this->assertEquals(1, count($data[1])); |
|
35 | + $this->assertEquals('OPQR', $data[1][0]); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | |
39 | - protected function getInvoice( $context ) |
|
39 | + protected function getInvoice($context) |
|
40 | 40 | { |
41 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
41 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
42 | 42 | |
43 | 43 | $search = $manager->createSearch(); |
44 | - $search->setConditions( $search->compare( '==', 'order.datepayment', '2008-02-15 12:34:56' ) ); |
|
44 | + $search->setConditions($search->compare('==', 'order.datepayment', '2008-02-15 12:34:56')); |
|
45 | 45 | |
46 | - $items = $manager->searchItems( $search ); |
|
46 | + $items = $manager->searchItems($search); |
|
47 | 47 | |
48 | - if( ( $item = reset( $items ) ) !== false ) { |
|
48 | + if (($item = reset($items)) !== false) { |
|
49 | 49 | return $item; |
50 | 50 | } |
51 | 51 | |
52 | - throw new \Exception( 'No order item found' ); |
|
52 | + throw new \Exception('No order item found'); |
|
53 | 53 | } |
54 | 54 | } |