@@ -14,49 +14,49 @@ |
||
14 | 14 | |
15 | 15 | protected function setUp() |
16 | 16 | { |
17 | - \Aimeos\MShop\Factory::setCache( true ); |
|
17 | + \Aimeos\MShop\Factory::setCache(true); |
|
18 | 18 | |
19 | 19 | $context = \TestHelperCntl::getContext(); |
20 | - $this->object = new \Aimeos\Controller\Common\Product\Import\Csv\Cache\Attribute\Standard( $context ); |
|
20 | + $this->object = new \Aimeos\Controller\Common\Product\Import\Csv\Cache\Attribute\Standard($context); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | |
24 | 24 | protected function tearDown() |
25 | 25 | { |
26 | - \Aimeos\MShop\Factory::setCache( false ); |
|
26 | + \Aimeos\MShop\Factory::setCache(false); |
|
27 | 27 | \Aimeos\MShop\Factory::clear(); |
28 | 28 | } |
29 | 29 | |
30 | 30 | |
31 | 31 | public function testGet() |
32 | 32 | { |
33 | - $item = $this->object->get( 'black', 'color' ); |
|
33 | + $item = $this->object->get('black', 'color'); |
|
34 | 34 | |
35 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item ); |
|
36 | - $this->assertEquals( 'black', $item->getCode() ); |
|
37 | - $this->assertEquals( 'color', $item->getType() ); |
|
35 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item); |
|
36 | + $this->assertEquals('black', $item->getCode()); |
|
37 | + $this->assertEquals('color', $item->getType()); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | |
41 | 41 | public function testGetUnknown() |
42 | 42 | { |
43 | - $this->assertEquals( null, $this->object->get( 'cache-test', 'color' ) ); |
|
43 | + $this->assertEquals(null, $this->object->get('cache-test', 'color')); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
47 | 47 | public function testSet() |
48 | 48 | { |
49 | - $item = $this->object->get( 'black', 'color' ); |
|
49 | + $item = $this->object->get('black', 'color'); |
|
50 | 50 | |
51 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item ); |
|
51 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item); |
|
52 | 52 | |
53 | - $item->setCode( 'cache-test' ); |
|
53 | + $item->setCode('cache-test'); |
|
54 | 54 | |
55 | - $this->object->set( $item ); |
|
56 | - $item = $this->object->get( 'cache-test', 'color' ); |
|
55 | + $this->object->set($item); |
|
56 | + $item = $this->object->get('cache-test', 'color'); |
|
57 | 57 | |
58 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item ); |
|
59 | - $this->assertEquals( 'cache-test', $item->getCode() ); |
|
60 | - $this->assertEquals( 'color', $item->getType() ); |
|
58 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item); |
|
59 | + $this->assertEquals('cache-test', $item->getCode()); |
|
60 | + $this->assertEquals('color', $item->getType()); |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | \ No newline at end of file |
@@ -32,8 +32,8 @@ discard block |
||
32 | 32 | * @param array $mapping Associative list of field position in CSV as key and domain item key as value |
33 | 33 | * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor |
34 | 34 | */ |
35 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
36 | - \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null ) |
|
35 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
36 | + \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null) |
|
37 | 37 | { |
38 | 38 | $this->context = $context; |
39 | 39 | $this->mapping = $mapping; |
@@ -48,13 +48,13 @@ discard block |
||
48 | 48 | * @param integer $pos Computed position of the list item in the associated list of items |
49 | 49 | * @return array Given associative list enriched by default values if they were not already set |
50 | 50 | */ |
51 | - protected function addListItemDefaults( array $list, $pos ) |
|
51 | + protected function addListItemDefaults(array $list, $pos) |
|
52 | 52 | { |
53 | - if( !isset( $list['product.lists.position'] ) ) { |
|
53 | + if (!isset($list['product.lists.position'])) { |
|
54 | 54 | $list['product.lists.position'] = $pos; |
55 | 55 | } |
56 | 56 | |
57 | - if( !isset( $list['product.lists.status'] ) ) { |
|
57 | + if (!isset($list['product.lists.status'])) { |
|
58 | 58 | $list['product.lists.status'] = 1; |
59 | 59 | } |
60 | 60 | |
@@ -92,8 +92,8 @@ discard block |
||
92 | 92 | */ |
93 | 93 | protected function getObject() |
94 | 94 | { |
95 | - if( $this->object === null ) { |
|
96 | - throw new \Aimeos\Controller\Jobs\Exception( 'No processor object available' ); |
|
95 | + if ($this->object === null) { |
|
96 | + throw new \Aimeos\Controller\Jobs\Exception('No processor object available'); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | return $this->object; |
@@ -106,21 +106,21 @@ discard block |
||
106 | 106 | * @param array $data List of CSV fields with position as key and domain item key as value |
107 | 107 | * @return array List of associative arrays containing the chunked properties |
108 | 108 | */ |
109 | - protected function getMappedChunk( array &$data ) |
|
109 | + protected function getMappedChunk(array &$data) |
|
110 | 110 | { |
111 | 111 | $idx = 0; |
112 | 112 | $map = array(); |
113 | 113 | |
114 | - foreach( $this->getMapping() as $pos => $key ) |
|
114 | + foreach ($this->getMapping() as $pos => $key) |
|
115 | 115 | { |
116 | - if( isset( $map[$idx][$key] ) ) { |
|
116 | + if (isset($map[$idx][$key])) { |
|
117 | 117 | $idx++; |
118 | 118 | } |
119 | 119 | |
120 | - if( isset( $data[$pos] ) ) |
|
120 | + if (isset($data[$pos])) |
|
121 | 121 | { |
122 | 122 | $map[$idx][$key] = $data[$pos]; |
123 | - unset( $data[$pos] ); |
|
123 | + unset($data[$pos]); |
|
124 | 124 | } |
125 | 125 | } |
126 | 126 | |
@@ -136,8 +136,8 @@ discard block |
||
136 | 136 | * @param mixed $default Default value if key isn't found |
137 | 137 | * @param mixed Value for the key in the list of the default value |
138 | 138 | */ |
139 | - protected function getValue( array $list, $key, $default ) |
|
139 | + protected function getValue(array $list, $key, $default) |
|
140 | 140 | { |
141 | - return ( isset( $list[$key] ) ? $list[$key] : $default ); |
|
141 | + return (isset($list[$key]) ? $list[$key] : $default); |
|
142 | 142 | } |
143 | 143 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function getName() |
31 | 31 | { |
32 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Capture authorized payments' ); |
|
32 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Capture authorized payments'); |
|
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', 'Authorized payments of orders will be captured after dispatching or after a configurable amount of time' ); |
|
43 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Authorized payments of orders will be captured after dispatching or after a configurable amount of time'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -68,8 +68,8 @@ discard block |
||
68 | 68 | * @category User |
69 | 69 | * @category Developer |
70 | 70 | */ |
71 | - $days = $config->get( 'controller/jobs/order/service/payment/limit-days', 90 ); |
|
72 | - $date = date( 'Y-m-d 00:00:00', time() - 86400 * $days ); |
|
71 | + $days = $config->get('controller/jobs/order/service/payment/limit-days', 90); |
|
72 | + $date = date('Y-m-d 00:00:00', time() - 86400 * $days); |
|
73 | 73 | |
74 | 74 | /** controller/jobs/order/service/payment/capture-days |
75 | 75 | * Automatically capture payments after the configured amount of days |
@@ -84,90 +84,90 @@ discard block |
||
84 | 84 | * @category User |
85 | 85 | * @category Developer |
86 | 86 | */ |
87 | - $capDays = $config->get( 'controller/jobs/order/service/payment/capture-days', null ); |
|
87 | + $capDays = $config->get('controller/jobs/order/service/payment/capture-days', null); |
|
88 | 88 | |
89 | 89 | |
90 | - $serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' ); |
|
90 | + $serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service'); |
|
91 | 91 | $serviceSearch = $serviceManager->createSearch(); |
92 | - $serviceSearch->setConditions( $serviceSearch->compare( '==', 'service.type.code', 'payment' ) ); |
|
92 | + $serviceSearch->setConditions($serviceSearch->compare('==', 'service.type.code', 'payment')); |
|
93 | 93 | |
94 | - $orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
94 | + $orderManager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
95 | 95 | $orderSearch = $orderManager->createSearch(); |
96 | 96 | |
97 | - $status = array( \Aimeos\MShop\Order\Item\Base::STAT_DISPATCHED, \Aimeos\MShop\Order\Item\Base::STAT_DELIVERED ); |
|
97 | + $status = array(\Aimeos\MShop\Order\Item\Base::STAT_DISPATCHED, \Aimeos\MShop\Order\Item\Base::STAT_DELIVERED); |
|
98 | 98 | $start = 0; |
99 | 99 | |
100 | 100 | do |
101 | 101 | { |
102 | - $serviceItems = $serviceManager->searchItems( $serviceSearch ); |
|
102 | + $serviceItems = $serviceManager->searchItems($serviceSearch); |
|
103 | 103 | |
104 | - foreach( $serviceItems as $serviceItem ) |
|
104 | + foreach ($serviceItems as $serviceItem) |
|
105 | 105 | { |
106 | 106 | try |
107 | 107 | { |
108 | - $serviceProvider = $serviceManager->getProvider( $serviceItem ); |
|
108 | + $serviceProvider = $serviceManager->getProvider($serviceItem); |
|
109 | 109 | |
110 | - if( !$serviceProvider->isImplemented( \Aimeos\MShop\Service\Provider\Payment\Base::FEAT_CAPTURE ) ) { |
|
110 | + if (!$serviceProvider->isImplemented(\Aimeos\MShop\Service\Provider\Payment\Base::FEAT_CAPTURE)) { |
|
111 | 111 | continue; |
112 | 112 | } |
113 | 113 | |
114 | 114 | |
115 | 115 | $expr = array(); |
116 | - $expr[] = $orderSearch->compare( '>', 'order.datepayment', $date ); |
|
116 | + $expr[] = $orderSearch->compare('>', 'order.datepayment', $date); |
|
117 | 117 | |
118 | - if( $capDays !== null ) |
|
118 | + if ($capDays !== null) |
|
119 | 119 | { |
120 | - $capdate = date( 'Y-m-d 00:00:00', time() - 86400 * $capDays ); |
|
121 | - $expr[] = $orderSearch->compare( '<=', 'order.datepayment', $capdate ); |
|
120 | + $capdate = date('Y-m-d 00:00:00', time() - 86400 * $capDays); |
|
121 | + $expr[] = $orderSearch->compare('<=', 'order.datepayment', $capdate); |
|
122 | 122 | } |
123 | 123 | else |
124 | 124 | { |
125 | - $expr[] = $orderSearch->compare( '==', 'order.statusdelivery', $status ); |
|
125 | + $expr[] = $orderSearch->compare('==', 'order.statusdelivery', $status); |
|
126 | 126 | } |
127 | 127 | |
128 | - $expr[] = $orderSearch->compare( '==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ); |
|
129 | - $expr[] = $orderSearch->compare( '==', 'order.base.service.code', $serviceItem->getCode() ); |
|
130 | - $expr[] = $orderSearch->compare( '==', 'order.base.service.type', 'payment' ); |
|
128 | + $expr[] = $orderSearch->compare('==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED); |
|
129 | + $expr[] = $orderSearch->compare('==', 'order.base.service.code', $serviceItem->getCode()); |
|
130 | + $expr[] = $orderSearch->compare('==', 'order.base.service.type', 'payment'); |
|
131 | 131 | |
132 | - $orderSearch->setConditions( $orderSearch->combine( '&&', $expr ) ); |
|
132 | + $orderSearch->setConditions($orderSearch->combine('&&', $expr)); |
|
133 | 133 | |
134 | 134 | |
135 | 135 | $orderStart = 0; |
136 | 136 | |
137 | 137 | do |
138 | 138 | { |
139 | - $orderItems = $orderManager->searchItems( $orderSearch ); |
|
139 | + $orderItems = $orderManager->searchItems($orderSearch); |
|
140 | 140 | |
141 | - foreach( $orderItems as $orderItem ) |
|
141 | + foreach ($orderItems as $orderItem) |
|
142 | 142 | { |
143 | 143 | try |
144 | 144 | { |
145 | - $serviceProvider->capture( $orderItem ); |
|
145 | + $serviceProvider->capture($orderItem); |
|
146 | 146 | } |
147 | - catch( \Exception $e ) |
|
147 | + catch (\Exception $e) |
|
148 | 148 | { |
149 | 149 | $str = 'Error while capturing payment for order with ID "%1$s": %2$s'; |
150 | - $context->getLogger()->log( sprintf( $str, $orderItem->getId(), $e->getMessage() ) ); |
|
150 | + $context->getLogger()->log(sprintf($str, $orderItem->getId(), $e->getMessage())); |
|
151 | 151 | } |
152 | 152 | } |
153 | 153 | |
154 | - $orderCount = count( $orderItems ); |
|
154 | + $orderCount = count($orderItems); |
|
155 | 155 | $orderStart += $orderCount; |
156 | - $orderSearch->setSlice( $orderStart ); |
|
156 | + $orderSearch->setSlice($orderStart); |
|
157 | 157 | } |
158 | - while( $orderCount >= $orderSearch->getSliceSize() ); |
|
158 | + while ($orderCount >= $orderSearch->getSliceSize()); |
|
159 | 159 | } |
160 | - catch( \Exception $e ) |
|
160 | + catch (\Exception $e) |
|
161 | 161 | { |
162 | 162 | $str = 'Error while capturing payments for service with ID "%1$s": %2$s'; |
163 | - $context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) ); |
|
163 | + $context->getLogger()->log(sprintf($str, $serviceItem->getId(), $e->getMessage())); |
|
164 | 164 | } |
165 | 165 | } |
166 | 166 | |
167 | - $count = count( $serviceItems ); |
|
167 | + $count = count($serviceItems); |
|
168 | 168 | $start += $count; |
169 | - $serviceSearch->setSlice( $start ); |
|
169 | + $serviceSearch->setSlice($start); |
|
170 | 170 | } |
171 | - while( $count >= $serviceSearch->getSliceSize() ); |
|
171 | + while ($count >= $serviceSearch->getSliceSize()); |
|
172 | 172 | } |
173 | 173 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function getName() |
31 | 31 | { |
32 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Process order delivery services' ); |
|
32 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Process order delivery services'); |
|
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', 'Sends paid orders to the ERP system or logistic partner' ); |
|
43 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Sends paid orders to the ERP system or logistic partner'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -68,74 +68,74 @@ discard block |
||
68 | 68 | * @see controller/jobs/order/email/payment/standard/limit-days |
69 | 69 | * @see controller/jobs/order/email/delivery/standard/limit-days |
70 | 70 | */ |
71 | - $days = $context->getConfig()->get( 'controller/jobs/order/service/delivery/limit-days', 90 ); |
|
72 | - $date = date( 'Y-m-d 00:00:00', time() - 86400 * $days ); |
|
71 | + $days = $context->getConfig()->get('controller/jobs/order/service/delivery/limit-days', 90); |
|
72 | + $date = date('Y-m-d 00:00:00', time() - 86400 * $days); |
|
73 | 73 | |
74 | - $serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager( $context ); |
|
74 | + $serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager($context); |
|
75 | 75 | $serviceSearch = $serviceManager->createSearch(); |
76 | - $serviceSearch->setConditions( $serviceSearch->compare( '==', 'service.type.code', 'delivery' ) ); |
|
76 | + $serviceSearch->setConditions($serviceSearch->compare('==', 'service.type.code', 'delivery')); |
|
77 | 77 | |
78 | - $orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( $context ); |
|
78 | + $orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager($context); |
|
79 | 79 | $orderSearch = $orderManager->createSearch(); |
80 | 80 | |
81 | 81 | $start = 0; |
82 | 82 | |
83 | 83 | do |
84 | 84 | { |
85 | - $serviceItems = $serviceManager->searchItems( $serviceSearch ); |
|
85 | + $serviceItems = $serviceManager->searchItems($serviceSearch); |
|
86 | 86 | |
87 | - foreach( $serviceItems as $serviceItem ) |
|
87 | + foreach ($serviceItems as $serviceItem) |
|
88 | 88 | { |
89 | 89 | try |
90 | 90 | { |
91 | - $serviceProvider = $serviceManager->getProvider( $serviceItem ); |
|
91 | + $serviceProvider = $serviceManager->getProvider($serviceItem); |
|
92 | 92 | |
93 | 93 | $expr = array( |
94 | - $orderSearch->compare( '>', 'order.datepayment', $date ), |
|
95 | - $orderSearch->compare( '>', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_PENDING ), |
|
96 | - $orderSearch->compare( '==', 'order.statusdelivery', \Aimeos\MShop\Order\Item\Base::STAT_UNFINISHED ), |
|
97 | - $orderSearch->compare( '==', 'order.base.service.code', $serviceItem->getCode() ), |
|
98 | - $orderSearch->compare( '==', 'order.base.service.type', 'delivery' ), |
|
94 | + $orderSearch->compare('>', 'order.datepayment', $date), |
|
95 | + $orderSearch->compare('>', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_PENDING), |
|
96 | + $orderSearch->compare('==', 'order.statusdelivery', \Aimeos\MShop\Order\Item\Base::STAT_UNFINISHED), |
|
97 | + $orderSearch->compare('==', 'order.base.service.code', $serviceItem->getCode()), |
|
98 | + $orderSearch->compare('==', 'order.base.service.type', 'delivery'), |
|
99 | 99 | ); |
100 | - $orderSearch->setConditions( $orderSearch->combine( '&&', $expr ) ); |
|
100 | + $orderSearch->setConditions($orderSearch->combine('&&', $expr)); |
|
101 | 101 | |
102 | 102 | $orderStart = 0; |
103 | 103 | |
104 | 104 | do |
105 | 105 | { |
106 | - $orderItems = $orderManager->searchItems( $orderSearch ); |
|
106 | + $orderItems = $orderManager->searchItems($orderSearch); |
|
107 | 107 | |
108 | - foreach( $orderItems as $orderItem ) |
|
108 | + foreach ($orderItems as $orderItem) |
|
109 | 109 | { |
110 | 110 | try |
111 | 111 | { |
112 | - $serviceProvider->process( $orderItem ); |
|
113 | - $orderManager->saveItem( $orderItem ); |
|
112 | + $serviceProvider->process($orderItem); |
|
113 | + $orderManager->saveItem($orderItem); |
|
114 | 114 | } |
115 | - catch( \Exception $e ) |
|
115 | + catch (\Exception $e) |
|
116 | 116 | { |
117 | 117 | $str = 'Error while processing order with ID "%1$s": %2$s'; |
118 | - $context->getLogger()->log( sprintf( $str, $orderItem->getId(), $e->getMessage() ) ); |
|
118 | + $context->getLogger()->log(sprintf($str, $orderItem->getId(), $e->getMessage())); |
|
119 | 119 | } |
120 | 120 | } |
121 | 121 | |
122 | - $orderCount = count( $orderItems ); |
|
122 | + $orderCount = count($orderItems); |
|
123 | 123 | $orderStart += $orderCount; |
124 | - $orderSearch->setSlice( $orderStart ); |
|
124 | + $orderSearch->setSlice($orderStart); |
|
125 | 125 | } |
126 | - while( $orderCount >= $orderSearch->getSliceSize() ); |
|
126 | + while ($orderCount >= $orderSearch->getSliceSize()); |
|
127 | 127 | } |
128 | - catch( \Exception $e ) |
|
128 | + catch (\Exception $e) |
|
129 | 129 | { |
130 | 130 | $str = 'Error while processing service with ID "%1$s": %2$s'; |
131 | - $context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) ); |
|
131 | + $context->getLogger()->log(sprintf($str, $serviceItem->getId(), $e->getMessage())); |
|
132 | 132 | } |
133 | 133 | } |
134 | 134 | |
135 | - $count = count( $serviceItems ); |
|
135 | + $count = count($serviceItems); |
|
136 | 136 | $start += $count; |
137 | - $serviceSearch->setSlice( $start ); |
|
137 | + $serviceSearch->setSlice($start); |
|
138 | 138 | } |
139 | - while( $count >= $serviceSearch->getSliceSize() ); |
|
139 | + while ($count >= $serviceSearch->getSliceSize()); |
|
140 | 140 | } |
141 | 141 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function getName() |
31 | 31 | { |
32 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Index optimization' ); |
|
32 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Index optimization'); |
|
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', 'Optimizes the index for searching products faster' ); |
|
43 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Optimizes the index for searching products faster'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -51,6 +51,6 @@ discard block |
||
51 | 51 | */ |
52 | 52 | public function run() |
53 | 53 | { |
54 | - \Aimeos\MShop\Index\Manager\Factory::createManager( $this->getContext() )->optimize(); |
|
54 | + \Aimeos\MShop\Index\Manager\Factory::createManager($this->getContext())->optimize(); |
|
55 | 55 | } |
56 | 56 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function getName() |
31 | 31 | { |
32 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Index rebuild' ); |
|
32 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Index rebuild'); |
|
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', 'Rebuilds the index for searching products' ); |
|
43 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Rebuilds the index for searching products'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -51,15 +51,15 @@ discard block |
||
51 | 51 | */ |
52 | 52 | public function run() |
53 | 53 | { |
54 | - $timestamp = date( 'Y-m-d H:i:s' ); |
|
54 | + $timestamp = date('Y-m-d H:i:s'); |
|
55 | 55 | $context = clone $this->getContext(); |
56 | 56 | |
57 | - $context->getLocale()->setLanguageId( null ); |
|
58 | - $context->getLocale()->setCurrencyId( null ); |
|
57 | + $context->getLocale()->setLanguageId(null); |
|
58 | + $context->getLocale()->setCurrencyId(null); |
|
59 | 59 | |
60 | - $manager = \Aimeos\MShop\Index\Manager\Factory::createManager( $context ); |
|
60 | + $manager = \Aimeos\MShop\Index\Manager\Factory::createManager($context); |
|
61 | 61 | |
62 | 62 | $manager->rebuildIndex(); |
63 | - $manager->cleanupIndex( $timestamp ); |
|
63 | + $manager->cleanupIndex($timestamp); |
|
64 | 64 | } |
65 | 65 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $context = \TestHelperJobs::getContext(); |
25 | 25 | $aimeos = \TestHelperJobs::getAimeos(); |
26 | 26 | |
27 | - $this->object = new \Aimeos\Controller\Jobs\Index\Optimize\Standard( $context, $aimeos ); |
|
27 | + $this->object = new \Aimeos\Controller\Jobs\Index\Optimize\Standard($context, $aimeos); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | |
@@ -42,14 +42,14 @@ discard block |
||
42 | 42 | |
43 | 43 | public function testGetName() |
44 | 44 | { |
45 | - $this->assertEquals( 'Index optimization', $this->object->getName() ); |
|
45 | + $this->assertEquals('Index optimization', $this->object->getName()); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | |
49 | 49 | public function testGetDescription() |
50 | 50 | { |
51 | 51 | $text = 'Optimizes the index for searching products faster'; |
52 | - $this->assertEquals( $text, $this->object->getDescription() ); |
|
52 | + $this->assertEquals($text, $this->object->getDescription()); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | |
@@ -60,21 +60,21 @@ discard block |
||
60 | 60 | |
61 | 61 | |
62 | 62 | $name = 'ControllerJobsCatalogIndexOptimizeDefaultRun'; |
63 | - $context->getConfig()->set( 'mshop/index/manager/name', $name ); |
|
63 | + $context->getConfig()->set('mshop/index/manager/name', $name); |
|
64 | 64 | |
65 | 65 | |
66 | - $indexManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Index\\Manager\\Standard' ) |
|
67 | - ->setMethods( array( 'optimize' ) ) |
|
68 | - ->setConstructorArgs( array( $context ) ) |
|
66 | + $indexManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Index\\Manager\\Standard') |
|
67 | + ->setMethods(array('optimize')) |
|
68 | + ->setConstructorArgs(array($context)) |
|
69 | 69 | ->getMock(); |
70 | 70 | |
71 | - \Aimeos\MShop\Catalog\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Index\\Manager\\' . $name, $indexManagerStub ); |
|
71 | + \Aimeos\MShop\Catalog\Manager\Factory::injectManager('\\Aimeos\\MShop\\Index\\Manager\\' . $name, $indexManagerStub); |
|
72 | 72 | |
73 | 73 | |
74 | - $indexManagerStub->expects( $this->once() )->method( 'optimize' ); |
|
74 | + $indexManagerStub->expects($this->once())->method('optimize'); |
|
75 | 75 | |
76 | 76 | |
77 | - $object = new \Aimeos\Controller\Jobs\Index\Optimize\Standard( $context, $aimeos ); |
|
77 | + $object = new \Aimeos\Controller\Jobs\Index\Optimize\Standard($context, $aimeos); |
|
78 | 78 | $object->run(); |
79 | 79 | } |
80 | 80 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $context = \TestHelperJobs::getContext(); |
25 | 25 | $aimeos = \TestHelperJobs::getAimeos(); |
26 | 26 | |
27 | - $this->object = new \Aimeos\Controller\Jobs\Index\Rebuild\Standard( $context, $aimeos ); |
|
27 | + $this->object = new \Aimeos\Controller\Jobs\Index\Rebuild\Standard($context, $aimeos); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | |
@@ -42,14 +42,14 @@ discard block |
||
42 | 42 | |
43 | 43 | public function testGetName() |
44 | 44 | { |
45 | - $this->assertEquals( 'Index rebuild', $this->object->getName() ); |
|
45 | + $this->assertEquals('Index rebuild', $this->object->getName()); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | |
49 | 49 | public function testGetDescription() |
50 | 50 | { |
51 | 51 | $text = 'Rebuilds the index for searching products'; |
52 | - $this->assertEquals( $text, $this->object->getDescription() ); |
|
52 | + $this->assertEquals($text, $this->object->getDescription()); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | |
@@ -60,22 +60,22 @@ discard block |
||
60 | 60 | |
61 | 61 | |
62 | 62 | $name = 'ControllerJobsCatalogIndexRebuildDefaultRun'; |
63 | - $context->getConfig()->set( 'mshop/index/manager/name', $name ); |
|
63 | + $context->getConfig()->set('mshop/index/manager/name', $name); |
|
64 | 64 | |
65 | 65 | |
66 | - $indexManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Index\\Manager\\Standard' ) |
|
67 | - ->setMethods( array( 'rebuildIndex', 'cleanupIndex' ) ) |
|
68 | - ->setConstructorArgs( array( $context ) ) |
|
66 | + $indexManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Index\\Manager\\Standard') |
|
67 | + ->setMethods(array('rebuildIndex', 'cleanupIndex')) |
|
68 | + ->setConstructorArgs(array($context)) |
|
69 | 69 | ->getMock(); |
70 | 70 | |
71 | - \Aimeos\MShop\Catalog\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Index\\Manager\\' . $name, $indexManagerStub ); |
|
71 | + \Aimeos\MShop\Catalog\Manager\Factory::injectManager('\\Aimeos\\MShop\\Index\\Manager\\' . $name, $indexManagerStub); |
|
72 | 72 | |
73 | 73 | |
74 | - $indexManagerStub->expects( $this->once() )->method( 'rebuildIndex' ); |
|
75 | - $indexManagerStub->expects( $this->once() )->method( 'cleanupIndex' ); |
|
74 | + $indexManagerStub->expects($this->once())->method('rebuildIndex'); |
|
75 | + $indexManagerStub->expects($this->once())->method('cleanupIndex'); |
|
76 | 76 | |
77 | 77 | |
78 | - $object = new \Aimeos\Controller\Jobs\Index\Rebuild\Standard( $context, $aimeos ); |
|
78 | + $object = new \Aimeos\Controller\Jobs\Index\Rebuild\Standard($context, $aimeos); |
|
79 | 79 | $object->run(); |
80 | 80 | } |
81 | 81 | } |
@@ -15,16 +15,16 @@ discard block |
||
15 | 15 | |
16 | 16 | protected function setUp() |
17 | 17 | { |
18 | - \Aimeos\MShop\Factory::setCache( true ); |
|
18 | + \Aimeos\MShop\Factory::setCache(true); |
|
19 | 19 | |
20 | 20 | $this->context = \TestHelperCntl::getContext(); |
21 | - $this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, array() ); |
|
21 | + $this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, array()); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | |
25 | 25 | protected function tearDown() |
26 | 26 | { |
27 | - \Aimeos\MShop\Factory::setCache( false ); |
|
27 | + \Aimeos\MShop\Factory::setCache(false); |
|
28 | 28 | \Aimeos\MShop\Factory::clear(); |
29 | 29 | } |
30 | 30 | |
@@ -47,29 +47,29 @@ discard block |
||
47 | 47 | 4 => '50', |
48 | 48 | ); |
49 | 49 | |
50 | - $product = $this->create( 'job_csv_test' ); |
|
50 | + $product = $this->create('job_csv_test'); |
|
51 | 51 | |
52 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint ); |
|
53 | - $object->process( $product, $data ); |
|
52 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint); |
|
53 | + $object->process($product, $data); |
|
54 | 54 | |
55 | - $product = $this->get( 'job_csv_test' ); |
|
56 | - $items = $this->getProperties( $product->getId() ); |
|
57 | - $this->delete( $product ); |
|
55 | + $product = $this->get('job_csv_test'); |
|
56 | + $items = $this->getProperties($product->getId()); |
|
57 | + $this->delete($product); |
|
58 | 58 | |
59 | 59 | |
60 | 60 | $pos = 0; |
61 | 61 | $expected = array( |
62 | - array( 'package-weight', '3.00', 'de' ), |
|
63 | - array( 'package-width', '50', null ), |
|
62 | + array('package-weight', '3.00', 'de'), |
|
63 | + array('package-width', '50', null), |
|
64 | 64 | ); |
65 | 65 | |
66 | - $this->assertEquals( 2, count( $items ) ); |
|
66 | + $this->assertEquals(2, count($items)); |
|
67 | 67 | |
68 | - foreach( $items as $item ) |
|
68 | + foreach ($items as $item) |
|
69 | 69 | { |
70 | - $this->assertEquals( $expected[$pos][0], $item->getType() ); |
|
71 | - $this->assertEquals( $expected[$pos][1], $item->getValue() ); |
|
72 | - $this->assertEquals( $expected[$pos][2], $item->getLanguageId() ); |
|
70 | + $this->assertEquals($expected[$pos][0], $item->getType()); |
|
71 | + $this->assertEquals($expected[$pos][1], $item->getValue()); |
|
72 | + $this->assertEquals($expected[$pos][2], $item->getLanguageId()); |
|
73 | 73 | $pos++; |
74 | 74 | } |
75 | 75 | } |
@@ -92,27 +92,27 @@ discard block |
||
92 | 92 | 1 => '10', |
93 | 93 | ); |
94 | 94 | |
95 | - $product = $this->create( 'job_csv_test' ); |
|
95 | + $product = $this->create('job_csv_test'); |
|
96 | 96 | |
97 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint ); |
|
98 | - $object->process( $product, $data ); |
|
97 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint); |
|
98 | + $object->process($product, $data); |
|
99 | 99 | |
100 | - $product = $this->get( 'job_csv_test' ); |
|
100 | + $product = $this->get('job_csv_test'); |
|
101 | 101 | |
102 | - $object->process( $product, $dataUpdate ); |
|
102 | + $object->process($product, $dataUpdate); |
|
103 | 103 | |
104 | - $product = $this->get( 'job_csv_test' ); |
|
105 | - $items = $this->getProperties( $product->getId() ); |
|
106 | - $this->delete( $product ); |
|
104 | + $product = $this->get('job_csv_test'); |
|
105 | + $items = $this->getProperties($product->getId()); |
|
106 | + $this->delete($product); |
|
107 | 107 | |
108 | 108 | |
109 | - $item = reset( $items ); |
|
109 | + $item = reset($items); |
|
110 | 110 | |
111 | - $this->assertEquals( 1, count( $items ) ); |
|
112 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Product\\Item\\Property\\Iface', $item ); |
|
111 | + $this->assertEquals(1, count($items)); |
|
112 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Product\\Item\\Property\\Iface', $item); |
|
113 | 113 | |
114 | - $this->assertEquals( 'package-height', $item->getType() ); |
|
115 | - $this->assertEquals( '10', $item->getValue() ); |
|
114 | + $this->assertEquals('package-height', $item->getType()); |
|
115 | + $this->assertEquals('10', $item->getValue()); |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | |
@@ -128,22 +128,22 @@ discard block |
||
128 | 128 | 1 => '3.00', |
129 | 129 | ); |
130 | 130 | |
131 | - $product = $this->create( 'job_csv_test' ); |
|
131 | + $product = $this->create('job_csv_test'); |
|
132 | 132 | |
133 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint ); |
|
134 | - $object->process( $product, $data ); |
|
133 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint); |
|
134 | + $object->process($product, $data); |
|
135 | 135 | |
136 | - $product = $this->get( 'job_csv_test' ); |
|
136 | + $product = $this->get('job_csv_test'); |
|
137 | 137 | |
138 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, array(), $this->endpoint ); |
|
139 | - $object->process( $product, array() ); |
|
138 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, array(), $this->endpoint); |
|
139 | + $object->process($product, array()); |
|
140 | 140 | |
141 | - $product = $this->get( 'job_csv_test' ); |
|
142 | - $items = $this->getProperties( $product->getId() ); |
|
143 | - $this->delete( $product ); |
|
141 | + $product = $this->get('job_csv_test'); |
|
142 | + $items = $this->getProperties($product->getId()); |
|
143 | + $this->delete($product); |
|
144 | 144 | |
145 | 145 | |
146 | - $this->assertEquals( 0, count( $items ) ); |
|
146 | + $this->assertEquals(0, count($items)); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | |
@@ -163,87 +163,87 @@ discard block |
||
163 | 163 | 3 => '3.00', |
164 | 164 | ); |
165 | 165 | |
166 | - $product = $this->create( 'job_csv_test' ); |
|
166 | + $product = $this->create('job_csv_test'); |
|
167 | 167 | |
168 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint ); |
|
169 | - $object->process( $product, $data ); |
|
168 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint); |
|
169 | + $object->process($product, $data); |
|
170 | 170 | |
171 | - $product = $this->get( 'job_csv_test' ); |
|
172 | - $items = $this->getProperties( $product->getId() ); |
|
173 | - $this->delete( $product ); |
|
171 | + $product = $this->get('job_csv_test'); |
|
172 | + $items = $this->getProperties($product->getId()); |
|
173 | + $this->delete($product); |
|
174 | 174 | |
175 | 175 | |
176 | - $this->assertEquals( 1, count( $items ) ); |
|
176 | + $this->assertEquals(1, count($items)); |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | |
180 | 180 | /** |
181 | 181 | * @param string $code |
182 | 182 | */ |
183 | - protected function create( $code ) |
|
183 | + protected function create($code) |
|
184 | 184 | { |
185 | - $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context ); |
|
186 | - $typeManager = $manager->getSubManager( 'type' ); |
|
185 | + $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context); |
|
186 | + $typeManager = $manager->getSubManager('type'); |
|
187 | 187 | |
188 | 188 | $typeSearch = $typeManager->createSearch(); |
189 | - $typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) ); |
|
190 | - $typeResult = $typeManager->searchItems( $typeSearch ); |
|
189 | + $typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default')); |
|
190 | + $typeResult = $typeManager->searchItems($typeSearch); |
|
191 | 191 | |
192 | - if( ( $typeItem = reset( $typeResult ) ) === false ) { |
|
193 | - throw new \RuntimeException( 'No product type "default" found' ); |
|
192 | + if (($typeItem = reset($typeResult)) === false) { |
|
193 | + throw new \RuntimeException('No product type "default" found'); |
|
194 | 194 | } |
195 | 195 | |
196 | 196 | $item = $manager->createItem(); |
197 | - $item->setTypeid( $typeItem->getId() ); |
|
198 | - $item->setCode( $code ); |
|
197 | + $item->setTypeid($typeItem->getId()); |
|
198 | + $item->setCode($code); |
|
199 | 199 | |
200 | - $manager->saveItem( $item ); |
|
200 | + $manager->saveItem($item); |
|
201 | 201 | |
202 | 202 | return $item; |
203 | 203 | } |
204 | 204 | |
205 | 205 | |
206 | - protected function delete( \Aimeos\MShop\Product\Item\Iface $product ) |
|
206 | + protected function delete(\Aimeos\MShop\Product\Item\Iface $product) |
|
207 | 207 | { |
208 | - $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context ); |
|
209 | - $listManager = $manager->getSubManager( 'lists' ); |
|
208 | + $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context); |
|
209 | + $listManager = $manager->getSubManager('lists'); |
|
210 | 210 | |
211 | - foreach( $product->getListItems('attribute') as $listItem ) { |
|
212 | - $listManager->deleteItem( $listItem->getId() ); |
|
211 | + foreach ($product->getListItems('attribute') as $listItem) { |
|
212 | + $listManager->deleteItem($listItem->getId()); |
|
213 | 213 | } |
214 | 214 | |
215 | - $manager->deleteItem( $product->getId() ); |
|
215 | + $manager->deleteItem($product->getId()); |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | |
219 | 219 | /** |
220 | 220 | * @param string $code |
221 | 221 | */ |
222 | - protected function get( $code ) |
|
222 | + protected function get($code) |
|
223 | 223 | { |
224 | - $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context ); |
|
224 | + $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context); |
|
225 | 225 | |
226 | 226 | $search = $manager->createSearch(); |
227 | - $search->setConditions( $search->compare( '==', 'product.code', $code ) ); |
|
227 | + $search->setConditions($search->compare('==', 'product.code', $code)); |
|
228 | 228 | |
229 | - $result = $manager->searchItems( $search, array('attribute') ); |
|
229 | + $result = $manager->searchItems($search, array('attribute')); |
|
230 | 230 | |
231 | - if( ( $item = reset( $result ) ) === false ) { |
|
232 | - throw new \RuntimeException( sprintf( 'No product item for code "%1$s"', $code ) ); |
|
231 | + if (($item = reset($result)) === false) { |
|
232 | + throw new \RuntimeException(sprintf('No product item for code "%1$s"', $code)); |
|
233 | 233 | } |
234 | 234 | |
235 | 235 | return $item; |
236 | 236 | } |
237 | 237 | |
238 | 238 | |
239 | - protected function getProperties( $prodid ) |
|
239 | + protected function getProperties($prodid) |
|
240 | 240 | { |
241 | - $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context )->getSubManager( 'property' ); |
|
241 | + $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context)->getSubManager('property'); |
|
242 | 242 | |
243 | 243 | $search = $manager->createSearch(); |
244 | - $search->setConditions( $search->compare( '==', 'product.property.parentid', $prodid ) ); |
|
245 | - $search->setSortations( array( $search->sort( '+', 'product.property.type.code' ) ) ); |
|
244 | + $search->setConditions($search->compare('==', 'product.property.parentid', $prodid)); |
|
245 | + $search->setSortations(array($search->sort('+', 'product.property.type.code'))); |
|
246 | 246 | |
247 | - return $manager->searchItems( $search ); |
|
247 | + return $manager->searchItems($search); |
|
248 | 248 | } |
249 | 249 | } |
250 | 250 | \ No newline at end of file |