@@ -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\Order\Service\Delivery\Standard( $context, $aimeos ); |
|
27 | + $this->object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\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( 'Process order delivery services', $this->object->getName() ); |
|
45 | + $this->assertEquals('Process order delivery services', $this->object->getName()); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | |
49 | 49 | public function testGetDescription() |
50 | 50 | { |
51 | 51 | $text = 'Sends paid orders to the ERP system or logistic partner'; |
52 | - $this->assertEquals( $text, $this->object->getDescription() ); |
|
52 | + $this->assertEquals($text, $this->object->getDescription()); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | |
@@ -60,47 +60,47 @@ discard block |
||
60 | 60 | |
61 | 61 | |
62 | 62 | $name = 'ControllerJobsServiceDeliveryProcessDefaultRun'; |
63 | - $context->getConfig()->set( 'mshop/service/manager/name', $name ); |
|
64 | - $context->getConfig()->set( 'mshop/order/manager/name', $name ); |
|
63 | + $context->getConfig()->set('mshop/service/manager/name', $name); |
|
64 | + $context->getConfig()->set('mshop/order/manager/name', $name); |
|
65 | 65 | |
66 | 66 | |
67 | - $serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' ) |
|
68 | - ->setMethods( array( 'getProvider', 'searchItems' ) ) |
|
69 | - ->setConstructorArgs( array( $context ) ) |
|
67 | + $serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard') |
|
68 | + ->setMethods(array('getProvider', 'searchItems')) |
|
69 | + ->setConstructorArgs(array($context)) |
|
70 | 70 | ->getMock(); |
71 | 71 | |
72 | - $orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' ) |
|
73 | - ->setMethods( array( 'saveItem', 'searchItems' ) ) |
|
74 | - ->setConstructorArgs( array( $context ) ) |
|
72 | + $orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard') |
|
73 | + ->setMethods(array('saveItem', 'searchItems')) |
|
74 | + ->setConstructorArgs(array($context)) |
|
75 | 75 | ->getMock(); |
76 | 76 | |
77 | - \Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub ); |
|
78 | - \Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub ); |
|
77 | + \Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub); |
|
78 | + \Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub); |
|
79 | 79 | |
80 | 80 | |
81 | 81 | $serviceItem = $serviceManagerStub->createItem(); |
82 | 82 | $orderItem = $orderManagerStub->createItem(); |
83 | 83 | |
84 | - $serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Manual' ) |
|
85 | - ->setConstructorArgs( array( $context, $serviceItem ) ) |
|
84 | + $serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Manual') |
|
85 | + ->setConstructorArgs(array($context, $serviceItem)) |
|
86 | 86 | ->getMock(); |
87 | 87 | |
88 | 88 | |
89 | - $serviceManagerStub->expects( $this->once() )->method( 'searchItems' ) |
|
90 | - ->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) ); |
|
89 | + $serviceManagerStub->expects($this->once())->method('searchItems') |
|
90 | + ->will($this->onConsecutiveCalls(array($serviceItem), [])); |
|
91 | 91 | |
92 | - $serviceManagerStub->expects( $this->once() )->method( 'getProvider' ) |
|
93 | - ->will( $this->returnValue( $serviceProviderStub ) ); |
|
92 | + $serviceManagerStub->expects($this->once())->method('getProvider') |
|
93 | + ->will($this->returnValue($serviceProviderStub)); |
|
94 | 94 | |
95 | - $orderManagerStub->expects( $this->once() )->method( 'searchItems' ) |
|
96 | - ->will( $this->onConsecutiveCalls( array( $orderItem ), [] ) ); |
|
95 | + $orderManagerStub->expects($this->once())->method('searchItems') |
|
96 | + ->will($this->onConsecutiveCalls(array($orderItem), [])); |
|
97 | 97 | |
98 | - $serviceProviderStub->expects( $this->once() )->method( 'process' ); |
|
98 | + $serviceProviderStub->expects($this->once())->method('process'); |
|
99 | 99 | |
100 | - $orderManagerStub->expects( $this->once() )->method( 'saveItem' ); |
|
100 | + $orderManagerStub->expects($this->once())->method('saveItem'); |
|
101 | 101 | |
102 | 102 | |
103 | - $object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard( $context, $aimeos ); |
|
103 | + $object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard($context, $aimeos); |
|
104 | 104 | $object->run(); |
105 | 105 | } |
106 | 106 | |
@@ -112,48 +112,48 @@ discard block |
||
112 | 112 | |
113 | 113 | |
114 | 114 | $name = 'ControllerJobsServiceDeliveryProcessDefaultRun'; |
115 | - $context->getConfig()->set( 'mshop/service/manager/name', $name ); |
|
116 | - $context->getConfig()->set( 'mshop/order/manager/name', $name ); |
|
115 | + $context->getConfig()->set('mshop/service/manager/name', $name); |
|
116 | + $context->getConfig()->set('mshop/order/manager/name', $name); |
|
117 | 117 | |
118 | 118 | |
119 | - $orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' ) |
|
120 | - ->setMethods( array( 'saveItem', 'searchItems' ) ) |
|
121 | - ->setConstructorArgs( array( $context ) ) |
|
119 | + $orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard') |
|
120 | + ->setMethods(array('saveItem', 'searchItems')) |
|
121 | + ->setConstructorArgs(array($context)) |
|
122 | 122 | ->getMock(); |
123 | 123 | |
124 | - $serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' ) |
|
125 | - ->setMethods( array( 'getProvider', 'searchItems' ) ) |
|
126 | - ->setConstructorArgs( array( $context ) ) |
|
124 | + $serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard') |
|
125 | + ->setMethods(array('getProvider', 'searchItems')) |
|
126 | + ->setConstructorArgs(array($context)) |
|
127 | 127 | ->getMock(); |
128 | 128 | |
129 | - \Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub ); |
|
130 | - \Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub ); |
|
129 | + \Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub); |
|
130 | + \Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub); |
|
131 | 131 | |
132 | 132 | |
133 | 133 | $serviceItem = $serviceManagerStub->createItem(); |
134 | 134 | $orderItem = $orderManagerStub->createItem(); |
135 | 135 | |
136 | - $serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Manual' ) |
|
137 | - ->setConstructorArgs( array( $context, $serviceItem ) ) |
|
136 | + $serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Manual') |
|
137 | + ->setConstructorArgs(array($context, $serviceItem)) |
|
138 | 138 | ->getMock(); |
139 | 139 | |
140 | 140 | |
141 | - $serviceManagerStub->expects( $this->once() )->method( 'searchItems' ) |
|
142 | - ->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) ); |
|
141 | + $serviceManagerStub->expects($this->once())->method('searchItems') |
|
142 | + ->will($this->onConsecutiveCalls(array($serviceItem), [])); |
|
143 | 143 | |
144 | - $serviceManagerStub->expects( $this->once() )->method( 'getProvider' ) |
|
145 | - ->will( $this->returnValue( $serviceProviderStub ) ); |
|
144 | + $serviceManagerStub->expects($this->once())->method('getProvider') |
|
145 | + ->will($this->returnValue($serviceProviderStub)); |
|
146 | 146 | |
147 | - $orderManagerStub->expects( $this->once() )->method( 'searchItems' ) |
|
148 | - ->will( $this->onConsecutiveCalls( array( $orderItem ), [] ) ); |
|
147 | + $orderManagerStub->expects($this->once())->method('searchItems') |
|
148 | + ->will($this->onConsecutiveCalls(array($orderItem), [])); |
|
149 | 149 | |
150 | - $serviceProviderStub->expects( $this->once() )->method( 'process' ) |
|
151 | - ->will( $this->throwException( new \Aimeos\MShop\Service\Exception( 'test order service delivery: process' ) ) ); |
|
150 | + $serviceProviderStub->expects($this->once())->method('process') |
|
151 | + ->will($this->throwException(new \Aimeos\MShop\Service\Exception('test order service delivery: process'))); |
|
152 | 152 | |
153 | - $orderManagerStub->expects( $this->never() )->method( 'saveItem' ); |
|
153 | + $orderManagerStub->expects($this->never())->method('saveItem'); |
|
154 | 154 | |
155 | 155 | |
156 | - $object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard( $context, $aimeos ); |
|
156 | + $object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard($context, $aimeos); |
|
157 | 157 | $object->run(); |
158 | 158 | } |
159 | 159 | |
@@ -165,36 +165,36 @@ discard block |
||
165 | 165 | |
166 | 166 | |
167 | 167 | $name = 'ControllerJobsServiceDeliveryProcessDefaultRun'; |
168 | - $context->getConfig()->set( 'mshop/service/manager/name', $name ); |
|
169 | - $context->getConfig()->set( 'mshop/order/manager/name', $name ); |
|
168 | + $context->getConfig()->set('mshop/service/manager/name', $name); |
|
169 | + $context->getConfig()->set('mshop/order/manager/name', $name); |
|
170 | 170 | |
171 | 171 | |
172 | - $orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' ) |
|
173 | - ->setMethods( array( 'saveItem', 'searchItems' ) ) |
|
174 | - ->setConstructorArgs( array( $context ) ) |
|
172 | + $orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard') |
|
173 | + ->setMethods(array('saveItem', 'searchItems')) |
|
174 | + ->setConstructorArgs(array($context)) |
|
175 | 175 | ->getMock(); |
176 | 176 | |
177 | - $serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' ) |
|
178 | - ->setMethods( array( 'getProvider', 'searchItems' ) ) |
|
179 | - ->setConstructorArgs( array( $context ) ) |
|
177 | + $serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard') |
|
178 | + ->setMethods(array('getProvider', 'searchItems')) |
|
179 | + ->setConstructorArgs(array($context)) |
|
180 | 180 | ->getMock(); |
181 | 181 | |
182 | - \Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub ); |
|
183 | - \Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub ); |
|
182 | + \Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub); |
|
183 | + \Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub); |
|
184 | 184 | |
185 | 185 | |
186 | 186 | $serviceItem = $serviceManagerStub->createItem(); |
187 | 187 | |
188 | - $serviceManagerStub->expects( $this->once() )->method( 'searchItems' ) |
|
189 | - ->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) ); |
|
188 | + $serviceManagerStub->expects($this->once())->method('searchItems') |
|
189 | + ->will($this->onConsecutiveCalls(array($serviceItem), [])); |
|
190 | 190 | |
191 | - $serviceManagerStub->expects( $this->once() )->method( 'getProvider' ) |
|
192 | - ->will( $this->throwException( new \Aimeos\MShop\Service\Exception( 'test sorder service delivery: getProvider' ) ) ); |
|
191 | + $serviceManagerStub->expects($this->once())->method('getProvider') |
|
192 | + ->will($this->throwException(new \Aimeos\MShop\Service\Exception('test sorder service delivery: getProvider'))); |
|
193 | 193 | |
194 | - $orderManagerStub->expects( $this->never() )->method( 'searchItems' ); |
|
194 | + $orderManagerStub->expects($this->never())->method('searchItems'); |
|
195 | 195 | |
196 | 196 | |
197 | - $object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard( $context, $aimeos ); |
|
197 | + $object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard($context, $aimeos); |
|
198 | 198 | $object->run(); |
199 | 199 | } |
200 | 200 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function getName() |
30 | 30 | { |
31 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Product export' ); |
|
31 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Product export'); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | */ |
40 | 40 | public function getDescription() |
41 | 41 | { |
42 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Exports all available products' ); |
|
42 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Exports all available products'); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | public function run() |
52 | 52 | { |
53 | 53 | $container = $this->createContainer(); |
54 | - $this->export( $container ); |
|
54 | + $this->export($container); |
|
55 | 55 | $container->close(); |
56 | 56 | } |
57 | 57 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | * @param \Aimeos\MW\Container\Content\Iface $content File content object |
63 | 63 | * @param \Aimeos\MShop\Product\Item\Iface[] $items List of product items |
64 | 64 | */ |
65 | - protected function addItems( \Aimeos\MW\Container\Content\Iface $content, array $items ) |
|
65 | + protected function addItems(\Aimeos\MW\Container\Content\Iface $content, array $items) |
|
66 | 66 | { |
67 | 67 | /** controller/jobs/product/export/standard/template-items |
68 | 68 | * Relative path to the XML items template of the product site map job controller. |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | |
95 | 95 | $view->exportItems = $items; |
96 | 96 | |
97 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
97 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | * @see controller/jobs/product/export/max-items |
124 | 124 | * @see controller/jobs/product/export/max-query |
125 | 125 | */ |
126 | - $location = $config->get( 'controller/jobs/product/export/location', sys_get_temp_dir() ); |
|
126 | + $location = $config->get('controller/jobs/product/export/location', sys_get_temp_dir()); |
|
127 | 127 | |
128 | 128 | /** controller/jobs/product/export/standard/container/type |
129 | 129 | * List of file container options for the export files |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | * @see controller/jobs/product/export/max-items |
141 | 141 | * @see controller/jobs/product/export/max-query |
142 | 142 | */ |
143 | - $container = $config->get( 'controller/jobs/product/export/standard/container/type', 'Directory' ); |
|
143 | + $container = $config->get('controller/jobs/product/export/standard/container/type', 'Directory'); |
|
144 | 144 | |
145 | 145 | /** controller/jobs/product/export/standard/container/content |
146 | 146 | * List of file container options for the export files |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | * @see controller/jobs/product/export/max-items |
158 | 158 | * @see controller/jobs/product/export/max-query |
159 | 159 | */ |
160 | - $content = $config->get( 'controller/jobs/product/export/standard/container/content', 'Binary' ); |
|
160 | + $content = $config->get('controller/jobs/product/export/standard/container/content', 'Binary'); |
|
161 | 161 | |
162 | 162 | /** controller/jobs/product/export/standard/container/options |
163 | 163 | * List of file container options for the export files |
@@ -174,9 +174,9 @@ discard block |
||
174 | 174 | * @see controller/jobs/product/export/max-items |
175 | 175 | * @see controller/jobs/product/export/max-query |
176 | 176 | */ |
177 | - $options = $config->get( 'controller/jobs/product/export/standard/container/options', [] ); |
|
177 | + $options = $config->get('controller/jobs/product/export/standard/container/options', []); |
|
178 | 178 | |
179 | - return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options ); |
|
179 | + return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options); |
|
180 | 180 | } |
181 | 181 | |
182 | 182 | |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | * @param integer $filenum New file number |
188 | 188 | * @return \Aimeos\MW\Container\Content\Iface New content object |
189 | 189 | */ |
190 | - protected function createContent( \Aimeos\MW\Container\Iface $container, $filenum ) |
|
190 | + protected function createContent(\Aimeos\MW\Container\Iface $container, $filenum) |
|
191 | 191 | { |
192 | 192 | /** controller/jobs/product/export/standard/template-header |
193 | 193 | * Relative path to the XML site map header template of the product site map job controller. |
@@ -217,9 +217,9 @@ discard block |
||
217 | 217 | $context = $this->getContext(); |
218 | 218 | $view = $context->getView(); |
219 | 219 | |
220 | - $content = $container->create( $this->getFilename( $filenum ) ); |
|
221 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
222 | - $container->add( $content ); |
|
220 | + $content = $container->create($this->getFilename($filenum)); |
|
221 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
222 | + $container->add($content); |
|
223 | 223 | |
224 | 224 | return $content; |
225 | 225 | } |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | * |
231 | 231 | * @param \Aimeos\MW\Container\Content\Iface $content |
232 | 232 | */ |
233 | - protected function closeContent( \Aimeos\MW\Container\Content\Iface $content ) |
|
233 | + protected function closeContent(\Aimeos\MW\Container\Content\Iface $content) |
|
234 | 234 | { |
235 | 235 | /** controller/jobs/product/export/standard/template-footer |
236 | 236 | * Relative path to the XML site map footer template of the product site map job controller. |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | $context = $this->getContext(); |
261 | 261 | $view = $context->getView(); |
262 | 262 | |
263 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
263 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
264 | 264 | } |
265 | 265 | |
266 | 266 | |
@@ -270,45 +270,45 @@ discard block |
||
270 | 270 | * @param \Aimeos\MW\Container\Iface $container Container object |
271 | 271 | * @return array List of content (file) names |
272 | 272 | */ |
273 | - protected function export( \Aimeos\MW\Container\Iface $container ) |
|
273 | + protected function export(\Aimeos\MW\Container\Iface $container) |
|
274 | 274 | { |
275 | - $default = array( 'attribute', 'media', 'price', 'product', 'text' ); |
|
275 | + $default = array('attribute', 'media', 'price', 'product', 'text'); |
|
276 | 276 | |
277 | - $domains = $this->getConfig( 'domains', $default ); |
|
278 | - $maxItems = $this->getConfig( 'max-items', 10000 ); |
|
279 | - $maxQuery = $this->getConfig( 'max-query', 1000 ); |
|
277 | + $domains = $this->getConfig('domains', $default); |
|
278 | + $maxItems = $this->getConfig('max-items', 10000); |
|
279 | + $maxQuery = $this->getConfig('max-query', 1000); |
|
280 | 280 | |
281 | 281 | $start = 0; $filenum = 1; |
282 | 282 | $names = []; |
283 | 283 | |
284 | - $productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' ); |
|
284 | + $productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product'); |
|
285 | 285 | |
286 | - $search = $productManager->createSearch( true ); |
|
287 | - $search->setSortations( array( $search->sort( '+', 'product.id' ) ) ); |
|
288 | - $search->setSlice( 0, $maxQuery ); |
|
286 | + $search = $productManager->createSearch(true); |
|
287 | + $search->setSortations(array($search->sort('+', 'product.id'))); |
|
288 | + $search->setSlice(0, $maxQuery); |
|
289 | 289 | |
290 | - $content = $this->createContent( $container, $filenum ); |
|
290 | + $content = $this->createContent($container, $filenum); |
|
291 | 291 | $names[] = $content->getResource(); |
292 | 292 | |
293 | 293 | do |
294 | 294 | { |
295 | - $items = $productManager->searchItems( $search, $domains ); |
|
296 | - $this->addItems( $content, $items ); |
|
295 | + $items = $productManager->searchItems($search, $domains); |
|
296 | + $this->addItems($content, $items); |
|
297 | 297 | |
298 | - $count = count( $items ); |
|
298 | + $count = count($items); |
|
299 | 299 | $start += $count; |
300 | - $search->setSlice( $start, $maxQuery ); |
|
300 | + $search->setSlice($start, $maxQuery); |
|
301 | 301 | |
302 | - if( $start + $maxQuery > $maxItems * $filenum ) |
|
302 | + if ($start + $maxQuery > $maxItems * $filenum) |
|
303 | 303 | { |
304 | - $this->closeContent( $content ); |
|
305 | - $content = $this->createContent( $container, ++$filenum ); |
|
304 | + $this->closeContent($content); |
|
305 | + $content = $this->createContent($container, ++$filenum); |
|
306 | 306 | $names[] = $content->getResource(); |
307 | 307 | } |
308 | 308 | } |
309 | - while( $count >= $search->getSliceSize() ); |
|
309 | + while ($count >= $search->getSliceSize()); |
|
310 | 310 | |
311 | - $this->closeContent( $content ); |
|
311 | + $this->closeContent($content); |
|
312 | 312 | |
313 | 313 | return $names; |
314 | 314 | } |
@@ -321,11 +321,11 @@ discard block |
||
321 | 321 | * @param mixed $default Default value if name is unknown |
322 | 322 | * @return mixed Configuration value |
323 | 323 | */ |
324 | - protected function getConfig( $name, $default = null ) |
|
324 | + protected function getConfig($name, $default = null) |
|
325 | 325 | { |
326 | 326 | $config = $this->getContext()->getConfig(); |
327 | 327 | |
328 | - switch( $name ) |
|
328 | + switch ($name) |
|
329 | 329 | { |
330 | 330 | case 'domain': |
331 | 331 | /** controller/jobs/product/export/domains |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | * @see controller/jobs/product/export/max-items |
348 | 348 | * @see controller/jobs/product/export/max-query |
349 | 349 | */ |
350 | - return $config->get( 'controller/jobs/product/export/domains', $default ); |
|
350 | + return $config->get('controller/jobs/product/export/domains', $default); |
|
351 | 351 | |
352 | 352 | case 'max-items': |
353 | 353 | /** controller/jobs/product/export/max-items |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | * @see controller/jobs/product/export/max-query |
370 | 370 | * @see controller/jobs/product/export/domains |
371 | 371 | */ |
372 | - return $config->get( 'controller/jobs/product/export/max-items', $default ); |
|
372 | + return $config->get('controller/jobs/product/export/max-items', $default); |
|
373 | 373 | |
374 | 374 | case 'max-query': |
375 | 375 | /** controller/jobs/product/export/max-query |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | * @see controller/jobs/product/export/max-items |
392 | 392 | * @see controller/jobs/product/export/domains |
393 | 393 | */ |
394 | - return $config->get( 'controller/jobs/product/export/max-query', $default ); |
|
394 | + return $config->get('controller/jobs/product/export/max-query', $default); |
|
395 | 395 | } |
396 | 396 | |
397 | 397 | return $default; |
@@ -404,8 +404,8 @@ discard block |
||
404 | 404 | * @param integer $number Current file number |
405 | 405 | * @return string New file name |
406 | 406 | */ |
407 | - protected function getFilename( $number ) |
|
407 | + protected function getFilename($number) |
|
408 | 408 | { |
409 | - return sprintf( 'aimeos-products-%d.xml', $number ); |
|
409 | + return sprintf('aimeos-products-%d.xml', $number); |
|
410 | 410 | } |
411 | 411 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function getName() |
31 | 31 | { |
32 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Log cleanup' ); |
|
32 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Log cleanup'); |
|
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', 'Removes the old log entries from the database and archives them (optional)' ); |
|
43 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Removes the old log entries from the database and archives them (optional)'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -71,8 +71,8 @@ discard block |
||
71 | 71 | * @see controller/jobs/admin/log/standard/container/format |
72 | 72 | * @see controller/jobs/admin/log/standard/container/options |
73 | 73 | */ |
74 | - $limit = $config->get( 'controller/jobs/admin/log/standard/limit-days', 30 ); |
|
75 | - $limitDate = date( 'Y-m-d H:i:s', time() - $limit * 86400 ); |
|
74 | + $limit = $config->get('controller/jobs/admin/log/standard/limit-days', 30); |
|
75 | + $limitDate = date('Y-m-d H:i:s', time() - $limit * 86400); |
|
76 | 76 | |
77 | 77 | /** controller/jobs/admin/log/standard/path |
78 | 78 | * Path to a writable directory where the log archive files should be stored |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * @see controller/jobs/admin/log/standard/container/options |
102 | 102 | * @see controller/jobs/admin/log/standard/limit-days |
103 | 103 | */ |
104 | - if( ( $path = $config->get( 'controller/jobs/admin/log/standard/path', null ) ) !== null ) |
|
104 | + if (($path = $config->get('controller/jobs/admin/log/standard/path', null)) !== null) |
|
105 | 105 | { |
106 | 106 | /** controller/jobs/admin/log/standard/container/type |
107 | 107 | * Container file type storing all coupon code files to import |
@@ -175,19 +175,19 @@ discard block |
||
175 | 175 | * @see controller/jobs/admin/log/standard/limit-days |
176 | 176 | */ |
177 | 177 | |
178 | - $type = $config->get( 'controller/jobs/admin/log/standard/container/type', 'Zip' ); |
|
179 | - $format = $config->get( 'controller/jobs/admin/log/standard/container/format', 'CSV' ); |
|
180 | - $options = $config->get( 'controller/jobs/admin/log/standard/container/options', [] ); |
|
178 | + $type = $config->get('controller/jobs/admin/log/standard/container/type', 'Zip'); |
|
179 | + $format = $config->get('controller/jobs/admin/log/standard/container/format', 'CSV'); |
|
180 | + $options = $config->get('controller/jobs/admin/log/standard/container/options', []); |
|
181 | 181 | |
182 | - $path .= DIRECTORY_SEPARATOR . str_replace( ' ', '_', $limitDate ); |
|
183 | - $container = \Aimeos\MW\Container\Factory::getContainer( $path, $type, $format, $options ); |
|
182 | + $path .= DIRECTORY_SEPARATOR . str_replace(' ', '_', $limitDate); |
|
183 | + $container = \Aimeos\MW\Container\Factory::getContainer($path, $type, $format, $options); |
|
184 | 184 | } |
185 | 185 | |
186 | - $manager = \Aimeos\MAdmin\Factory::createManager( $context, 'log' ); |
|
186 | + $manager = \Aimeos\MAdmin\Factory::createManager($context, 'log'); |
|
187 | 187 | |
188 | 188 | $search = $manager->createSearch(); |
189 | - $search->setConditions( $search->compare( '<=', 'log.timestamp', $limitDate ) ); |
|
190 | - $search->setSortations( array( $search->sort( '+', 'log.timestamp' ) ) ); |
|
189 | + $search->setConditions($search->compare('<=', 'log.timestamp', $limitDate)); |
|
190 | + $search->setSortations(array($search->sort('+', 'log.timestamp'))); |
|
191 | 191 | |
192 | 192 | $start = 0; |
193 | 193 | $contents = []; |
@@ -195,37 +195,37 @@ discard block |
||
195 | 195 | do |
196 | 196 | { |
197 | 197 | $ids = []; |
198 | - $items = $manager->searchItems( $search ); |
|
198 | + $items = $manager->searchItems($search); |
|
199 | 199 | |
200 | - foreach( $items as $id => $item ) |
|
200 | + foreach ($items as $id => $item) |
|
201 | 201 | { |
202 | - if( $container !== null ) |
|
202 | + if ($container !== null) |
|
203 | 203 | { |
204 | 204 | $facility = $item->getFacility(); |
205 | 205 | |
206 | - if( !isset( $contents[$facility] ) ) { |
|
207 | - $contents[$facility] = $container->create( $facility ); |
|
206 | + if (!isset($contents[$facility])) { |
|
207 | + $contents[$facility] = $container->create($facility); |
|
208 | 208 | } |
209 | 209 | |
210 | - $contents[$facility]->add( $item->toArray() ); |
|
210 | + $contents[$facility]->add($item->toArray()); |
|
211 | 211 | } |
212 | 212 | |
213 | 213 | $ids[] = $id; |
214 | 214 | } |
215 | 215 | |
216 | - $manager->deleteItems( $ids ); |
|
216 | + $manager->deleteItems($ids); |
|
217 | 217 | |
218 | - $count = count( $items ); |
|
218 | + $count = count($items); |
|
219 | 219 | $start += $count; |
220 | - $search->setSlice( $start ); |
|
220 | + $search->setSlice($start); |
|
221 | 221 | } |
222 | - while( $count >= $search->getSliceSize() ); |
|
222 | + while ($count >= $search->getSliceSize()); |
|
223 | 223 | |
224 | 224 | |
225 | - if( $container !== null && !empty( $contents ) ) |
|
225 | + if ($container !== null && !empty($contents)) |
|
226 | 226 | { |
227 | - foreach( $contents as $content ) { |
|
228 | - $container->add( $content ); |
|
227 | + foreach ($contents as $content) { |
|
228 | + $container->add($content); |
|
229 | 229 | } |
230 | 230 | |
231 | 231 | $container->close(); |
@@ -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 | } |
@@ -15,14 +15,14 @@ discard block |
||
15 | 15 | public static function bootstrap() |
16 | 16 | { |
17 | 17 | self::getAimeos(); |
18 | - \Aimeos\MShop\Factory::setCache( false ); |
|
18 | + \Aimeos\MShop\Factory::setCache(false); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | |
22 | - public static function getContext( $site = 'unittest' ) |
|
22 | + public static function getContext($site = 'unittest') |
|
23 | 23 | { |
24 | - if( !isset( self::$context[$site] ) ) { |
|
25 | - self::$context[$site] = self::createContext( $site ); |
|
24 | + if (!isset(self::$context[$site])) { |
|
25 | + self::$context[$site] = self::createContext($site); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | return clone self::$context[$site]; |
@@ -31,13 +31,13 @@ discard block |
||
31 | 31 | |
32 | 32 | public static function getAimeos() |
33 | 33 | { |
34 | - if( !isset( self::$aimeos ) ) |
|
34 | + if (!isset(self::$aimeos)) |
|
35 | 35 | { |
36 | 36 | require_once 'Bootstrap.php'; |
37 | - spl_autoload_register( 'Aimeos\\Bootstrap::autoload' ); |
|
37 | + spl_autoload_register('Aimeos\\Bootstrap::autoload'); |
|
38 | 38 | |
39 | - $extdir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ); |
|
40 | - self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true ); |
|
39 | + $extdir = dirname(dirname(dirname(dirname(dirname(__FILE__))))); |
|
40 | + self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | return self::$aimeos; |
@@ -47,40 +47,40 @@ discard block |
||
47 | 47 | /** |
48 | 48 | * @param string $site |
49 | 49 | */ |
50 | - private static function createContext( $site ) |
|
50 | + private static function createContext($site) |
|
51 | 51 | { |
52 | 52 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
53 | 53 | $aimeos = self::getAimeos(); |
54 | 54 | |
55 | 55 | |
56 | - $paths = $aimeos->getConfigPaths( 'mysql' ); |
|
56 | + $paths = $aimeos->getConfigPaths('mysql'); |
|
57 | 57 | $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; |
58 | 58 | $file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser'; |
59 | 59 | |
60 | - $conf = new \Aimeos\MW\Config\PHPArray( [], $paths ); |
|
61 | - $conf = new \Aimeos\MW\Config\Decorator\Memory( $conf ); |
|
62 | - $conf = new \Aimeos\MW\Config\Decorator\Documentor( $conf, $file ); |
|
63 | - $ctx->setConfig( $conf ); |
|
60 | + $conf = new \Aimeos\MW\Config\PHPArray([], $paths); |
|
61 | + $conf = new \Aimeos\MW\Config\Decorator\Memory($conf); |
|
62 | + $conf = new \Aimeos\MW\Config\Decorator\Documentor($conf, $file); |
|
63 | + $ctx->setConfig($conf); |
|
64 | 64 | |
65 | 65 | |
66 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $conf ); |
|
67 | - $ctx->setDatabaseManager( $dbm ); |
|
66 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($conf); |
|
67 | + $ctx->setDatabaseManager($dbm); |
|
68 | 68 | |
69 | 69 | |
70 | - $logger = new \Aimeos\MW\Logger\File( 'unittest.log', \Aimeos\MW\Logger\Base::DEBUG ); |
|
71 | - $ctx->setLogger( $logger ); |
|
70 | + $logger = new \Aimeos\MW\Logger\File('unittest.log', \Aimeos\MW\Logger\Base::DEBUG); |
|
71 | + $ctx->setLogger($logger); |
|
72 | 72 | |
73 | 73 | |
74 | 74 | $session = new \Aimeos\MW\Session\None(); |
75 | - $ctx->setSession( $session ); |
|
75 | + $ctx->setSession($session); |
|
76 | 76 | |
77 | 77 | |
78 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx ); |
|
79 | - $locale = $localeManager->bootstrap( $site, '', '', false ); |
|
80 | - $ctx->setLocale( $locale ); |
|
78 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx); |
|
79 | + $locale = $localeManager->bootstrap($site, '', '', false); |
|
80 | + $ctx->setLocale($locale); |
|
81 | 81 | |
82 | 82 | |
83 | - $ctx->setEditor( 'core:controller/common' ); |
|
83 | + $ctx->setEditor('core:controller/common'); |
|
84 | 84 | |
85 | 85 | return $ctx; |
86 | 86 | } |
@@ -21,10 +21,10 @@ discard block |
||
21 | 21 | */ |
22 | 22 | protected function setUp() |
23 | 23 | { |
24 | - \Aimeos\MShop\Factory::setCache( true ); |
|
24 | + \Aimeos\MShop\Factory::setCache(true); |
|
25 | 25 | |
26 | 26 | $this->context = \TestHelperCntl::getContext(); |
27 | - $this->object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, [] ); |
|
27 | + $this->object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, []); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | */ |
37 | 37 | protected function tearDown() |
38 | 38 | { |
39 | - \Aimeos\MShop\Factory::setCache( false ); |
|
39 | + \Aimeos\MShop\Factory::setCache(false); |
|
40 | 40 | \Aimeos\MShop\Factory::clear(); |
41 | 41 | |
42 | 42 | $this->object = null; |
@@ -45,10 +45,10 @@ discard block |
||
45 | 45 | |
46 | 46 | public function testProcess() |
47 | 47 | { |
48 | - $product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->createItem(); |
|
48 | + $product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->createItem(); |
|
49 | 49 | |
50 | - $result = $this->object->process( $product, array( 'test' ) ); |
|
50 | + $result = $this->object->process($product, array('test')); |
|
51 | 51 | |
52 | - $this->assertEquals( array( 'test' ), $result ); |
|
52 | + $this->assertEquals(array('test'), $result); |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 | \ No newline at end of file |
@@ -14,92 +14,92 @@ discard block |
||
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 | 20 | $aimeos = \TestHelperCntl::getAimeos(); |
21 | 21 | |
22 | - $this->object = new TestAbstract( $context, $aimeos ); |
|
22 | + $this->object = new TestAbstract($context, $aimeos); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | |
26 | 26 | protected function tearDown() |
27 | 27 | { |
28 | - \Aimeos\MShop\Factory::setCache( false ); |
|
28 | + \Aimeos\MShop\Factory::setCache(false); |
|
29 | 29 | \Aimeos\MShop\Factory::clear(); |
30 | 30 | } |
31 | 31 | |
32 | 32 | |
33 | 33 | public function testGetCache() |
34 | 34 | { |
35 | - $cache = $this->object->getCachePublic( 'attribute' ); |
|
35 | + $cache = $this->object->getCachePublic('attribute'); |
|
36 | 36 | |
37 | - $this->assertInstanceOf( '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface', $cache ); |
|
37 | + $this->assertInstanceOf('\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface', $cache); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | |
41 | 41 | public function testGetCacheInvalidType() |
42 | 42 | { |
43 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
44 | - $this->object->getCachePublic( '$' ); |
|
43 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
44 | + $this->object->getCachePublic('$'); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | |
48 | 48 | public function testGetCacheInvalidClass() |
49 | 49 | { |
50 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
51 | - $this->object->getCachePublic( 'unknown' ); |
|
50 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
51 | + $this->object->getCachePublic('unknown'); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | |
55 | 55 | public function testGetCacheInvalidInterface() |
56 | 56 | { |
57 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
58 | - $this->object->getCachePublic( 'attribute', 'unknown' ); |
|
57 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
58 | + $this->object->getCachePublic('attribute', 'unknown'); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | |
62 | 62 | public function testGetProcessors() |
63 | 63 | { |
64 | - $processor = $this->object->getProcessorsPublic( array( 'attribute' => [] ) ); |
|
64 | + $processor = $this->object->getProcessorsPublic(array('attribute' => [])); |
|
65 | 65 | |
66 | - $this->assertInstanceOf( '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface', $processor ); |
|
66 | + $this->assertInstanceOf('\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface', $processor); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | |
70 | 70 | public function testGetProcessorsInvalidType() |
71 | 71 | { |
72 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
73 | - $this->object->getProcessorsPublic( array( '$' => [] ) ); |
|
72 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
73 | + $this->object->getProcessorsPublic(array('$' => [])); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | |
77 | 77 | public function testGetProcessorsInvalidClass() |
78 | 78 | { |
79 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
80 | - $this->object->getProcessorsPublic( array( 'unknown' => [] ) ); |
|
79 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
80 | + $this->object->getProcessorsPublic(array('unknown' => [])); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | |
84 | 84 | public function testGetProcessorsInvalidInterface() |
85 | 85 | { |
86 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
87 | - $this->object->getProcessorsPublic( array( 'unknown' => [] ) ); |
|
86 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
87 | + $this->object->getProcessorsPublic(array('unknown' => [])); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | |
91 | 91 | public function testGetTypeId() |
92 | 92 | { |
93 | - $typeid = $this->object->getTypeIdPublic( 'attribute/type', 'product', 'color' ); |
|
93 | + $typeid = $this->object->getTypeIdPublic('attribute/type', 'product', 'color'); |
|
94 | 94 | |
95 | - $this->assertNotEquals( null, $typeid ); |
|
95 | + $this->assertNotEquals(null, $typeid); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | |
99 | 99 | public function testGetTypeIdUnknown() |
100 | 100 | { |
101 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
102 | - $this->object->getTypeIdPublic( 'attribute/type', 'product', 'unknown' ); |
|
101 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
102 | + $this->object->getTypeIdPublic('attribute/type', 'product', 'unknown'); |
|
103 | 103 | } |
104 | 104 | } |
105 | 105 | |
@@ -107,21 +107,21 @@ discard block |
||
107 | 107 | class TestAbstract |
108 | 108 | extends \Aimeos\Controller\Common\Product\Import\Csv\Base |
109 | 109 | { |
110 | - public function getCachePublic( $type, $name = null ) |
|
110 | + public function getCachePublic($type, $name = null) |
|
111 | 111 | { |
112 | - return $this->getCache( $type, $name ); |
|
112 | + return $this->getCache($type, $name); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | |
116 | - public function getProcessorsPublic( array $mappings ) |
|
116 | + public function getProcessorsPublic(array $mappings) |
|
117 | 117 | { |
118 | - return $this->getProcessors( $mappings ); |
|
118 | + return $this->getProcessors($mappings); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | |
122 | - public function getTypeIdPublic( $path, $domain, $code ) |
|
122 | + public function getTypeIdPublic($path, $domain, $code) |
|
123 | 123 | { |
124 | - return $this->getTypeId( $path, $domain, $code ); |
|
124 | + return $this->getTypeId($path, $domain, $code); |
|
125 | 125 | } |
126 | 126 | } |
127 | 127 |
@@ -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 |