Completed
Push — master ( 0ed5fa...41d654 )
by Aimeos
02:01
created
controller/jobs/src/Controller/Jobs/Order/Service/Delivery/Standard.php 2 patches
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -127,8 +127,7 @@  discard block
 block discarded – undo
127 127
 						{
128 128
 							$serviceProvider->processBatch( $orderItems );
129 129
 							$orderManager->saveItems( $orderItems );
130
-						}
131
-						catch( \Exception $e )
130
+						} catch( \Exception $e )
132 131
 						{
133 132
 							$str = 'Error while processing orders: %2$s';
134 133
 							$context->getLogger()->log( sprintf( $str, $e->getMessage() ) );
@@ -138,8 +137,7 @@  discard block
 block discarded – undo
138 137
 						$orderStart += $orderCount;
139 138
 					}
140 139
 					while( $orderCount >= $orderSearch->getSliceSize() );
141
-				}
142
-				catch( \Exception $e )
140
+				} catch( \Exception $e )
143 141
 				{
144 142
 					$str = 'Error while processing service with ID "%1$s": %2$s';
145 143
 					$context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) );
Please login to merge, or discard this patch.
jobs/tests/Controller/Jobs/Subscription/Process/Begin/StanardTest.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -20,49 +20,49 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Subscription/Process/Begin/Standard.php 2 patches
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	 */
29 29
 	public function getName()
30 30
 	{
31
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Subscription process start' );
31
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Subscription process start');
32 32
 	}
33 33
 
34 34
 
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	 */
40 40
 	public function getDescription()
41 41
 	{
42
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Process subscriptions initially' );
42
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Process subscriptions initially');
43 43
 	}
44 44
 
45 45
 
@@ -65,19 +65,19 @@  discard block
 block discarded – undo
65 65
 		 * @since 2018.04
66 66
 		 * @category Developer
67 67
 		 */
68
-		$names = (array) $config->get( 'controller/common/subscription/process/processors', [] );
68
+		$names = (array) $config->get('controller/common/subscription/process/processors', []);
69 69
 
70
-		$processors = $this->getProcessors( $names );
71
-		$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
72
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
70
+		$processors = $this->getProcessors($names);
71
+		$orderManager = \Aimeos\MShop\Factory::createManager($context, 'order');
72
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
73 73
 
74
-		$search = $manager->createSearch( true );
74
+		$search = $manager->createSearch(true);
75 75
 		$expr = [
76
-			$search->compare( '==', 'subscription.datenext', null ),
76
+			$search->compare('==', 'subscription.datenext', null),
77 77
 			$search->getConditions(),
78 78
 		];
79
-		$search->setConditions( $search->combine( '&&', $expr ) );
80
-		$search->setSortations( [$search->sort( '+', 'subscription.id' )] );
79
+		$search->setConditions($search->combine('&&', $expr));
80
+		$search->setSortations([$search->sort('+', 'subscription.id')]);
81 81
 
82 82
 		$status = \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED;
83 83
 		$start = 0;
@@ -86,51 +86,51 @@  discard block
 block discarded – undo
