@@ -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 | |
@@ -69,8 +69,8 @@ discard block |
||
69 | 69 | * @see controller/jobs/order/email/delivery/standard/limit-days |
70 | 70 | * @see controller/jobs/order/service/delivery/batch-max |
71 | 71 | */ |
72 | - $days = $context->getConfig()->get( 'controller/jobs/order/service/delivery/limit-days', 90 ); |
|
73 | - $date = date( 'Y-m-d 00:00:00', time() - 86400 * $days ); |
|
72 | + $days = $context->getConfig()->get('controller/jobs/order/service/delivery/limit-days', 90); |
|
73 | + $date = date('Y-m-d 00:00:00', time() - 86400 * $days); |
|
74 | 74 | |
75 | 75 | /** controller/jobs/order/service/delivery/batch-max |
76 | 76 | * Maximum number of orders processed at once by the delivery service provider |
@@ -85,71 +85,71 @@ discard block |
||
85 | 85 | * @category Developer |
86 | 86 | * @see controller/jobs/order/service/delivery/limit-days |
87 | 87 | */ |
88 | - $maxItems = $context->getConfig()->get( 'controller/jobs/order/service/delivery/batch-max', 100 ); |
|
88 | + $maxItems = $context->getConfig()->get('controller/jobs/order/service/delivery/batch-max', 100); |
|
89 | 89 | |
90 | 90 | |
91 | - $serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager( $context ); |
|
91 | + $serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager($context); |
|
92 | 92 | $serviceSearch = $serviceManager->createSearch(); |
93 | - $serviceSearch->setConditions( $serviceSearch->compare( '==', 'service.type.code', 'delivery' ) ); |
|
93 | + $serviceSearch->setConditions($serviceSearch->compare('==', 'service.type.code', 'delivery')); |
|
94 | 94 | |
95 | - $orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( $context ); |
|
95 | + $orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager($context); |
|
96 | 96 | $orderSearch = $orderManager->createSearch(); |
97 | 97 | |
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, $serviceItem->getType() ); |
|
108 | + $serviceProvider = $serviceManager->getProvider($serviceItem, $serviceItem->getType()); |
|
109 | 109 | |
110 | 110 | $expr = array( |
111 | - $orderSearch->compare( '>', 'order.datepayment', $date ), |
|
112 | - $orderSearch->compare( '>', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_PENDING ), |
|
113 | - $orderSearch->compare( '==', 'order.statusdelivery', \Aimeos\MShop\Order\Item\Base::STAT_UNFINISHED ), |
|
114 | - $orderSearch->compare( '==', 'order.base.service.code', $serviceItem->getCode() ), |
|
115 | - $orderSearch->compare( '==', 'order.base.service.type', 'delivery' ), |
|
111 | + $orderSearch->compare('>', 'order.datepayment', $date), |
|
112 | + $orderSearch->compare('>', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_PENDING), |
|
113 | + $orderSearch->compare('==', 'order.statusdelivery', \Aimeos\MShop\Order\Item\Base::STAT_UNFINISHED), |
|
114 | + $orderSearch->compare('==', 'order.base.service.code', $serviceItem->getCode()), |
|
115 | + $orderSearch->compare('==', 'order.base.service.type', 'delivery'), |
|
116 | 116 | ); |
117 | - $orderSearch->setConditions( $orderSearch->combine( '&&', $expr ) ); |
|
117 | + $orderSearch->setConditions($orderSearch->combine('&&', $expr)); |
|
118 | 118 | |
119 | 119 | $orderStart = 0; |
120 | 120 | |
121 | 121 | do |
122 | 122 | { |
123 | - $orderSearch->setSlice( $orderStart, $maxItems ); |
|
124 | - $orderItems = $orderManager->searchItems( $orderSearch ); |
|
123 | + $orderSearch->setSlice($orderStart, $maxItems); |
|
124 | + $orderItems = $orderManager->searchItems($orderSearch); |
|
125 | 125 | |
126 | 126 | try |
127 | 127 | { |
128 | - $serviceProvider->processBatch( $orderItems ); |
|
129 | - $orderManager->saveItems( $orderItems ); |
|
128 | + $serviceProvider->processBatch($orderItems); |
|
129 | + $orderManager->saveItems($orderItems); |
|
130 | 130 | } |
131 | - catch( \Exception $e ) |
|
131 | + catch (\Exception $e) |
|
132 | 132 | { |
133 | 133 | $str = 'Error while processing orders: %2$s'; |
134 | - $context->getLogger()->log( sprintf( $str, $e->getMessage() ) ); |
|
134 | + $context->getLogger()->log(sprintf($str, $e->getMessage())); |
|
135 | 135 | } |
136 | 136 | |
137 | - $orderCount = count( $orderItems ); |
|
137 | + $orderCount = count($orderItems); |
|
138 | 138 | $orderStart += $orderCount; |
139 | 139 | } |
140 | - while( $orderCount >= $orderSearch->getSliceSize() ); |
|
140 | + while ($orderCount >= $orderSearch->getSliceSize()); |
|
141 | 141 | } |
142 | - catch( \Exception $e ) |
|
142 | + catch (\Exception $e) |
|
143 | 143 | { |
144 | 144 | $str = 'Error while processing service with ID "%1$s": %2$s'; |
145 | - $context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) ); |
|
145 | + $context->getLogger()->log(sprintf($str, $serviceItem->getId(), $e->getMessage())); |
|
146 | 146 | } |
147 | 147 | } |
148 | 148 | |
149 | - $count = count( $serviceItems ); |
|
149 | + $count = count($serviceItems); |
|
150 | 150 | $start += $count; |
151 | - $serviceSearch->setSlice( $start ); |
|
151 | + $serviceSearch->setSlice($start); |
|
152 | 152 | } |
153 | - while( $count >= $serviceSearch->getSliceSize() ); |
|
153 | + while ($count >= $serviceSearch->getSliceSize()); |
|
154 | 154 | } |
155 | 155 | } |
@@ -20,49 +20,49 @@ discard block |
||
20 | 20 | $aimeos = \TestHelperJobs::getAimeos(); |
21 | 21 | $this->context = \TestHelperJobs::getContext(); |
22 | 22 | |
23 | - $this->object = new \Aimeos\Controller\Jobs\Subscription\Process\Begin\Standard( $this->context, $aimeos ); |
|
23 | + $this->object = new \Aimeos\Controller\Jobs\Subscription\Process\Begin\Standard($this->context, $aimeos); |
|
24 | 24 | |
25 | - \Aimeos\MShop\Factory::setCache( true ); |
|
25 | + \Aimeos\MShop\Factory::setCache(true); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | |
29 | 29 | protected function tearDown() |
30 | 30 | { |
31 | - \Aimeos\MShop\Factory::setCache( false ); |
|
31 | + \Aimeos\MShop\Factory::setCache(false); |
|
32 | 32 | \Aimeos\MShop\Factory::clear(); |
33 | 33 | |
34 | - unset( $this->object, $this->context ); |
|
34 | + unset($this->object, $this->context); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | |
38 | 38 | public function testGetName() |
39 | 39 | { |
40 | - $this->assertEquals( 'Subscription process start', $this->object->getName() ); |
|
40 | + $this->assertEquals('Subscription process start', $this->object->getName()); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | |
44 | 44 | public function testGetDescription() |
45 | 45 | { |
46 | - $this->assertEquals( 'Process subscriptions initially', $this->object->getDescription() ); |
|
46 | + $this->assertEquals('Process subscriptions initially', $this->object->getDescription()); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
50 | 50 | public function testRun() |
51 | 51 | { |
52 | - $this->context->getConfig()->set( 'controller/common/subscription/process/processors', ['cgroup'] ); |
|
52 | + $this->context->getConfig()->set('controller/common/subscription/process/processors', ['cgroup']); |
|
53 | 53 | $item = $this->getSubscription(); |
54 | 54 | |
55 | - $managerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Subscription\\Manager\\Standard' ) |
|
56 | - ->setConstructorArgs( [$this->context] ) |
|
57 | - ->setMethods( ['searchItems', 'saveItem'] ) |
|
55 | + $managerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Subscription\\Manager\\Standard') |
|
56 | + ->setConstructorArgs([$this->context]) |
|
57 | + ->setMethods(['searchItems', 'saveItem']) |
|
58 | 58 | ->getMock(); |
59 | 59 | |
60 | - \Aimeos\MShop\Factory::injectManager( $this->context, 'subscription', $managerStub ); |
|
60 | + \Aimeos\MShop\Factory::injectManager($this->context, 'subscription', $managerStub); |
|
61 | 61 | |
62 | - $managerStub->expects( $this->once() )->method( 'searchItems' ) |
|
63 | - ->will( $this->returnValue( [$item] ) ); |
|
62 | + $managerStub->expects($this->once())->method('searchItems') |
|
63 | + ->will($this->returnValue([$item])); |
|
64 | 64 | |
65 | - $managerStub->expects( $this->once() )->method( 'saveItem' ); |
|
65 | + $managerStub->expects($this->once())->method('saveItem'); |
|
66 | 66 | |
67 | 67 | $this->object->run(); |
68 | 68 | } |
@@ -70,21 +70,21 @@ discard block |
||
70 | 70 | |
71 | 71 | public function testRunException() |
72 | 72 | { |
73 | - $this->context->getConfig()->set( 'controller/common/subscription/process/processors', ['cgroup'] ); |
|
74 | - $this->context->getConfig()->set( 'controller/common/subscription/process/processor/cgroup/groupids', ['1'] ); |
|
73 | + $this->context->getConfig()->set('controller/common/subscription/process/processors', ['cgroup']); |
|
74 | + $this->context->getConfig()->set('controller/common/subscription/process/processor/cgroup/groupids', ['1']); |
|
75 | 75 | |
76 | - $managerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Subscription\\Manager\\Standard' ) |
|
77 | - ->setConstructorArgs( [$this->context] ) |
|
78 | - ->setMethods( ['searchItems', 'saveItem'] ) |
|
76 | + $managerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Subscription\\Manager\\Standard') |
|
77 | + ->setConstructorArgs([$this->context]) |
|
78 | + ->setMethods(['searchItems', 'saveItem']) |
|
79 | 79 | ->getMock(); |
80 | 80 | |
81 | - \Aimeos\MShop\Factory::injectManager( $this->context, 'subscription', $managerStub ); |
|
81 | + \Aimeos\MShop\Factory::injectManager($this->context, 'subscription', $managerStub); |
|
82 | 82 | |
83 | - $managerStub->expects( $this->once() )->method( 'searchItems' ) |
|
84 | - ->will( $this->returnValue( [$managerStub->createItem()] ) ); |
|
83 | + $managerStub->expects($this->once())->method('searchItems') |
|
84 | + ->will($this->returnValue([$managerStub->createItem()])); |
|
85 | 85 | |
86 | - $managerStub->expects( $this->once() )->method( 'saveItem' ) |
|
87 | - ->will( $this->throwException( new \Exception() ) ); |
|
86 | + $managerStub->expects($this->once())->method('saveItem') |
|
87 | + ->will($this->throwException(new \Exception())); |
|
88 | 88 | |
89 | 89 | $this->object->run(); |
90 | 90 | } |
@@ -92,17 +92,17 @@ discard block |
||
92 | 92 | |
93 | 93 | protected function getSubscription() |
94 | 94 | { |
95 | - $manager = \Aimeos\MShop\Factory::createManager( $this->context, 'subscription' ); |
|
95 | + $manager = \Aimeos\MShop\Factory::createManager($this->context, 'subscription'); |
|
96 | 96 | |
97 | 97 | $search = $manager->createSearch(); |
98 | - $search->setConditions( $search->compare( '==', 'subscription.dateend', '2010-01-01' ) ); |
|
98 | + $search->setConditions($search->compare('==', 'subscription.dateend', '2010-01-01')); |
|
99 | 99 | |
100 | - $items = $manager->searchItems( $search ); |
|
100 | + $items = $manager->searchItems($search); |
|
101 | 101 | |
102 | - if( ( $item = reset( $items ) ) !== false ) { |
|
102 | + if (($item = reset($items)) !== false) { |
|
103 | 103 | return $item; |
104 | 104 | } |
105 | 105 | |
106 | - throw new \Exception( 'No subscription item found' ); |
|
106 | + throw new \Exception('No subscription item found'); |
|
107 | 107 | } |
108 | 108 | } |
@@ -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\Catalog\Import\Csv\Processor\Done( $this->context, [] ); |
|
23 | + $this->endpoint = new \Aimeos\Controller\Common\Catalog\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 | |
@@ -49,31 +49,31 @@ discard block |
||
49 | 49 | 4 => 1, |
50 | 50 | ); |
51 | 51 | |
52 | - $catalog = $this->create( 'job_csv_test' ); |
|
52 | + $catalog = $this->create('job_csv_test'); |
|
53 | 53 | |
54 | - $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint ); |
|
55 | - $object->process( $catalog, $data ); |
|
54 | + $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint); |
|
55 | + $object->process($catalog, $data); |
|
56 | 56 | |
57 | 57 | |
58 | 58 | $listItems = $catalog->getListItems(); |
59 | - $listItem = reset( $listItems ); |
|
59 | + $listItem = reset($listItems); |
|
60 | 60 | |
61 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem ); |
|
62 | - $this->assertEquals( 1, count( $listItems ) ); |
|
61 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem); |
|
62 | + $this->assertEquals(1, count($listItems)); |
|
63 | 63 | |
64 | - $this->assertEquals( 1, $listItem->getStatus() ); |
|
65 | - $this->assertEquals( 0, $listItem->getPosition() ); |
|
66 | - $this->assertEquals( 'text', $listItem->getDomain() ); |
|
67 | - $this->assertEquals( 'default', $listItem->getType() ); |
|
64 | + $this->assertEquals(1, $listItem->getStatus()); |
|
65 | + $this->assertEquals(0, $listItem->getPosition()); |
|
66 | + $this->assertEquals('text', $listItem->getDomain()); |
|
67 | + $this->assertEquals('default', $listItem->getType()); |
|
68 | 68 | |
69 | 69 | $refItem = $listItem->getRefItem(); |
70 | 70 | |
71 | - $this->assertEquals( 1, $refItem->getStatus() ); |
|
72 | - $this->assertEquals( 'name', $refItem->getType() ); |
|
73 | - $this->assertEquals( 'test text', $refItem->getLabel() ); |
|
74 | - $this->assertEquals( 'Job CSV test', $refItem->getContent() ); |
|
75 | - $this->assertEquals( 'de', $refItem->getLanguageId() ); |
|
76 | - $this->assertEquals( 1, $refItem->getStatus() ); |
|
71 | + $this->assertEquals(1, $refItem->getStatus()); |
|
72 | + $this->assertEquals('name', $refItem->getType()); |
|
73 | + $this->assertEquals('test text', $refItem->getLabel()); |
|
74 | + $this->assertEquals('Job CSV test', $refItem->getContent()); |
|
75 | + $this->assertEquals('de', $refItem->getLanguageId()); |
|
76 | + $this->assertEquals(1, $refItem->getStatus()); |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | |
@@ -101,27 +101,27 @@ discard block |
||
101 | 101 | 7 => 'Long: Job CSV test 2', |
102 | 102 | ); |
103 | 103 | |
104 | - $catalog = $this->create( 'job_csv_test' ); |
|
104 | + $catalog = $this->create('job_csv_test'); |
|
105 | 105 | |
106 | - $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint ); |
|
107 | - $object->process( $catalog, $data ); |
|
106 | + $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint); |
|
107 | + $object->process($catalog, $data); |
|
108 | 108 | |
109 | 109 | |
110 | 110 | $pos = 0; |
111 | 111 | $listItems = $catalog->getListItems(); |
112 | 112 | $expected = array( |
113 | - 0 => array( 'name', 'Job CSV test' ), |
|
114 | - 1 => array( 'short', 'Short: Job CSV test' ), |
|
115 | - 2 => array( 'long', 'Long: Job CSV test' ), |
|
116 | - 3 => array( 'long', 'Long: Job CSV test 2' ), |
|
113 | + 0 => array('name', 'Job CSV test'), |
|
114 | + 1 => array('short', 'Short: Job CSV test'), |
|
115 | + 2 => array('long', 'Long: Job CSV test'), |
|
116 | + 3 => array('long', 'Long: Job CSV test 2'), |
|
117 | 117 | ); |
118 | 118 | |
119 | - $this->assertEquals( 4, count( $listItems ) ); |
|
119 | + $this->assertEquals(4, count($listItems)); |
|
120 | 120 | |
121 | - foreach( $listItems as $listItem ) |
|
121 | + foreach ($listItems as $listItem) |
|
122 | 122 | { |
123 | - $this->assertEquals( $expected[$pos][0], $listItem->getRefItem()->getType() ); |
|
124 | - $this->assertEquals( $expected[$pos][1], $listItem->getRefItem()->getContent() ); |
|
123 | + $this->assertEquals($expected[$pos][0], $listItem->getRefItem()->getType()); |
|
124 | + $this->assertEquals($expected[$pos][1], $listItem->getRefItem()->getContent()); |
|
125 | 125 | $pos++; |
126 | 126 | } |
127 | 127 | } |
@@ -144,21 +144,21 @@ discard block |
||
144 | 144 | 1 => 'Short: Job CSV test', |
145 | 145 | ); |
146 | 146 | |
147 | - $catalog = $this->create( 'job_csv_test' ); |
|
147 | + $catalog = $this->create('job_csv_test'); |
|
148 | 148 | |
149 | - $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint ); |
|
150 | - $object->process( $catalog, $data ); |
|
151 | - $object->process( $catalog, $dataUpdate ); |
|
149 | + $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint); |
|
150 | + $object->process($catalog, $data); |
|
151 | + $object->process($catalog, $dataUpdate); |
|
152 | 152 | |
153 | 153 | |
154 | 154 | $listItems = $catalog->getListItems(); |
155 | - $listItem = reset( $listItems ); |
|
155 | + $listItem = reset($listItems); |
|
156 | 156 | |
157 | - $this->assertEquals( 1, count( $listItems ) ); |
|
158 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem ); |
|
157 | + $this->assertEquals(1, count($listItems)); |
|
158 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem); |
|
159 | 159 | |
160 | - $this->assertEquals( 'short', $listItem->getRefItem()->getType() ); |
|
161 | - $this->assertEquals( 'Short: Job CSV test', $listItem->getRefItem()->getContent() ); |
|
160 | + $this->assertEquals('short', $listItem->getRefItem()->getType()); |
|
161 | + $this->assertEquals('Short: Job CSV test', $listItem->getRefItem()->getContent()); |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | |
@@ -174,18 +174,18 @@ discard block |
||
174 | 174 | 1 => 'Job CSV test', |
175 | 175 | ); |
176 | 176 | |
177 | - $catalog = $this->create( 'job_csv_test' ); |
|
177 | + $catalog = $this->create('job_csv_test'); |
|
178 | 178 | |
179 | - $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint ); |
|
180 | - $object->process( $catalog, $data ); |
|
179 | + $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint); |
|
180 | + $object->process($catalog, $data); |
|
181 | 181 | |
182 | - $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, [], $this->endpoint ); |
|
183 | - $object->process( $catalog, [] ); |
|
182 | + $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, [], $this->endpoint); |
|
183 | + $object->process($catalog, []); |
|
184 | 184 | |
185 | 185 | |
186 | 186 | $listItems = $catalog->getListItems(); |
187 | 187 | |
188 | - $this->assertEquals( 0, count( $listItems ) ); |
|
188 | + $this->assertEquals(0, count($listItems)); |
|
189 | 189 | } |
190 | 190 | |
191 | 191 | |
@@ -205,15 +205,15 @@ discard block |
||
205 | 205 | 3 => '', |
206 | 206 | ); |
207 | 207 | |
208 | - $catalog = $this->create( 'job_csv_test' ); |
|
208 | + $catalog = $this->create('job_csv_test'); |
|
209 | 209 | |
210 | - $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint ); |
|
211 | - $object->process( $catalog, $data ); |
|
210 | + $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint); |
|
211 | + $object->process($catalog, $data); |
|
212 | 212 | |
213 | 213 | |
214 | 214 | $listItems = $catalog->getListItems(); |
215 | 215 | |
216 | - $this->assertEquals( 1, count( $listItems ) ); |
|
216 | + $this->assertEquals(1, count($listItems)); |
|
217 | 217 | } |
218 | 218 | |
219 | 219 | |
@@ -237,35 +237,35 @@ discard block |
||
237 | 237 | 5 => 'default', |
238 | 238 | ); |
239 | 239 | |
240 | - $this->context->getConfig()->set( 'controller/common/catalog/import/csv/processor/text/listtypes', array( 'default' ) ); |
|
240 | + $this->context->getConfig()->set('controller/common/catalog/import/csv/processor/text/listtypes', array('default')); |
|
241 | 241 | |
242 | - $catalog = $this->create( 'job_csv_test' ); |
|
242 | + $catalog = $this->create('job_csv_test'); |
|
243 | 243 | |
244 | - $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint ); |
|
245 | - $object->process( $catalog, $data ); |
|
244 | + $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint); |
|
245 | + $object->process($catalog, $data); |
|
246 | 246 | |
247 | 247 | |
248 | 248 | $listItems = $catalog->getListItems(); |
249 | - $listItem = reset( $listItems ); |
|
249 | + $listItem = reset($listItems); |
|
250 | 250 | |
251 | - $this->assertEquals( 1, count( $listItems ) ); |
|
252 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem ); |
|
251 | + $this->assertEquals(1, count($listItems)); |
|
252 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem); |
|
253 | 253 | |
254 | - $this->assertEquals( 'default', $listItem->getType() ); |
|
255 | - $this->assertEquals( 'short', $listItem->getRefItem()->getType() ); |
|
256 | - $this->assertEquals( 'test short', $listItem->getRefItem()->getContent() ); |
|
254 | + $this->assertEquals('default', $listItem->getType()); |
|
255 | + $this->assertEquals('short', $listItem->getRefItem()->getType()); |
|
256 | + $this->assertEquals('test short', $listItem->getRefItem()->getContent()); |
|
257 | 257 | } |
258 | 258 | |
259 | 259 | |
260 | 260 | /** |
261 | 261 | * @param string $code |
262 | 262 | */ |
263 | - protected function create( $code ) |
|
263 | + protected function create($code) |
|
264 | 264 | { |
265 | - $manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context ); |
|
265 | + $manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context); |
|
266 | 266 | |
267 | 267 | $item = $manager->createItem(); |
268 | - $item->setCode( $code ); |
|
268 | + $item->setCode($code); |
|
269 | 269 | |
270 | 270 | return $item; |
271 | 271 | } |
@@ -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\Catalog\Import\Csv\Processor\Done( $this->context, [] ); |
|
23 | + $this->endpoint = new \Aimeos\Controller\Common\Catalog\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 | |
@@ -51,32 +51,32 @@ discard block |
||
51 | 51 | 5 => 1, |
52 | 52 | ); |
53 | 53 | |
54 | - $catalog = $this->create( 'job_csv_test' ); |
|
54 | + $catalog = $this->create('job_csv_test'); |
|
55 | 55 | |
56 | - $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint ); |
|
57 | - $object->process( $catalog, $data ); |
|
56 | + $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint); |
|
57 | + $object->process($catalog, $data); |
|
58 | 58 | |
59 | 59 | |
60 | 60 | $listItems = $catalog->getListItems(); |
61 | - $listItem = reset( $listItems ); |
|
61 | + $listItem = reset($listItems); |
|
62 | 62 | |
63 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem ); |
|
64 | - $this->assertEquals( 1, count( $listItems ) ); |
|
63 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem); |
|
64 | + $this->assertEquals(1, count($listItems)); |
|
65 | 65 | |
66 | - $this->assertEquals( 1, $listItem->getStatus() ); |
|
67 | - $this->assertEquals( 0, $listItem->getPosition() ); |
|
68 | - $this->assertEquals( 'media', $listItem->getDomain() ); |
|
69 | - $this->assertEquals( 'default', $listItem->getType() ); |
|
66 | + $this->assertEquals(1, $listItem->getStatus()); |
|
67 | + $this->assertEquals(0, $listItem->getPosition()); |
|
68 | + $this->assertEquals('media', $listItem->getDomain()); |
|
69 | + $this->assertEquals('default', $listItem->getType()); |
|
70 | 70 | |
71 | 71 | $refItem = $listItem->getRefItem(); |
72 | 72 | |
73 | - $this->assertEquals( 1, $refItem->getStatus() ); |
|
74 | - $this->assertEquals( 'default', $refItem->getType() ); |
|
75 | - $this->assertEquals( 'test image', $refItem->getLabel() ); |
|
76 | - $this->assertEquals( 'image/jpeg', $refItem->getMimetype() ); |
|
77 | - $this->assertEquals( 'path/to/preview', $refItem->getPreview() ); |
|
78 | - $this->assertEquals( 'path/to/file', $refItem->getUrl() ); |
|
79 | - $this->assertEquals( 'de', $refItem->getLanguageId() ); |
|
73 | + $this->assertEquals(1, $refItem->getStatus()); |
|
74 | + $this->assertEquals('default', $refItem->getType()); |
|
75 | + $this->assertEquals('test image', $refItem->getLabel()); |
|
76 | + $this->assertEquals('image/jpeg', $refItem->getMimetype()); |
|
77 | + $this->assertEquals('path/to/preview', $refItem->getPreview()); |
|
78 | + $this->assertEquals('path/to/file', $refItem->getUrl()); |
|
79 | + $this->assertEquals('de', $refItem->getLanguageId()); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | |
@@ -90,21 +90,21 @@ discard block |
||
90 | 90 | 0 => "path/to/0\npath/to/1\npath/to/2\npath/to/3", |
91 | 91 | ); |
92 | 92 | |
93 | - $catalog = $this->create( 'job_csv_test' ); |
|
93 | + $catalog = $this->create('job_csv_test'); |
|
94 | 94 | |
95 | - $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint ); |
|
96 | - $object->process( $catalog, $data ); |
|
95 | + $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint); |
|
96 | + $object->process($catalog, $data); |
|
97 | 97 | |
98 | 98 | |
99 | 99 | $pos = 0; |
100 | 100 | $listItems = $catalog->getListItems(); |
101 | - $expected = array( 'path/to/0', 'path/to/1', 'path/to/2', 'path/to/3' ); |
|
101 | + $expected = array('path/to/0', 'path/to/1', 'path/to/2', 'path/to/3'); |
|
102 | 102 | |
103 | - $this->assertEquals( 4, count( $listItems ) ); |
|
103 | + $this->assertEquals(4, count($listItems)); |
|
104 | 104 | |
105 | - foreach( $listItems as $listItem ) |
|
105 | + foreach ($listItems as $listItem) |
|
106 | 106 | { |
107 | - $this->assertEquals( $expected[$pos], $listItem->getRefItem()->getUrl() ); |
|
107 | + $this->assertEquals($expected[$pos], $listItem->getRefItem()->getUrl()); |
|
108 | 108 | $pos++; |
109 | 109 | } |
110 | 110 | } |
@@ -126,20 +126,20 @@ discard block |
||
126 | 126 | 3 => 'path/to/3', |
127 | 127 | ); |
128 | 128 | |
129 | - $catalog = $this->create( 'job_csv_test' ); |
|
129 | + $catalog = $this->create('job_csv_test'); |
|
130 | 130 | |
131 | - $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint ); |
|
132 | - $object->process( $catalog, $data ); |
|
131 | + $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint); |
|
132 | + $object->process($catalog, $data); |
|
133 | 133 | |
134 | 134 | |
135 | 135 | $pos = 0; |
136 | 136 | $listItems = $catalog->getListItems(); |
137 | 137 | |
138 | - $this->assertEquals( 4, count( $listItems ) ); |
|
138 | + $this->assertEquals(4, count($listItems)); |
|
139 | 139 | |
140 | - foreach( $listItems as $listItem ) |
|
140 | + foreach ($listItems as $listItem) |
|
141 | 141 | { |
142 | - $this->assertEquals( $data[$pos], $listItem->getRefItem()->getUrl() ); |
|
142 | + $this->assertEquals($data[$pos], $listItem->getRefItem()->getUrl()); |
|
143 | 143 | $pos++; |
144 | 144 | } |
145 | 145 | } |
@@ -162,21 +162,21 @@ discard block |
||
162 | 162 | 1 => '', |
163 | 163 | ); |
164 | 164 | |
165 | - $catalog = $this->create( 'job_csv_test' ); |
|
165 | + $catalog = $this->create('job_csv_test'); |
|
166 | 166 | |
167 | - $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint ); |
|
168 | - $object->process( $catalog, $data ); |
|
169 | - $object->process( $catalog, $dataUpdate ); |
|
167 | + $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint); |
|
168 | + $object->process($catalog, $data); |
|
169 | + $object->process($catalog, $dataUpdate); |
|
170 | 170 | |
171 | 171 | |
172 | 172 | $listItems = $catalog->getListItems(); |
173 | - $listItem = reset( $listItems ); |
|
173 | + $listItem = reset($listItems); |
|
174 | 174 | |
175 | - $this->assertEquals( 1, count( $listItems ) ); |
|
176 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem ); |
|
175 | + $this->assertEquals(1, count($listItems)); |
|
176 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem); |
|
177 | 177 | |
178 | - $this->assertEquals( 'path/to/new', $listItem->getRefItem()->getUrl() ); |
|
179 | - $this->assertEquals( null, $listItem->getRefItem()->getLanguageId() ); |
|
178 | + $this->assertEquals('path/to/new', $listItem->getRefItem()->getUrl()); |
|
179 | + $this->assertEquals(null, $listItem->getRefItem()->getLanguageId()); |
|
180 | 180 | } |
181 | 181 | |
182 | 182 | |
@@ -190,18 +190,18 @@ discard block |
||
190 | 190 | 0 => '/path/to/file', |
191 | 191 | ); |
192 | 192 | |
193 | - $catalog = $this->create( 'job_csv_test' ); |
|
193 | + $catalog = $this->create('job_csv_test'); |
|
194 | 194 | |
195 | - $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint ); |
|
196 | - $object->process( $catalog, $data ); |
|
195 | + $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint); |
|
196 | + $object->process($catalog, $data); |
|
197 | 197 | |
198 | - $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, [], $this->endpoint ); |
|
199 | - $object->process( $catalog, [] ); |
|
198 | + $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, [], $this->endpoint); |
|
199 | + $object->process($catalog, []); |
|
200 | 200 | |
201 | 201 | |
202 | 202 | $listItems = $catalog->getListItems(); |
203 | 203 | |
204 | - $this->assertEquals( 0, count( $listItems ) ); |
|
204 | + $this->assertEquals(0, count($listItems)); |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | |
@@ -217,15 +217,15 @@ discard block |
||
217 | 217 | 1 => '', |
218 | 218 | ); |
219 | 219 | |
220 | - $catalog = $this->create( 'job_csv_test' ); |
|
220 | + $catalog = $this->create('job_csv_test'); |
|
221 | 221 | |
222 | - $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint ); |
|
223 | - $object->process( $catalog, $data ); |
|
222 | + $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint); |
|
223 | + $object->process($catalog, $data); |
|
224 | 224 | |
225 | 225 | |
226 | 226 | $listItems = $catalog->getListItems(); |
227 | 227 | |
228 | - $this->assertEquals( 1, count( $listItems ) ); |
|
228 | + $this->assertEquals(1, count($listItems)); |
|
229 | 229 | } |
230 | 230 | |
231 | 231 | |
@@ -245,34 +245,34 @@ discard block |
||
245 | 245 | 3 => 'default', |
246 | 246 | ); |
247 | 247 | |
248 | - $this->context->getConfig()->set( 'controller/common/catalog/import/csv/processor/media/listtypes', array( 'default' ) ); |
|
248 | + $this->context->getConfig()->set('controller/common/catalog/import/csv/processor/media/listtypes', array('default')); |
|
249 | 249 | |
250 | - $catalog = $this->create( 'job_csv_test' ); |
|
250 | + $catalog = $this->create('job_csv_test'); |
|
251 | 251 | |
252 | - $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint ); |
|
253 | - $object->process( $catalog, $data ); |
|
252 | + $object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint); |
|
253 | + $object->process($catalog, $data); |
|
254 | 254 | |
255 | 255 | |
256 | 256 | $listItems = $catalog->getListItems(); |
257 | - $listItem = reset( $listItems ); |
|
257 | + $listItem = reset($listItems); |
|
258 | 258 | |
259 | - $this->assertEquals( 1, count( $listItems ) ); |
|
260 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem ); |
|
259 | + $this->assertEquals(1, count($listItems)); |
|
260 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem); |
|
261 | 261 | |
262 | - $this->assertEquals( 'default', $listItem->getType() ); |
|
263 | - $this->assertEquals( 'path/to/file2', $listItem->getRefItem()->getUrl() ); |
|
262 | + $this->assertEquals('default', $listItem->getType()); |
|
263 | + $this->assertEquals('path/to/file2', $listItem->getRefItem()->getUrl()); |
|
264 | 264 | } |
265 | 265 | |
266 | 266 | |
267 | 267 | /** |
268 | 268 | * @param string $code |
269 | 269 | */ |
270 | - protected function create( $code ) |
|
270 | + protected function create($code) |
|
271 | 271 | { |
272 | - $manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context ); |
|
272 | + $manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context); |
|
273 | 273 | |
274 | 274 | $item = $manager->createItem(); |
275 | - $item->setCode( $code ); |
|
275 | + $item->setCode($code); |
|
276 | 276 | |
277 | 277 | return $item; |
278 | 278 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function getName() |
30 | 30 | { |
31 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Catalog import CSV' ); |
|
31 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Catalog import 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', 'Imports new and updates existing categories from CSV files' ); |
|
42 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Imports new and updates existing categories from CSV files'); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | $context = $this->getContext(); |
55 | 55 | $config = $context->getConfig(); |
56 | 56 | $logger = $context->getLogger(); |
57 | - $domains = array( 'media', 'text' ); |
|
57 | + $domains = array('media', 'text'); |
|
58 | 58 | $mappings = $this->getDefaultMapping(); |
59 | 59 | |
60 | 60 | |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | * @see controller/common/catalog/import/csv/converter |
75 | 75 | * @see controller/common/catalog/import/csv/max-size |
76 | 76 | */ |
77 | - $domains = $config->get( 'controller/common/catalog/import/csv/domains', $domains ); |
|
77 | + $domains = $config->get('controller/common/catalog/import/csv/domains', $domains); |
|
78 | 78 | |
79 | 79 | /** controller/jobs/catalog/import/csv/domains |
80 | 80 | * List of item domain names that should be retrieved along with the catalog items |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * @see controller/jobs/catalog/import/csv/backup |
95 | 95 | * @see controller/common/catalog/import/csv/max-size |
96 | 96 | */ |
97 | - $domains = $config->get( 'controller/jobs/catalog/import/csv/domains', $domains ); |
|
97 | + $domains = $config->get('controller/jobs/catalog/import/csv/domains', $domains); |
|
98 | 98 | |
99 | 99 | |
100 | 100 | /** controller/common/catalog/import/csv/mapping |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * @see controller/common/catalog/import/csv/converter |
123 | 123 | * @see controller/common/catalog/import/csv/max-size |
124 | 124 | */ |
125 | - $mappings = $config->get( 'controller/common/catalog/import/csv/mapping', $mappings ); |
|
125 | + $mappings = $config->get('controller/common/catalog/import/csv/mapping', $mappings); |
|
126 | 126 | |
127 | 127 | /** controller/jobs/catalog/import/csv/mapping |
128 | 128 | * List of mappings between the position in the CSV file and item keys |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | * @see controller/jobs/catalog/import/csv/backup |
143 | 143 | * @see controller/common/catalog/import/csv/max-size |
144 | 144 | */ |
145 | - $mappings = $config->get( 'controller/jobs/catalog/import/csv/mapping', $mappings ); |
|
145 | + $mappings = $config->get('controller/jobs/catalog/import/csv/mapping', $mappings); |
|
146 | 146 | |
147 | 147 | |
148 | 148 | /** controller/common/catalog/import/csv/converter |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | * @see controller/common/catalog/import/csv/mapping |
185 | 185 | * @see controller/common/catalog/import/csv/max-size |
186 | 186 | */ |
187 | - $converters = $config->get( 'controller/common/catalog/import/csv/converter', [] ); |
|
187 | + $converters = $config->get('controller/common/catalog/import/csv/converter', []); |
|
188 | 188 | |
189 | 189 | /** controller/jobs/catalog/import/csv/converter |
190 | 190 | * List of converter names for the values at the position in the CSV file |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | * @see controller/jobs/catalog/import/csv/backup |
205 | 205 | * @see controller/common/catalog/import/csv/max-size |
206 | 206 | */ |
207 | - $converters = $config->get( 'controller/jobs/catalog/import/csv/converter', $converters ); |
|
207 | + $converters = $config->get('controller/jobs/catalog/import/csv/converter', $converters); |
|
208 | 208 | |
209 | 209 | |
210 | 210 | /** controller/common/catalog/import/csv/max-size |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | * @see controller/common/catalog/import/csv/mapping |
225 | 225 | * @see controller/common/catalog/import/csv/converter |
226 | 226 | */ |
227 | - $maxcnt = (int) $config->get( 'controller/common/catalog/import/csv/max-size', 1000 ); |
|
227 | + $maxcnt = (int) $config->get('controller/common/catalog/import/csv/max-size', 1000); |
|
228 | 228 | |
229 | 229 | |
230 | 230 | /** controller/jobs/catalog/import/csv/skip-lines |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | * @see controller/jobs/catalog/import/csv/backup |
247 | 247 | * @see controller/common/catalog/import/csv/max-size |
248 | 248 | */ |
249 | - $skiplines = (int) $config->get( 'controller/jobs/catalog/import/csv/skip-lines', 0 ); |
|
249 | + $skiplines = (int) $config->get('controller/jobs/catalog/import/csv/skip-lines', 0); |
|
250 | 250 | |
251 | 251 | |
252 | 252 | /** controller/jobs/catalog/import/csv/strict |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | * @see controller/jobs/catalog/import/csv/backup |
271 | 271 | * @see controller/common/catalog/import/csv/max-size |
272 | 272 | */ |
273 | - $strict = (bool) $config->get( 'controller/jobs/catalog/import/csv/strict', true ); |
|
273 | + $strict = (bool) $config->get('controller/jobs/catalog/import/csv/strict', true); |
|
274 | 274 | |
275 | 275 | |
276 | 276 | /** controller/jobs/catalog/import/csv/backup |
@@ -303,75 +303,75 @@ discard block |
||
303 | 303 | * @see controller/jobs/catalog/import/csv/strict |
304 | 304 | * @see controller/common/catalog/import/csv/max-size |
305 | 305 | */ |
306 | - $backup = $config->get( 'controller/jobs/catalog/import/csv/backup' ); |
|
306 | + $backup = $config->get('controller/jobs/catalog/import/csv/backup'); |
|
307 | 307 | |
308 | 308 | |
309 | - if( !isset( $mappings['item'] ) || !is_array( $mappings['item'] ) ) |
|
309 | + if (!isset($mappings['item']) || !is_array($mappings['item'])) |
|
310 | 310 | { |
311 | - $msg = sprintf( 'Required mapping key "%1$s" is missing or contains no array', 'item' ); |
|
312 | - throw new \Aimeos\Controller\Jobs\Exception( $msg ); |
|
311 | + $msg = sprintf('Required mapping key "%1$s" is missing or contains no array', 'item'); |
|
312 | + throw new \Aimeos\Controller\Jobs\Exception($msg); |
|
313 | 313 | } |
314 | 314 | |
315 | 315 | try |
316 | 316 | { |
317 | 317 | $procMappings = $mappings; |
318 | - unset( $procMappings['item'] ); |
|
318 | + unset($procMappings['item']); |
|
319 | 319 | |
320 | - $codePos = $this->getCodePosition( $mappings['item'] ); |
|
321 | - $convlist = $this->getConverterList( $converters ); |
|
322 | - $processor = $this->getProcessors( $procMappings ); |
|
323 | - $catalogMap = $this->getCatalogMap( $domains ); |
|
320 | + $codePos = $this->getCodePosition($mappings['item']); |
|
321 | + $convlist = $this->getConverterList($converters); |
|
322 | + $processor = $this->getProcessors($procMappings); |
|
323 | + $catalogMap = $this->getCatalogMap($domains); |
|
324 | 324 | $container = $this->getContainer(); |
325 | 325 | $path = $container->getName(); |
326 | 326 | |
327 | 327 | |
328 | - $msg = sprintf( 'Started catalog import from "%1$s" (%2$s)', $path, __CLASS__ ); |
|
329 | - $logger->log( $msg, \Aimeos\MW\Logger\Base::NOTICE ); |
|
328 | + $msg = sprintf('Started catalog import from "%1$s" (%2$s)', $path, __CLASS__); |
|
329 | + $logger->log($msg, \Aimeos\MW\Logger\Base::NOTICE); |
|
330 | 330 | |
331 | - foreach( $container as $content ) |
|
331 | + foreach ($container as $content) |
|
332 | 332 | { |
333 | 333 | $name = $content->getName(); |
334 | 334 | |
335 | - for( $i = 0; $i < $skiplines; $i++ ) { |
|
335 | + for ($i = 0; $i < $skiplines; $i++) { |
|
336 | 336 | $content->next(); |
337 | 337 | } |
338 | 338 | |
339 | - while( ( $data = $this->getData( $content, $maxcnt, $codePos ) ) !== [] ) |
|
339 | + while (($data = $this->getData($content, $maxcnt, $codePos)) !== []) |
|
340 | 340 | { |
341 | - $data = $this->convertData( $convlist, $data ); |
|
342 | - $errcnt = $this->import( $catalogMap, $data, $mappings['item'], $processor, $strict ); |
|
343 | - $chunkcnt = count( $data ); |
|
341 | + $data = $this->convertData($convlist, $data); |
|
342 | + $errcnt = $this->import($catalogMap, $data, $mappings['item'], $processor, $strict); |
|
343 | + $chunkcnt = count($data); |
|
344 | 344 | |
345 | 345 | $msg = 'Imported catalog lines from "%1$s": %2$d/%3$d (%4$s)'; |
346 | - $logger->log( sprintf( $msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE ); |
|
346 | + $logger->log(sprintf($msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE); |
|
347 | 347 | |
348 | 348 | $errors += $errcnt; |
349 | 349 | $total += $chunkcnt; |
350 | - unset( $data ); |
|
350 | + unset($data); |
|
351 | 351 | } |
352 | 352 | } |
353 | 353 | |
354 | 354 | $container->close(); |
355 | 355 | } |
356 | - catch( \Exception $e ) |
|
356 | + catch (\Exception $e) |
|
357 | 357 | { |
358 | - $logger->log( 'Catalog import error: ' . $e->getMessage() ); |
|
359 | - $logger->log( $e->getTraceAsString() ); |
|
358 | + $logger->log('Catalog import error: ' . $e->getMessage()); |
|
359 | + $logger->log($e->getTraceAsString()); |
|
360 | 360 | |
361 | - throw new \Aimeos\Controller\Jobs\Exception( $e->getMessage() ); |
|
361 | + throw new \Aimeos\Controller\Jobs\Exception($e->getMessage()); |
|
362 | 362 | } |
363 | 363 | |
364 | 364 | $msg = 'Finished catalog import from "%1$s": %2$d successful, %3$s errors, %4$s total (%5$s)'; |
365 | - $logger->log( sprintf( $msg, $path, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE ); |
|
365 | + $logger->log(sprintf($msg, $path, $total - $errors, $errors, $total, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE); |
|
366 | 366 | |
367 | - if( $errors > 0 ) |
|
367 | + if ($errors > 0) |
|
368 | 368 | { |
369 | - $msg = sprintf( 'Invalid catalog lines in "%1$s": %2$d/%3$d', $path, $errors, $total ); |
|
370 | - throw new \Aimeos\Controller\Jobs\Exception( $msg ); |
|
369 | + $msg = sprintf('Invalid catalog lines in "%1$s": %2$d/%3$d', $path, $errors, $total); |
|
370 | + throw new \Aimeos\Controller\Jobs\Exception($msg); |
|
371 | 371 | } |
372 | 372 | |
373 | - if( !empty( $backup ) && @rename( $path, strftime( $backup ) ) === false ) { |
|
374 | - throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Unable to move imported file' ) ); |
|
373 | + if (!empty($backup) && @rename($path, strftime($backup)) === false) { |
|
374 | + throw new \Aimeos\Controller\Jobs\Exception(sprintf('Unable to move imported file')); |
|
375 | 375 | } |
376 | 376 | } |
377 | 377 | |
@@ -383,16 +383,16 @@ discard block |
||
383 | 383 | * @return integer Position of the "catalog.code" column |
384 | 384 | * @throws \Aimeos\Controller\Jobs\Exception If no mapping for "catalog.code" is found |
385 | 385 | */ |
386 | - protected function getCodePosition( array $mapping ) |
|
386 | + protected function getCodePosition(array $mapping) |
|
387 | 387 | { |
388 | - foreach( $mapping as $pos => $key ) |
|
388 | + foreach ($mapping as $pos => $key) |
|
389 | 389 | { |
390 | - if( $key === 'catalog.code' ) { |
|
390 | + if ($key === 'catalog.code') { |
|
391 | 391 | return $pos; |
392 | 392 | } |
393 | 393 | } |
394 | 394 | |
395 | - throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No "catalog.code" column in CSV mapping found' ) ); |
|
395 | + throw new \Aimeos\Controller\Jobs\Exception(sprintf('No "catalog.code" column in CSV mapping found')); |
|
396 | 396 | } |
397 | 397 | |
398 | 398 | |
@@ -427,7 +427,7 @@ discard block |
||
427 | 427 | * @see controller/jobs/catalog/import/csv/container/content |
428 | 428 | * @see controller/jobs/catalog/import/csv/container/options |
429 | 429 | */ |
430 | - $location = $config->get( 'controller/jobs/catalog/import/csv/location' ); |
|
430 | + $location = $config->get('controller/jobs/catalog/import/csv/location'); |
|
431 | 431 | |
432 | 432 | /** controller/jobs/catalog/import/csv/container/type |
433 | 433 | * Nave of the container type to read the data from |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | * @see controller/jobs/catalog/import/csv/container/content |
451 | 451 | * @see controller/jobs/catalog/import/csv/container/options |
452 | 452 | */ |
453 | - $container = $config->get( 'controller/jobs/catalog/import/csv/container/type', 'Directory' ); |
|
453 | + $container = $config->get('controller/jobs/catalog/import/csv/container/type', 'Directory'); |
|
454 | 454 | |
455 | 455 | /** controller/jobs/catalog/import/csv/container/content |
456 | 456 | * Name of the content type inside the container to read the data from |
@@ -471,7 +471,7 @@ discard block |
||
471 | 471 | * @see controller/jobs/catalog/import/csv/container/type |
472 | 472 | * @see controller/jobs/catalog/import/csv/container/options |
473 | 473 | */ |
474 | - $content = $config->get( 'controller/jobs/catalog/import/csv/container/content', 'CSV' ); |
|
474 | + $content = $config->get('controller/jobs/catalog/import/csv/container/content', 'CSV'); |
|
475 | 475 | |
476 | 476 | /** controller/jobs/catalog/import/csv/container/options |
477 | 477 | * List of file container options for the catalog import files |
@@ -489,15 +489,15 @@ discard block |
||
489 | 489 | * @see controller/jobs/catalog/import/csv/container/content |
490 | 490 | * @see controller/jobs/catalog/import/csv/container/type |
491 | 491 | */ |
492 | - $options = $config->get( 'controller/jobs/catalog/import/csv/container/options', [] ); |
|
492 | + $options = $config->get('controller/jobs/catalog/import/csv/container/options', []); |
|
493 | 493 | |
494 | - if( $location === null ) |
|
494 | + if ($location === null) |
|
495 | 495 | { |
496 | - $msg = sprintf( 'Required configuration for "%1$s" is missing', 'controller/jobs/catalog/import/csv/location' ); |
|
497 | - throw new \Aimeos\Controller\Jobs\Exception( $msg ); |
|
496 | + $msg = sprintf('Required configuration for "%1$s" is missing', 'controller/jobs/catalog/import/csv/location'); |
|
497 | + throw new \Aimeos\Controller\Jobs\Exception($msg); |
|
498 | 498 | } |
499 | 499 | |
500 | - return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options ); |
|
500 | + return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options); |
|
501 | 501 | } |
502 | 502 | |
503 | 503 | |
@@ -507,13 +507,13 @@ discard block |
||
507 | 507 | * @param array $domains List of domain names whose items should be fetched too |
508 | 508 | * @return array Associative list of catalog codes as keys and items implementing \Aimeos\MShop\Catalog\Item\Iface as values |
509 | 509 | */ |
510 | - protected function getCatalogMap( array $domains ) |
|
510 | + protected function getCatalogMap(array $domains) |
|
511 | 511 | { |
512 | 512 | $map = []; |
513 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' ); |
|
514 | - $search = $manager->createSearch()->setSlice( 0, 0x7fffffff ); |
|
513 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog'); |
|
514 | + $search = $manager->createSearch()->setSlice(0, 0x7fffffff); |
|
515 | 515 | |
516 | - foreach( $manager->searchItems( $search, $domains ) as $item ) { |
|
516 | + foreach ($manager->searchItems($search, $domains) as $item) { |
|
517 | 517 | $map[$item->getCode()] = $item; |
518 | 518 | } |
519 | 519 | |
@@ -529,23 +529,23 @@ discard block |
||
529 | 529 | * @param string $code Catalog item code of the parent category |
530 | 530 | * @return string|null ID of the parent category or null for top level nodes |
531 | 531 | */ |
532 | - protected function getParentId( array $catalogMap, array $map, $code ) |
|
532 | + protected function getParentId(array $catalogMap, array $map, $code) |
|
533 | 533 | { |
534 | - if( !isset( $map['catalog.parent'] ) ) |
|
534 | + if (!isset($map['catalog.parent'])) |
|
535 | 535 | { |
536 | - $msg = sprintf( 'Required column "%1$s" not found for code "%2$s"', 'catalog.parent', $code ); |
|
537 | - throw new \Aimeos\Controller\Jobs\Exception( $msg ); |
|
536 | + $msg = sprintf('Required column "%1$s" not found for code "%2$s"', 'catalog.parent', $code); |
|
537 | + throw new \Aimeos\Controller\Jobs\Exception($msg); |
|
538 | 538 | } |
539 | 539 | |
540 | - $parent = trim( $map['catalog.parent'] ); |
|
540 | + $parent = trim($map['catalog.parent']); |
|
541 | 541 | |
542 | - if( $parent != '' && !isset( $catalogMap[$parent] ) ) |
|
542 | + if ($parent != '' && !isset($catalogMap[$parent])) |
|
543 | 543 | { |
544 | - $msg = sprintf( 'Parent node for code "%1$s" not found', $parent ); |
|
545 | - throw new \Aimeos\Controller\Jobs\Exception( $msg ); |
|
544 | + $msg = sprintf('Parent node for code "%1$s" not found', $parent); |
|
545 | + throw new \Aimeos\Controller\Jobs\Exception($msg); |
|
546 | 546 | } |
547 | 547 | |
548 | - return ( $parent != '' ? $catalogMap[$parent]->getId() : null ); |
|
548 | + return ($parent != '' ? $catalogMap[$parent]->getId() : null); |
|
549 | 549 | } |
550 | 550 | |
551 | 551 | |
@@ -560,65 +560,65 @@ discard block |
||
560 | 560 | * @return integer Number of catalogs that couldn't be imported |
561 | 561 | * @throws \Aimeos\Controller\Jobs\Exception |
562 | 562 | */ |
563 | - protected function import( array &$catalogMap, array $data, array $mapping, |
|
564 | - \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $processor, $strict ) |
|
563 | + protected function import(array &$catalogMap, array $data, array $mapping, |
|
564 | + \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $processor, $strict) |
|
565 | 565 | { |
566 | 566 | $errors = 0; |
567 | 567 | $context = $this->getContext(); |
568 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'catalog' ); |
|
568 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'catalog'); |
|
569 | 569 | |
570 | - foreach( $data as $code => $list ) |
|
570 | + foreach ($data as $code => $list) |
|
571 | 571 | { |
572 | 572 | $manager->begin(); |
573 | 573 | |
574 | 574 | try |
575 | 575 | { |
576 | - $code = trim( $code ); |
|
576 | + $code = trim($code); |
|
577 | 577 | |
578 | - if( isset( $catalogMap[$code] ) ) { |
|
578 | + if (isset($catalogMap[$code])) { |
|
579 | 579 | $catalogItem = $catalogMap[$code]; |
580 | 580 | } else { |
581 | 581 | $catalogItem = $manager->createItem(); |
582 | 582 | } |
583 | 583 | |
584 | - $map = $this->getMappedChunk( $list, $mapping ); |
|
584 | + $map = $this->getMappedChunk($list, $mapping); |
|
585 | 585 | |
586 | - if( isset( $map[0] ) ) |
|
586 | + if (isset($map[0])) |
|
587 | 587 | { |
588 | 588 | $map = $map[0]; // there can only be one chunk for the base catalog data |
589 | - $parentid = $this->getParentId( $catalogMap, $map, $code ); |
|
590 | - $catalogItem->fromArray( $this->addItemDefaults( $map ) ); |
|
589 | + $parentid = $this->getParentId($catalogMap, $map, $code); |
|
590 | + $catalogItem->fromArray($this->addItemDefaults($map)); |
|
591 | 591 | |
592 | - if( isset( $catalogMap[$code] ) ) |
|
592 | + if (isset($catalogMap[$code])) |
|
593 | 593 | { |
594 | - $manager->moveItem( $catalogItem->getId(), $catalogItem->getParentId(), $parentid ); |
|
595 | - $catalogItem = $manager->saveItem( $catalogItem ); |
|
594 | + $manager->moveItem($catalogItem->getId(), $catalogItem->getParentId(), $parentid); |
|
595 | + $catalogItem = $manager->saveItem($catalogItem); |
|
596 | 596 | } |
597 | 597 | else |
598 | 598 | { |
599 | - $catalogItem = $manager->insertItem( $catalogItem, $parentid ); |
|
599 | + $catalogItem = $manager->insertItem($catalogItem, $parentid); |
|
600 | 600 | } |
601 | 601 | |
602 | - $list = $processor->process( $catalogItem, $list ); |
|
602 | + $list = $processor->process($catalogItem, $list); |
|
603 | 603 | $catalogMap[$code] = $catalogItem; |
604 | 604 | |
605 | - $manager->saveItem( $catalogItem ); |
|
605 | + $manager->saveItem($catalogItem); |
|
606 | 606 | } |
607 | 607 | |
608 | 608 | $manager->commit(); |
609 | 609 | } |
610 | - catch( \Exception $e ) |
|
610 | + catch (\Exception $e) |
|
611 | 611 | { |
612 | 612 | $manager->rollback(); |
613 | 613 | |
614 | - $msg = sprintf( 'Unable to import catalog with code "%1$s": %2$s', $code, $e->getMessage() ); |
|
615 | - $context->getLogger()->log( $msg ); |
|
614 | + $msg = sprintf('Unable to import catalog with code "%1$s": %2$s', $code, $e->getMessage()); |
|
615 | + $context->getLogger()->log($msg); |
|
616 | 616 | |
617 | 617 | $errors++; |
618 | 618 | } |
619 | 619 | |
620 | - if( $strict && !empty( $list ) ) { |
|
621 | - $context->getLogger()->log( 'Not imported: ' . print_r( $list, true ) ); |
|
620 | + if ($strict && !empty($list)) { |
|
621 | + $context->getLogger()->log('Not imported: ' . print_r($list, true)); |
|
622 | 622 | } |
623 | 623 | } |
624 | 624 | |
@@ -632,9 +632,9 @@ discard block |
||
632 | 632 | * @param array $list Associative list of domain item keys and their values, e.g. "catalog.status" => 1 |
633 | 633 | * @return array Given associative list enriched by default values if they were not already set |
634 | 634 | */ |
635 | - protected function addItemDefaults( array $list ) |
|
635 | + protected function addItemDefaults(array $list) |
|
636 | 636 | { |
637 | - if( !isset( $list['catalog.status'] ) ) { |
|
637 | + if (!isset($list['catalog.status'])) { |
|
638 | 638 | $list['catalog.status'] = 1; |
639 | 639 | } |
640 | 640 |
@@ -42,10 +42,10 @@ discard block |
||
42 | 42 | * @param array $mapping Associative list of field position in CSV as key and domain item key as value |
43 | 43 | * @param \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object Decorated processor |
44 | 44 | */ |
45 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
46 | - \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null ) |
|
45 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
46 | + \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null) |
|
47 | 47 | { |
48 | - parent::__construct( $context, $mapping, $object ); |
|
48 | + parent::__construct($context, $mapping, $object); |
|
49 | 49 | |
50 | 50 | /** controller/common/catalog/import/csv/processor/text/listtypes |
51 | 51 | * Names of the catalog list types for texts that are updated or removed |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * @see controller/common/catalog/import/csv/processor/price/listtypes |
67 | 67 | * @see controller/common/catalog/import/csv/processor/catalog/listtypes |
68 | 68 | */ |
69 | - $this->listTypes = $context->getConfig()->get( 'controller/common/catalog/import/csv/processor/text/listtypes' ); |
|
69 | + $this->listTypes = $context->getConfig()->get('controller/common/catalog/import/csv/processor/text/listtypes'); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | |
@@ -77,53 +77,53 @@ discard block |
||
77 | 77 | * @param array $data List of CSV fields with position as key and data as value |
78 | 78 | * @return array List of data which hasn't been imported |
79 | 79 | */ |
80 | - public function process( \Aimeos\MShop\Catalog\Item\Iface $catalog, array $data ) |
|
80 | + public function process(\Aimeos\MShop\Catalog\Item\Iface $catalog, array $data) |
|
81 | 81 | { |
82 | - $listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' ); |
|
83 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'text' ); |
|
82 | + $listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists'); |
|
83 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'text'); |
|
84 | 84 | |
85 | 85 | $listMap = []; |
86 | - $map = $this->getMappedChunk( $data, $this->getMapping() ); |
|
87 | - $listItems = $catalog->getListItems( 'text', $this->listTypes ); |
|
86 | + $map = $this->getMappedChunk($data, $this->getMapping()); |
|
87 | + $listItems = $catalog->getListItems('text', $this->listTypes); |
|
88 | 88 | |
89 | - foreach( $listItems as $listItem ) |
|
89 | + foreach ($listItems as $listItem) |
|
90 | 90 | { |
91 | - if( ( $refItem = $listItem->getRefItem() ) !== null ) { |
|
92 | - $listMap[ $refItem->getContent() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem; |
|
91 | + if (($refItem = $listItem->getRefItem()) !== null) { |
|
92 | + $listMap[$refItem->getContent()][$refItem->getType()][$listItem->getType()] = $listItem; |
|
93 | 93 | } |
94 | 94 | } |
95 | 95 | |
96 | - foreach( $map as $pos => $list ) |
|
96 | + foreach ($map as $pos => $list) |
|
97 | 97 | { |
98 | - if( $this->checkEntry( $list ) === false ) { |
|
98 | + if ($this->checkEntry($list) === false) { |
|
99 | 99 | continue; |
100 | 100 | } |
101 | 101 | |
102 | - $content = trim( $list['text.content'] ); |
|
103 | - $type = trim( isset( $list['text.type'] ) ? $list['text.type'] : 'name' ); |
|
104 | - $typecode = trim( isset( $list['catalog.lists.type'] ) ? $list['catalog.lists.type'] : 'default' ); |
|
102 | + $content = trim($list['text.content']); |
|
103 | + $type = trim(isset($list['text.type']) ? $list['text.type'] : 'name'); |
|
104 | + $typecode = trim(isset($list['catalog.lists.type']) ? $list['catalog.lists.type'] : 'default'); |
|
105 | 105 | |
106 | - if( isset( $listMap[$content][$type][$typecode] ) ) |
|
106 | + if (isset($listMap[$content][$type][$typecode])) |
|
107 | 107 | { |
108 | 108 | $listItem = $listMap[$content][$type][$typecode]; |
109 | 109 | $refItem = $listItem->getRefItem(); |
110 | - unset( $listItems[ $listItem->getId() ] ); |
|
110 | + unset($listItems[$listItem->getId()]); |
|
111 | 111 | } |
112 | 112 | else |
113 | 113 | { |
114 | - $listItem = $listManager->createItem( $typecode, 'text' ); |
|
115 | - $refItem = $manager->createItem( $type, 'catalog' ); |
|
114 | + $listItem = $listManager->createItem($typecode, 'text'); |
|
115 | + $refItem = $manager->createItem($type, 'catalog'); |
|
116 | 116 | } |
117 | 117 | |
118 | - $refItem->fromArray( $this->addItemDefaults( $list ) ); |
|
119 | - $listItem->fromArray( $this->addListItemDefaults( $list, $pos ) ); |
|
118 | + $refItem->fromArray($this->addItemDefaults($list)); |
|
119 | + $listItem->fromArray($this->addListItemDefaults($list, $pos)); |
|
120 | 120 | |
121 | - $catalog->addListItem( 'text', $listItem, $refItem ); |
|
121 | + $catalog->addListItem('text', $listItem, $refItem); |
|
122 | 122 | } |
123 | 123 | |
124 | - $catalog->deleteListItems( $listItems, true ); |
|
124 | + $catalog->deleteListItems($listItems, true); |
|
125 | 125 | |
126 | - return $this->getObject()->process( $catalog, $data ); |
|
126 | + return $this->getObject()->process($catalog, $data); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | |
@@ -133,13 +133,13 @@ discard block |
||
133 | 133 | * @param array $list Associative list of domain item keys and their values, e.g. "text.status" => 1 |
134 | 134 | * @return array Given associative list enriched by default values if they were not already set |
135 | 135 | */ |
136 | - protected function addItemDefaults( array $list ) |
|
136 | + protected function addItemDefaults(array $list) |
|
137 | 137 | { |
138 | - if( !isset( $list['text.label'] ) ) { |
|
139 | - $list['text.label'] = mb_strcut( trim( $list['text.content'] ), 0, 255 ); |
|
138 | + if (!isset($list['text.label'])) { |
|
139 | + $list['text.label'] = mb_strcut(trim($list['text.content']), 0, 255); |
|
140 | 140 | } |
141 | 141 | |
142 | - if( !isset( $list['text.status'] ) ) { |
|
142 | + if (!isset($list['text.status'])) { |
|
143 | 143 | $list['text.status'] = 1; |
144 | 144 | } |
145 | 145 | |
@@ -153,10 +153,10 @@ discard block |
||
153 | 153 | * @param array $list Associative list of key/value pairs from the mapping |
154 | 154 | * @return boolean True if valid, false if not |
155 | 155 | */ |
156 | - protected function checkEntry( array $list ) |
|
156 | + protected function checkEntry(array $list) |
|
157 | 157 | { |
158 | - if( !isset( $list['text.content'] ) || trim( $list['text.content'] ) === '' || isset( $list['catalog.lists.type'] ) |
|
159 | - && $this->listTypes !== null && !in_array( trim( $list['catalog.lists.type'] ), (array) $this->listTypes ) |
|
158 | + if (!isset($list['text.content']) || trim($list['text.content']) === '' || isset($list['catalog.lists.type']) |
|
159 | + && $this->listTypes !== null && !in_array(trim($list['catalog.lists.type']), (array) $this->listTypes) |
|
160 | 160 | ) { |
161 | 161 | return false; |
162 | 162 | } |
@@ -42,10 +42,10 @@ discard block |
||
42 | 42 | * @param array $mapping Associative list of field position in CSV as key and domain item key as value |
43 | 43 | * @param \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object Decorated processor |
44 | 44 | */ |
45 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
46 | - \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null ) |
|
45 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
46 | + \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null) |
|
47 | 47 | { |
48 | - parent::__construct( $context, $mapping, $object ); |
|
48 | + parent::__construct($context, $mapping, $object); |
|
49 | 49 | |
50 | 50 | /** controller/common/catalog/import/csv/processor/media/listtypes |
51 | 51 | * Names of the catalog list types for media that are updated or removed |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * @see controller/common/catalog/import/csv/processor/price/listtypes |
67 | 67 | * @see controller/common/catalog/import/csv/processor/text/listtypes |
68 | 68 | */ |
69 | - $this->listTypes = $context->getConfig()->get( 'controller/common/catalog/import/csv/processor/media/listtypes' ); |
|
69 | + $this->listTypes = $context->getConfig()->get('controller/common/catalog/import/csv/processor/media/listtypes'); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | |
@@ -77,60 +77,60 @@ discard block |
||
77 | 77 | * @param array $data List of CSV fields with position as key and data as value |
78 | 78 | * @return array List of data which hasn't been imported |
79 | 79 | */ |
80 | - public function process( \Aimeos\MShop\Catalog\Item\Iface $catalog, array $data ) |
|
80 | + public function process(\Aimeos\MShop\Catalog\Item\Iface $catalog, array $data) |
|
81 | 81 | { |
82 | 82 | $context = $this->getContext(); |
83 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'media' ); |
|
84 | - $listManager = \Aimeos\MShop\Factory::createManager( $context, 'catalog/lists' ); |
|
85 | - $separator = $context->getConfig()->get( 'controller/common/catalog/import/csv/separator', "\n" ); |
|
83 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'media'); |
|
84 | + $listManager = \Aimeos\MShop\Factory::createManager($context, 'catalog/lists'); |
|
85 | + $separator = $context->getConfig()->get('controller/common/catalog/import/csv/separator', "\n"); |
|
86 | 86 | |
87 | 87 | $listMap = []; |
88 | - $map = $this->getMappedChunk( $data, $this->getMapping() ); |
|
89 | - $listItems = $catalog->getListItems( 'media', $this->listTypes ); |
|
88 | + $map = $this->getMappedChunk($data, $this->getMapping()); |
|
89 | + $listItems = $catalog->getListItems('media', $this->listTypes); |
|
90 | 90 | |
91 | - foreach( $listItems as $listItem ) |
|
91 | + foreach ($listItems as $listItem) |
|
92 | 92 | { |
93 | - if( ( $refItem = $listItem->getRefItem() ) !== null ) { |
|
94 | - $listMap[ $refItem->getUrl() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem; |
|
93 | + if (($refItem = $listItem->getRefItem()) !== null) { |
|
94 | + $listMap[$refItem->getUrl()][$refItem->getType()][$listItem->getType()] = $listItem; |
|
95 | 95 | } |
96 | 96 | } |
97 | 97 | |
98 | - foreach( $map as $pos => $list ) |
|
98 | + foreach ($map as $pos => $list) |
|
99 | 99 | { |
100 | - if( $this->checkEntry( $list ) === false ) { |
|
100 | + if ($this->checkEntry($list) === false) { |
|
101 | 101 | continue; |
102 | 102 | } |
103 | 103 | |
104 | - $urls = explode( $separator, trim( $list['media.url'] ) ); |
|
105 | - $type = trim( $this->getValue( $list, 'media.type', 'default' ) ); |
|
106 | - $typecode = trim( $this->getValue( $list, 'catalog.lists.type', 'default' ) ); |
|
104 | + $urls = explode($separator, trim($list['media.url'])); |
|
105 | + $type = trim($this->getValue($list, 'media.type', 'default')); |
|
106 | + $typecode = trim($this->getValue($list, 'catalog.lists.type', 'default')); |
|
107 | 107 | |
108 | - foreach( $urls as $url ) |
|
108 | + foreach ($urls as $url) |
|
109 | 109 | { |
110 | - if( isset( $listMap[$url][$type][$typecode] ) ) |
|
110 | + if (isset($listMap[$url][$type][$typecode])) |
|
111 | 111 | { |
112 | 112 | $listItem = $listMap[$url][$type][$typecode]; |
113 | 113 | $refItem = $listItem->getRefItem(); |
114 | - unset( $listItems[ $listItem->getId() ] ); |
|
114 | + unset($listItems[$listItem->getId()]); |
|
115 | 115 | } |
116 | 116 | else |
117 | 117 | { |
118 | - $listItem = $listManager->createItem( $typecode, 'media' ); |
|
119 | - $refItem = $manager->createItem( $type, 'catalog' ); |
|
118 | + $listItem = $listManager->createItem($typecode, 'media'); |
|
119 | + $refItem = $manager->createItem($type, 'catalog'); |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | $list['media.url'] = $url; |
123 | 123 | |
124 | - $list = $refItem->fromArray( $this->addItemDefaults( $list ) ); |
|
125 | - $list = $listItem->fromArray( $this->addListItemDefaults( $list, $pos++ ) ); |
|
124 | + $list = $refItem->fromArray($this->addItemDefaults($list)); |
|
125 | + $list = $listItem->fromArray($this->addListItemDefaults($list, $pos++)); |
|
126 | 126 | |
127 | - $catalog->addListItem( 'media', $listItem, $refItem ); |
|
127 | + $catalog->addListItem('media', $listItem, $refItem); |
|
128 | 128 | } |
129 | 129 | } |
130 | 130 | |
131 | - $catalog->deleteListItems( $listItems, true ); |
|
131 | + $catalog->deleteListItems($listItems, true); |
|
132 | 132 | |
133 | - return $this->getObject()->process( $catalog, $data ); |
|
133 | + return $this->getObject()->process($catalog, $data); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | |
@@ -140,17 +140,17 @@ discard block |
||
140 | 140 | * @param array $list Associative list of domain item keys and their values, e.g. "media.status" => 1 |
141 | 141 | * @return array Given associative list enriched by default values if they were not already set |
142 | 142 | */ |
143 | - protected function addItemDefaults( array $list ) |
|
143 | + protected function addItemDefaults(array $list) |
|
144 | 144 | { |
145 | - if( !isset( $list['media.label'] ) ) { |
|
145 | + if (!isset($list['media.label'])) { |
|
146 | 146 | $list['media.label'] = $list['media.url']; |
147 | 147 | } |
148 | 148 | |
149 | - if( !isset( $list['media.preview'] ) ) { |
|
149 | + if (!isset($list['media.preview'])) { |
|
150 | 150 | $list['media.preview'] = $list['media.url']; |
151 | 151 | } |
152 | 152 | |
153 | - if( !isset( $list['media.status'] ) ) { |
|
153 | + if (!isset($list['media.status'])) { |
|
154 | 154 | $list['media.status'] = 1; |
155 | 155 | } |
156 | 156 | |
@@ -164,10 +164,10 @@ discard block |
||
164 | 164 | * @param array $list Associative list of key/value pairs from the mapping |
165 | 165 | * @return boolean True if valid, false if not |
166 | 166 | */ |
167 | - protected function checkEntry( array $list ) |
|
167 | + protected function checkEntry(array $list) |
|
168 | 168 | { |
169 | - if( !isset( $list['media.url'] ) || trim( $list['media.url'] ) === '' || isset( $list['catalog.lists.type'] ) |
|
170 | - && $this->listTypes !== null && !in_array( trim( $list['catalog.lists.type'] ), (array) $this->listTypes ) |
|
169 | + if (!isset($list['media.url']) || trim($list['media.url']) === '' || isset($list['catalog.lists.type']) |
|
170 | + && $this->listTypes !== null && !in_array(trim($list['catalog.lists.type']), (array) $this->listTypes) |
|
171 | 171 | ) { |
172 | 172 | return false; |
173 | 173 | } |
@@ -18,18 +18,18 @@ discard block |
||
18 | 18 | |
19 | 19 | protected function setUp() |
20 | 20 | { |
21 | - \Aimeos\MShop\Factory::setCache( true ); |
|
21 | + \Aimeos\MShop\Factory::setCache(true); |
|
22 | 22 | |
23 | 23 | $this->context = \TestHelperJobs::getContext(); |
24 | 24 | $this->aimeos = \TestHelperJobs::getAimeos(); |
25 | 25 | |
26 | - $this->object = new \Aimeos\Controller\Jobs\Product\Export\Sitemap\Standard( $this->context, $this->aimeos ); |
|
26 | + $this->object = new \Aimeos\Controller\Jobs\Product\Export\Sitemap\Standard($this->context, $this->aimeos); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | |
30 | 30 | protected function tearDown() |
31 | 31 | { |
32 | - \Aimeos\MShop\Factory::setCache( false ); |
|
32 | + \Aimeos\MShop\Factory::setCache(false); |
|
33 | 33 | \Aimeos\MShop\Factory::clear(); |
34 | 34 | |
35 | 35 | $this->object = null; |
@@ -38,40 +38,40 @@ discard block |
||
38 | 38 | |
39 | 39 | public function testGetName() |
40 | 40 | { |
41 | - $this->assertEquals( 'Product site map', $this->object->getName() ); |
|
41 | + $this->assertEquals('Product site map', $this->object->getName()); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | |
45 | 45 | public function testGetDescription() |
46 | 46 | { |
47 | 47 | $text = 'Creates a product site map for search engines'; |
48 | - $this->assertEquals( $text, $this->object->getDescription() ); |
|
48 | + $this->assertEquals($text, $this->object->getDescription()); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
52 | 52 | public function testRun() |
53 | 53 | { |
54 | - $this->context->getConfig()->set( 'controller/jobs/product/export/sitemap/max-items', 5 ); |
|
54 | + $this->context->getConfig()->set('controller/jobs/product/export/sitemap/max-items', 5); |
|
55 | 55 | |
56 | 56 | $this->object->run(); |
57 | 57 | |
58 | 58 | $ds = DIRECTORY_SEPARATOR; |
59 | - $this->assertFileExists( 'tmp' . $ds . 'aimeos-sitemap-1.xml.gz' ); |
|
60 | - $this->assertFileExists( 'tmp' . $ds . 'aimeos-sitemap-2.xml.gz' ); |
|
61 | - $this->assertFileExists( 'tmp' . $ds . 'aimeos-sitemap-index.xml.gz' ); |
|
59 | + $this->assertFileExists('tmp' . $ds . 'aimeos-sitemap-1.xml.gz'); |
|
60 | + $this->assertFileExists('tmp' . $ds . 'aimeos-sitemap-2.xml.gz'); |
|
61 | + $this->assertFileExists('tmp' . $ds . 'aimeos-sitemap-index.xml.gz'); |
|
62 | 62 | |
63 | - $file1 = gzread( gzopen( 'tmp' . $ds . 'aimeos-sitemap-1.xml.gz', 'rb' ), 0x1000 ); |
|
64 | - $file2 = gzread( gzopen( 'tmp' . $ds . 'aimeos-sitemap-2.xml.gz', 'rb' ), 0x1000 ); |
|
65 | - $index = gzread( gzopen( 'tmp' . $ds . 'aimeos-sitemap-index.xml.gz', 'rb' ), 0x1000 ); |
|
63 | + $file1 = gzread(gzopen('tmp' . $ds . 'aimeos-sitemap-1.xml.gz', 'rb'), 0x1000); |
|
64 | + $file2 = gzread(gzopen('tmp' . $ds . 'aimeos-sitemap-2.xml.gz', 'rb'), 0x1000); |
|
65 | + $index = gzread(gzopen('tmp' . $ds . 'aimeos-sitemap-index.xml.gz', 'rb'), 0x1000); |
|
66 | 66 | |
67 | - unlink( 'tmp' . $ds . 'aimeos-sitemap-1.xml.gz' ); |
|
68 | - unlink( 'tmp' . $ds . 'aimeos-sitemap-2.xml.gz' ); |
|
69 | - unlink( 'tmp' . $ds . 'aimeos-sitemap-index.xml.gz' ); |
|
67 | + unlink('tmp' . $ds . 'aimeos-sitemap-1.xml.gz'); |
|
68 | + unlink('tmp' . $ds . 'aimeos-sitemap-2.xml.gz'); |
|
69 | + unlink('tmp' . $ds . 'aimeos-sitemap-index.xml.gz'); |
|
70 | 70 | |
71 | - $this->assertContains( 'Cafe_Noire_Expresso', $file2 ); |
|
72 | - $this->assertContains( 'Unittest%3A_Bundle', $file2 ); |
|
71 | + $this->assertContains('Cafe_Noire_Expresso', $file2); |
|
72 | + $this->assertContains('Unittest%3A_Bundle', $file2); |
|
73 | 73 | |
74 | - $this->assertContains( 'aimeos-sitemap-1.xml.gz', $index ); |
|
75 | - $this->assertContains( 'aimeos-sitemap-2.xml.gz', $index ); |
|
74 | + $this->assertContains('aimeos-sitemap-1.xml.gz', $index); |
|
75 | + $this->assertContains('aimeos-sitemap-2.xml.gz', $index); |
|
76 | 76 | } |
77 | 77 | } |
78 | 78 | \ No newline at end of file |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function getName() |
30 | 30 | { |
31 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Product site map' ); |
|
31 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Product site map'); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | */ |
40 | 40 | public function getDescription() |
41 | 41 | { |
42 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Creates a product site map for search engines' ); |
|
42 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Creates a product site map for search engines'); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | { |
53 | 53 | $container = $this->createContainer(); |
54 | 54 | |
55 | - $files = $this->export( $container ); |
|
56 | - $this->createSitemapIndex( $container, $files ); |
|
55 | + $files = $this->export($container); |
|
56 | + $this->createSitemapIndex($container, $files); |
|
57 | 57 | |
58 | 58 | $container->close(); |
59 | 59 | } |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | * @param \Aimeos\MW\Container\Content\Iface $content File content object |
66 | 66 | * @param \Aimeos\MShop\Product\Item\Iface[] $items List of product items |
67 | 67 | */ |
68 | - protected function addItems( \Aimeos\MW\Container\Content\Iface $content, array $items ) |
|
68 | + protected function addItems(\Aimeos\MW\Container\Content\Iface $content, array $items) |
|
69 | 69 | { |
70 | 70 | $config = $this->getContext()->getConfig(); |
71 | 71 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | * @see controller/jobs/product/export/sitemap/max-items |
97 | 97 | * @see controller/jobs/product/export/sitemap/max-query |
98 | 98 | */ |
99 | - $changefreq = $config->get( 'controller/jobs/product/export/sitemap/changefreq', 'daily' ); |
|
99 | + $changefreq = $config->get('controller/jobs/product/export/sitemap/changefreq', 'daily'); |
|
100 | 100 | |
101 | 101 | /** controller/jobs/product/export/sitemap/standard/template-items |
102 | 102 | * Relative path to the XML items template of the product site map job controller. |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | $view->siteItems = $items; |
130 | 130 | $view->siteFreq = $changefreq; |
131 | 131 | |
132 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
132 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | * @see controller/jobs/product/export/sitemap/max-query |
176 | 176 | * @see controller/jobs/product/export/sitemap/changefreq |
177 | 177 | */ |
178 | - $location = $config->get( 'controller/jobs/product/export/sitemap/location' ); |
|
178 | + $location = $config->get('controller/jobs/product/export/sitemap/location'); |
|
179 | 179 | |
180 | 180 | /** controller/jobs/product/export/sitemap/container/options |
181 | 181 | * List of file container options for the site map files |
@@ -196,16 +196,16 @@ discard block |
||
196 | 196 | * @see controller/jobs/product/export/sitemap/max-query |
197 | 197 | * @see controller/jobs/product/export/sitemap/changefreq |
198 | 198 | */ |
199 | - $default = array( 'gzip-mode' => 'wb' ); |
|
200 | - $options = $config->get( 'controller/jobs/product/export/sitemap/container/options', $default ); |
|
199 | + $default = array('gzip-mode' => 'wb'); |
|
200 | + $options = $config->get('controller/jobs/product/export/sitemap/container/options', $default); |
|
201 | 201 | |
202 | - if( $location === null ) |
|
202 | + if ($location === null) |
|
203 | 203 | { |
204 | - $msg = sprintf( 'Required configuration for "%1$s" is missing', 'controller/jobs/product/export/sitemap/location' ); |
|
205 | - throw new \Aimeos\Controller\Jobs\Exception( $msg ); |
|
204 | + $msg = sprintf('Required configuration for "%1$s" is missing', 'controller/jobs/product/export/sitemap/location'); |
|
205 | + throw new \Aimeos\Controller\Jobs\Exception($msg); |
|
206 | 206 | } |
207 | 207 | |
208 | - return \Aimeos\MW\Container\Factory::getContainer( $location, 'Directory', 'Gzip', $options ); |
|
208 | + return \Aimeos\MW\Container\Factory::getContainer($location, 'Directory', 'Gzip', $options); |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | * @param integer $filenum New file number |
217 | 217 | * @return \Aimeos\MW\Container\Content\Iface New content object |
218 | 218 | */ |
219 | - protected function createContent( \Aimeos\MW\Container\Iface $container, $filenum ) |
|
219 | + protected function createContent(\Aimeos\MW\Container\Iface $container, $filenum) |
|
220 | 220 | { |
221 | 221 | /** controller/jobs/product/export/sitemap/standard/template-header |
222 | 222 | * Relative path to the XML site map header template of the product site map job controller. |
@@ -246,9 +246,9 @@ discard block |
||
246 | 246 | $context = $this->getContext(); |
247 | 247 | $view = $context->getView(); |
248 | 248 | |
249 | - $content = $container->create( $this->getFilename( $filenum ) ); |
|
250 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
251 | - $container->add( $content ); |
|
249 | + $content = $container->create($this->getFilename($filenum)); |
|
250 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
251 | + $container->add($content); |
|
252 | 252 | |
253 | 253 | return $content; |
254 | 254 | } |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | * |
260 | 260 | * @param \Aimeos\MW\Container\Content\Iface $content |
261 | 261 | */ |
262 | - protected function closeContent( \Aimeos\MW\Container\Content\Iface $content ) |
|
262 | + protected function closeContent(\Aimeos\MW\Container\Content\Iface $content) |
|
263 | 263 | { |
264 | 264 | /** controller/jobs/product/export/sitemap/standard/template-footer |
265 | 265 | * Relative path to the XML site map footer template of the product site map job controller. |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | $context = $this->getContext(); |
290 | 290 | $view = $context->getView(); |
291 | 291 | |
292 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
292 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
293 | 293 | } |
294 | 294 | |
295 | 295 | |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | * @param \Aimeos\MW\Container\Iface $container File container object |
300 | 300 | * @param array $files List of generated site map file names |
301 | 301 | */ |
302 | - protected function createSitemapIndex( \Aimeos\MW\Container\Iface $container, array $files ) |
|
302 | + protected function createSitemapIndex(\Aimeos\MW\Container\Iface $container, array $files) |
|
303 | 303 | { |
304 | 304 | /** controller/jobs/product/export/sitemap/standard/template-index |
305 | 305 | * Relative path to the XML site map index template of the product site map job controller. |
@@ -331,9 +331,9 @@ discard block |
||
331 | 331 | |
332 | 332 | $view->siteFiles = $files; |
333 | 333 | |
334 | - $content = $container->create( 'aimeos-sitemap-index.xml' ); |
|
335 | - $content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) ); |
|
336 | - $container->add( $content ); |
|
334 | + $content = $container->create('aimeos-sitemap-index.xml'); |
|
335 | + $content->add($view->render($context->getConfig()->get($tplconf, $default))); |
|
336 | + $container->add($content); |
|
337 | 337 | } |
338 | 338 | |
339 | 339 | |
@@ -344,44 +344,44 @@ discard block |
||
344 | 344 | * @param boolean $default True to filter exported products by default criteria |
345 | 345 | * @return array List of content (file) names |
346 | 346 | */ |
347 | - protected function export( \Aimeos\MW\Container\Iface $container, $default = true ) |
|
347 | + protected function export(\Aimeos\MW\Container\Iface $container, $default = true) |
|
348 | 348 | { |
349 | - $domains = $this->getConfig( 'domains', [] ); |
|
350 | - $maxItems = $this->getConfig( 'max-items', 10000 ); |
|
351 | - $maxQuery = $this->getConfig( 'max-query', 1000 ); |
|
349 | + $domains = $this->getConfig('domains', []); |
|
350 | + $maxItems = $this->getConfig('max-items', 10000); |
|
351 | + $maxQuery = $this->getConfig('max-query', 1000); |
|
352 | 352 | |
353 | 353 | $start = 0; $filenum = 1; |
354 | 354 | $names = []; |
355 | 355 | |
356 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' ); |
|
356 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'index'); |
|
357 | 357 | |
358 | - $search = $manager->createSearch( $default ); |
|
359 | - $search->setConditions( $search->compare( '!=', 'index.catalog.id', null ) ); |
|
360 | - $search->setSortations( array( $search->sort( '+', 'product.id' ) ) ); |
|
361 | - $search->setSlice( 0, $maxQuery ); |
|
358 | + $search = $manager->createSearch($default); |
|
359 | + $search->setConditions($search->compare('!=', 'index.catalog.id', null)); |
|
360 | + $search->setSortations(array($search->sort('+', 'product.id'))); |
|
361 | + $search->setSlice(0, $maxQuery); |
|
362 | 362 | |
363 | - $content = $this->createContent( $container, $filenum ); |
|
363 | + $content = $this->createContent($container, $filenum); |
|
364 | 364 | $names[] = $content->getResource(); |
365 | 365 | |
366 | 366 | do |
367 | 367 | { |
368 | - $items = $manager->searchItems( $search, $domains ); |
|
369 | - $this->addItems( $content, $items ); |
|
368 | + $items = $manager->searchItems($search, $domains); |
|
369 | + $this->addItems($content, $items); |
|
370 | 370 | |
371 | - $count = count( $items ); |
|
371 | + $count = count($items); |
|
372 | 372 | $start += $count; |
373 | - $search->setSlice( $start, $maxQuery ); |
|
373 | + $search->setSlice($start, $maxQuery); |
|
374 | 374 | |
375 | - if( $start + $maxQuery > $maxItems * $filenum ) |
|
375 | + if ($start + $maxQuery > $maxItems * $filenum) |
|
376 | 376 | { |
377 | - $this->closeContent( $content ); |
|
378 | - $content = $this->createContent( $container, ++$filenum ); |
|
377 | + $this->closeContent($content); |
|
378 | + $content = $this->createContent($container, ++$filenum); |
|
379 | 379 | $names[] = $content->getResource(); |
380 | 380 | } |
381 | 381 | } |
382 | - while( $count >= $search->getSliceSize() ); |
|
382 | + while ($count >= $search->getSliceSize()); |
|
383 | 383 | |
384 | - $this->closeContent( $content ); |
|
384 | + $this->closeContent($content); |
|
385 | 385 | |
386 | 386 | return $names; |
387 | 387 | } |
@@ -394,11 +394,11 @@ discard block |
||
394 | 394 | * @param mixed $default Default value if name is unknown |
395 | 395 | * @return mixed Configuration value |
396 | 396 | */ |
397 | - protected function getConfig( $name, $default = null ) |
|
397 | + protected function getConfig($name, $default = null) |
|
398 | 398 | { |
399 | 399 | $config = $this->getContext()->getConfig(); |
400 | 400 | |
401 | - switch( $name ) |
|
401 | + switch ($name) |
|
402 | 402 | { |
403 | 403 | case 'domain': |
404 | 404 | /** controller/jobs/product/export/sitemap/domains |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | * @see controller/jobs/product/export/sitemap/max-query |
420 | 420 | * @see controller/jobs/product/export/sitemap/changefreq |
421 | 421 | */ |
422 | - return $config->get( 'controller/jobs/product/export/sitemap/domains', $default ); |
|
422 | + return $config->get('controller/jobs/product/export/sitemap/domains', $default); |
|
423 | 423 | |
424 | 424 | case 'max-items': |
425 | 425 | /** controller/jobs/product/export/sitemap/max-items |
@@ -444,7 +444,7 @@ discard block |
||
444 | 444 | * @see controller/jobs/product/export/sitemap/changefreq |
445 | 445 | * @see controller/jobs/product/export/sitemap/domains |
446 | 446 | */ |
447 | - return $config->get( 'controller/jobs/product/export/sitemap/max-items', 50000 ); |
|
447 | + return $config->get('controller/jobs/product/export/sitemap/max-items', 50000); |
|
448 | 448 | |
449 | 449 | case 'max-query': |
450 | 450 | /** controller/jobs/product/export/sitemap/max-query |
@@ -465,7 +465,7 @@ discard block |
||
465 | 465 | * @see controller/jobs/product/export/sitemap/changefreq |
466 | 466 | * @see controller/jobs/product/export/sitemap/domains |
467 | 467 | */ |
468 | - return $config->get( 'controller/jobs/product/export/sitemap/max-query', 1000 ); |
|
468 | + return $config->get('controller/jobs/product/export/sitemap/max-query', 1000); |
|
469 | 469 | } |
470 | 470 | |
471 | 471 | return $default; |
@@ -478,8 +478,8 @@ discard block |
||
478 | 478 | * @param integer $number Current file number |
479 | 479 | * @return string New file name |
480 | 480 | */ |
481 | - protected function getFilename( $number ) |
|
481 | + protected function getFilename($number) |
|
482 | 482 | { |
483 | - return sprintf( 'aimeos-sitemap-%d.xml', $number ); |
|
483 | + return sprintf('aimeos-sitemap-%d.xml', $number); |
|
484 | 484 | } |
485 | 485 | } |