86 86
 		{
87 87
 			$ordBaseIds = $payStatus = [];
88 88
 
89
-			$search->setSlice( $start, 100 );
90
-			$items = $manager->searchItems( $search );
89
+			$search->setSlice($start, 100);
90
+			$items = $manager->searchItems($search);
91 91
 
92
-			foreach( $items as $item ) {
92
+			foreach ($items as $item) {
93 93
 				$ordBaseIds[] = $item->getOrderBaseId();
94 94
 			}
95 95
 
96
-			$orderSearch = $orderManager->createSearch()->setSlice( 0, $search->getSliceSize() );
97
-			$orderSearch->setConditions( $orderSearch->compare( '==', 'order.base.id', $ordBaseIds ) );
96
+			$orderSearch = $orderManager->createSearch()->setSlice(0, $search->getSliceSize());
97
+			$orderSearch->setConditions($orderSearch->compare('==', 'order.base.id', $ordBaseIds));
98 98
 
99
-			foreach( $orderManager->searchItems( $orderSearch ) as $orderItem ) {
99
+			foreach ($orderManager->searchItems($orderSearch) as $orderItem) {
100 100
 				$payStatus[$orderItem->getBaseId()] = $orderItem->getPaymentStatus();
101 101
 			}
102 102
 
103
-			foreach( $items as $item )
103
+			foreach ($items as $item)
104 104
 			{
105 105
 				try
106 106
 				{
107
-					if( isset( $payStatus[$item->getOrderBaseId()] ) && $payStatus[$item->getOrderBaseId()] >= $status )
107
+					if (isset($payStatus[$item->getOrderBaseId()]) && $payStatus[$item->getOrderBaseId()] >= $status)
108 108
 					{
109
-						foreach( $processors as $processor ) {
110
-							$processor->begin( $item );
109
+						foreach ($processors as $processor) {
110
+							$processor->begin($item);
111 111
 						}
112 112
 
113
-						$interval = new \DateInterval( $item->getInterval() );
114
-						$item->setDateNext( date_create( $item->getTimeCreated() )->add( $interval )->format( 'Y-m-d' ) );
113
+						$interval = new \DateInterval($item->getInterval());
114
+						$item->setDateNext(date_create($item->getTimeCreated())->add($interval)->format('Y-m-d'));
115 115
 					}
116 116
 					else
117 117
 					{
118
-						$item->setStatus( 0 );
118
+						$item->setStatus(0);
119 119
 					}
120 120
 
121
-					$manager->saveItem( $item );
121
+					$manager->saveItem($item);
122 122
 				}
123
-				catch( \Exception $e )
123
+				catch (\Exception $e)
124 124
 				{
125 125
 					$msg = 'Unable to process subscription with ID "%1$S": %2$s';
126
-					$logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) );
127
-					$logger->log( $e->getTraceAsString() );
126
+					$logger->log(sprintf($msg, $item->getId(), $e->getMessage()));
127
+					$logger->log($e->getTraceAsString());
128 128
 				}
129 129
 			}
130 130
 
131
-			$count = count( $items );
131
+			$count = count($items);
132 132
 			$start += $count;
133 133
 		}
134
-		while( $count === $search->getSliceSize() );
134
+		while ($count === $search->getSliceSize());
135 135
 	}
136 136
 }
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -112,15 +112,13 @@
 block discarded – undo
112 112
 
113 113
 						$interval = new \DateInterval( $item->getInterval() );
114 114
 						$item->setDateNext( date_create( $item->getTimeCreated() )->add( $interval )->format( 'Y-m-d' ) );
115
-					}
116
-					else
115
+					} else
117 116
 					{
118 117
 						$item->setStatus( 0 );
119 118
 					}
120 119
 
121 120
 					$manager->saveItem( $item );
122
-				}
123
-				catch( \Exception $e )
121
+				} catch( \Exception $e )
124 122
 				{
125 123
 					$msg = 'Unable to process subscription with ID "%1$S": %2$s';
126 124
 					$logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) );
Please login to merge, or discard this patch.
common/src/Controller/Common/Catalog/Import/Csv/Processor/Text/Standard.php 2 patches
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -42,10 +42,10 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 		$delete = $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
 block discarded – undo
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
 block discarded – undo
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
 		}
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -108,8 +108,7 @@
 block discarded – undo
108 108
 				$listItem = $listMap[$content][$type][$typecode];
109 109
 				$refItem = $listItem->getRefItem();
110 110
 				unset( $listItems[ $listItem->getId() ] );
111
-			}
112
-			else
111
+			} else
113 112
 			{
114 113
 				$listItem = $listManager->createItem( $typecode, 'text' );
115 114
 				$refItem = $manager->createItem( $type, 'catalog' );
Please login to merge, or discard this patch.
src/Controller/Common/Catalog/Import/Csv/Processor/Media/Standard.php 2 patches
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -42,10 +42,10 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 		$delete = $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
 block discarded – undo
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
 block discarded – undo
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
 		}
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -112,8 +112,7 @@
 block discarded – undo
112 112
 					$listItem = $listMap[$url][$type][$typecode];
113 113
 					$refItem = $listItem->getRefItem();
114 114
 					unset( $listItems[ $listItem->getId() ] );
115
-				}
116
-				else
115
+				} else
117 116
 				{
118 117
 					$listItem = $listManager->createItem( $typecode, 'media' );
119 118
 					$refItem = $manager->createItem( $type, 'catalog' );
Please login to merge, or discard this patch.
tests/Controller/Common/Catalog/Import/Csv/Processor/Text/StandardTest.php 1 patch
Spacing   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -17,16 +17,16 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
tests/Controller/Common/Catalog/Import/Csv/Processor/Media/StandardTest.php 1 patch
Spacing   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -17,16 +17,16 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.