Completed
Push — master ( 6c75b7...90deda )
by Aimeos
15:40 queued 12:37
created
common/src/Controller/Common/Product/Import/Csv/Processor/Text/Standard.php 2 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -110,8 +110,7 @@  discard block
 block discarded – undo
110 110
 					$listItem = $listMap[ $list['text.content'] ][$type][$typecode];
111 111
 					$refItem = $listItem->getRefItem();
112 112
 					unset( $listItems[ $listItem->getId() ] );
113
-				}
114
-				else
113
+				} else
115 114
 				{
116 115
 					$listItem = $listManager->createItem();
117 116
 					$refItem = $manager->createItem();
@@ -142,8 +141,7 @@  discard block
 block discarded – undo
142 141
 			$data = $this->getObject()->process( $product, $data );
143 142
 
144 143
 			$manager->commit();
145
-		}
146
-		catch( \Exception $e )
144
+		} catch( \Exception $e )
147 145
 		{
148 146
 			$manager->rollback();
149 147
 			throw $e;
Please login to merge, or discard this patch.
Spacing   +38 added lines, -38 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\Product\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\Product\Import\Csv\Processor\Iface $object = null )
45
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
46
+			\Aimeos\Controller\Common\Product\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/product/import/csv/processor/text/listtypes
51 51
 		 * Names of the product list types for texts that are updated or removed
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 		 * @see controller/common/product/import/csv/processor/price/listtypes
67 67
 		 * @see controller/common/product/import/csv/processor/product/listtypes
68 68
 		 */
69
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/text/listtypes' );
69
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/text/listtypes');
70 70
 	}
71 71
 
72 72
 
@@ -77,39 +77,39 @@  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\Product\Item\Iface $product, array $data )
80
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
81 81
 	{
82
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
83
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'text' );
82
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
83
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'text');
84 84
 		$manager->begin();
85 85
 
86 86
 		try
87 87
 		{
88 88
 			$delete = $listMap = [];
89
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
90
-			$listItems = $product->getListItems( 'text', $this->listTypes );
89
+			$map = $this->getMappedChunk($data, $this->getMapping());
90
+			$listItems = $product->getListItems('text', $this->listTypes);
91 91
 
92
-			foreach( $listItems as $listItem )
92
+			foreach ($listItems as $listItem)
93 93
 			{
94
-				if( ( $refItem = $listItem->getRefItem() ) !== null ) {
95
-					$listMap[ $refItem->getContent() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
94
+				if (($refItem = $listItem->getRefItem()) !== null) {
95
+					$listMap[$refItem->getContent()][$refItem->getType()][$listItem->getType()] = $listItem;
96 96
 				}
97 97
 			}
98 98
 
99
-			foreach( $map as $pos => $list )
99
+			foreach ($map as $pos => $list)
100 100
 			{
101
-				if( $this->checkEntry( $list ) === false ) {
101
+				if ($this->checkEntry($list) === false) {
102 102
 					continue;
103 103
 				}
104 104
 
105
-				$type = ( isset( $list['text.type'] ) ? $list['text.type'] : 'name' );
106
-				$typecode = ( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
105
+				$type = (isset($list['text.type']) ? $list['text.type'] : 'name');
106
+				$typecode = (isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
107 107
 
108
-				if( isset( $listMap[ $list['text.content'] ][$type][$typecode] ) )
108
+				if (isset($listMap[$list['text.content']][$type][$typecode]))
109 109
 				{
110
-					$listItem = $listMap[ $list['text.content'] ][$type][$typecode];
110
+					$listItem = $listMap[$list['text.content']][$type][$typecode];
111 111
 					$refItem = $listItem->getRefItem();
112
-					unset( $listItems[ $listItem->getId() ] );
112
+					unset($listItems[$listItem->getId()]);
113 113
 				}
114 114
 				else
115 115
 				{
@@ -117,33 +117,33 @@  discard block
 block discarded – undo
117 117
 					$refItem = $manager->createItem();
118 118
 				}
119 119
 
120
-				$list['text.typeid'] = $this->getTypeId( 'text/type', 'product', $type );
120
+				$list['text.typeid'] = $this->getTypeId('text/type', 'product', $type);
121 121
 				$list['text.domain'] = 'product';
122 122
 
123
-				$refItem->fromArray( $this->addItemDefaults( $list ) );
124
-				$refItem = $manager->saveItem( $refItem );
123
+				$refItem->fromArray($this->addItemDefaults($list));
124
+				$refItem = $manager->saveItem($refItem);
125 125
 
126
-				$list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'text', $typecode );
126
+				$list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'text', $typecode);
127 127
 				$list['product.lists.parentid'] = $product->getId();
128 128
 				$list['product.lists.refid'] = $refItem->getId();
129 129
 				$list['product.lists.domain'] = 'text';
130 130
 
131
-				$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
132
-				$listManager->saveItem( $listItem, false );
131
+				$listItem->fromArray($this->addListItemDefaults($list, $pos));
132
+				$listManager->saveItem($listItem, false);
133 133
 			}
134 134
 
135
-			foreach( $listItems as $listItem ) {
135
+			foreach ($listItems as $listItem) {
136 136
 				$delete[] = $listItem->getRefId();
137 137
 			}
138 138
 
139
-			$manager->deleteItems( $delete );
140
-			$listManager->deleteItems( array_keys( $listItems ) );
139
+			$manager->deleteItems($delete);
140
+			$listManager->deleteItems(array_keys($listItems));
141 141
 
142
-			$data = $this->getObject()->process( $product, $data );
142
+			$data = $this->getObject()->process($product, $data);
143 143
 
144 144
 			$manager->commit();
145 145
 		}
146
-		catch( \Exception $e )
146
+		catch (\Exception $e)
147 147
 		{
148 148
 			$manager->rollback();
149 149
 			throw $e;
@@ -159,17 +159,17 @@  discard block
 block discarded – undo
159 159
 	 * @param array $list Associative list of domain item keys and their values, e.g. "text.status" => 1
160 160
 	 * @return array Given associative list enriched by default values if they were not already set
161 161
 	 */
162
-	protected function addItemDefaults( array $list )
162
+	protected function addItemDefaults(array $list)
163 163
 	{
164
-		if( !isset( $list['text.label'] ) ) {
165
-			$list['text.label'] = mb_strcut( $list['text.content'], 0, 255 );
164
+		if (!isset($list['text.label'])) {
165
+			$list['text.label'] = mb_strcut($list['text.content'], 0, 255);
166 166
 		}
167 167
 
168
-		if( !isset( $list['text.languageid'] ) ) {
168
+		if (!isset($list['text.languageid'])) {
169 169
 			$list['text.languageid'] = $this->getContext()->getLocale()->getLanguageId();
170 170
 		}
171 171
 
172
-		if( !isset( $list['text.status'] ) ) {
172
+		if (!isset($list['text.status'])) {
173 173
 			$list['text.status'] = 1;
174 174
 		}
175 175
 
@@ -183,10 +183,10 @@  discard block
 block discarded – undo
183 183
 	 * @param array $list Associative list of key/value pairs from the mapping
184 184
 	 * @return boolean True if valid, false if not
185 185
 	 */
186
-	protected function checkEntry( array $list )
186
+	protected function checkEntry(array $list)
187 187
 	{
188
-		if( !isset( $list['text.content'] ) || $list['text.content'] === '' || isset( $list['product.lists.type'] )
189
-			&& $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes )
188
+		if (!isset($list['text.content']) || $list['text.content'] === '' || isset($list['product.lists.type'])
189
+			&& $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes)
190 190
 		) {
191 191
 			return false;
192 192
 		}
Please login to merge, or discard this patch.
src/Controller/Common/Product/Import/Csv/Processor/Product/Standard.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -131,8 +131,7 @@
 block discarded – undo
131 131
 			$data = $this->getObject()->process( $product, $data );
132 132
 
133 133
 			$manager->commit();
134
-		}
135
-		catch( \Exception $e )
134
+		} catch( \Exception $e )
136 135
 		{
137 136
 			$manager->rollback();
138 137
 			throw $e;
Please login to merge, or discard this patch.
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -43,10 +43,10 @@  discard block
 block discarded – undo
43 43
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
44 44
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
45 45
 	 */
46
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
47
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
46
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
47
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
48 48
 	{
49
-		parent::__construct( $context, $mapping, $object );
49
+		parent::__construct($context, $mapping, $object);
50 50
 
51 51
 		/** controller/common/product/import/csv/processor/product/listtypes
52 52
 		 * Names of the product list types that are updated or removed
@@ -73,11 +73,11 @@  discard block
 block discarded – undo
73 73
 		 * @see controller/common/product/import/csv/processor/price/listtypes
74 74
 		 * @see controller/common/product/import/csv/processor/text/listtypes
75 75
 		 */
76
-		$default = array( 'default', 'suggestion' );
76
+		$default = array('default', 'suggestion');
77 77
 		$key = 'controller/common/product/import/csv/processor/product/listtypes';
78
-		$this->listTypes = $context->getConfig()->get( $key, $default );
78
+		$this->listTypes = $context->getConfig()->get($key, $default);
79 79
 
80
-		$this->cache = $this->getCache( 'product' );
80
+		$this->cache = $this->getCache('product');
81 81
 	}
82 82
 
83 83
 
@@ -88,13 +88,13 @@  discard block
 block discarded – undo
88 88
 	 * @param array $data List of CSV fields with position as key and data as value
89 89
 	 * @return array List of data which hasn't been imported
90 90
 	 */
91
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
91
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
92 92
 	{
93 93
 		$context = $this->getContext();
94
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
95
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
94
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
95
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
96 96
 
97
-		$this->cache->set( $product );
97
+		$this->cache->set($product);
98 98
 
99 99
 		$manager->begin();
100 100
 
@@ -102,37 +102,37 @@  discard block
 block discarded – undo
102 102
 		{
103 103
 			$types = [];
104 104
 
105
-			foreach( $this->getMappedChunk( $data, $this->getMapping() ) as $list )
105
+			foreach ($this->getMappedChunk($data, $this->getMapping()) as $list)
106 106
 			{
107
-				if( $this->checkEntry( $list ) === false ) {
107
+				if ($this->checkEntry($list) === false) {
108 108
 					continue;
109 109
 				}
110 110
 
111 111
 				$listMap = [];
112
-				$type = ( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
112
+				$type = (isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
113 113
 				$types[] = $type;
114 114
 
115
-				foreach( explode( $separator, $list['product.code'] ) as $code )
115
+				foreach (explode($separator, $list['product.code']) as $code)
116 116
 				{
117
-					if( ( $prodid = $this->cache->get( $code ) ) === null )
117
+					if (($prodid = $this->cache->get($code)) === null)
118 118
 					{
119 119
 						$msg = 'No product for code "%1$s" available when importing product with code "%2$s"';
120
-						throw new \Aimeos\Controller\Jobs\Exception( sprintf( $msg, $code, $product->getCode() ) );
120
+						throw new \Aimeos\Controller\Jobs\Exception(sprintf($msg, $code, $product->getCode()));
121 121
 					}
122 122
 
123 123
 					$listMap[$prodid] = $list;
124 124
 				}
125 125
 
126
-				$manager->updateListItems( $product, $listMap, 'product', $type );
126
+				$manager->updateListItems($product, $listMap, 'product', $type);
127 127
 			}
128 128
 
129
-			$this->deleteListItems( $product->getId(), $types );
129
+			$this->deleteListItems($product->getId(), $types);
130 130
 
131
-			$data = $this->getObject()->process( $product, $data );
131
+			$data = $this->getObject()->process($product, $data);
132 132
 
133 133
 			$manager->commit();
134 134
 		}
135
-		catch( \Exception $e )
135
+		catch (\Exception $e)
136 136
 		{
137 137
 			$manager->rollback();
138 138
 			throw $e;
@@ -148,10 +148,10 @@  discard block
 block discarded – undo
148 148
 	 * @param array $list Associative list of key/value pairs from the mapping
149 149
 	 * @return boolean True if valid, false if not
150 150
 	 */
151
-	protected function checkEntry( array $list )
151
+	protected function checkEntry(array $list)
152 152
 	{
153
-		if( !isset( $list['product.code'] ) || $list['product.code'] === '' || isset( $list['product.lists.type'] )
154
-			&& $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes )
153
+		if (!isset($list['product.code']) || $list['product.code'] === '' || isset($list['product.lists.type'])
154
+			&& $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes)
155 155
 		) {
156 156
 			return false;
157 157
 		}
@@ -166,19 +166,19 @@  discard block
 block discarded – undo
166 166
 	 * @param string $prodId Unique product ID
167 167
 	 * @param array $types List of types that have been updated
168 168
 	 */
169
-	protected function deleteListItems( $prodId, array $types )
169
+	protected function deleteListItems($prodId, array $types)
170 170
 	{
171
-		$codes = array_diff( $this->listTypes, $types );
172
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
171
+		$codes = array_diff($this->listTypes, $types);
172
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
173 173
 
174 174
 		$search = $manager->createSearch();
175 175
 		$expr = array(
176
-			$search->compare( '==', 'product.lists.parentid', $prodId ),
177
-			$search->compare( '==', 'product.lists.domain', 'product' ),
178
-			$search->compare( '==', 'product.lists.type.code', $codes ),
176
+			$search->compare('==', 'product.lists.parentid', $prodId),
177
+			$search->compare('==', 'product.lists.domain', 'product'),
178
+			$search->compare('==', 'product.lists.type.code', $codes),
179 179
 		);
180
-		$search->setConditions( $search->combine( '&&', $expr ) );
180
+		$search->setConditions($search->combine('&&', $expr));
181 181
 
182
-		$manager->deleteItems( array_keys( $manager->searchItems( $search ) ) );
182
+		$manager->deleteItems(array_keys($manager->searchItems($search)));
183 183
 	}
184 184
 }
Please login to merge, or discard this patch.
src/Controller/Common/Product/Import/Csv/Processor/Price/Standard.php 2 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -111,8 +111,7 @@  discard block
 block discarded – undo
111 111
 					$listItem = $listMap[$value][$type][$typecode];
112 112
 					$refItem = $listItem->getRefItem();
113 113
 					unset( $listItems[ $listItem->getId() ] );
114
-				}
115
-				else
114
+				} else
116 115
 				{
117 116
 					$listItem = $listManager->createItem();
118 117
 					$refItem = $manager->createItem();
@@ -143,8 +142,7 @@  discard block
 block discarded – undo
143 142
 			$data = $this->getObject()->process( $product, $data );
144 143
 
145 144
 			$manager->commit();
146
-		}
147
-		catch( \Exception $e )
145
+		} catch( \Exception $e )
148 146
 		{
149 147
 			$manager->rollback();
150 148
 			throw $e;
Please login to merge, or discard this patch.
Spacing   +37 added lines, -37 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\Product\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\Product\Import\Csv\Processor\Iface $object = null )
45
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
46
+			\Aimeos\Controller\Common\Product\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/product/import/csv/processor/price/listtypes
51 51
 		 * Names of the product list types for prices that are updated or removed
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 		 * @see controller/common/product/import/csv/processor/product/listtypes
67 67
 		 * @see controller/common/product/import/csv/processor/text/listtypes
68 68
 		 */
69
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/price/listtypes' );
69
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/price/listtypes');
70 70
 	}
71 71
 
72 72
 
@@ -77,40 +77,40 @@  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\Product\Item\Iface $product, array $data )
80
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
81 81
 	{
82
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
83
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'price' );
82
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
83
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'price');
84 84
 		$manager->begin();
85 85
 
86 86
 		try
87 87
 		{
88 88
 			$delete = $listMap = [];
89
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
90
-			$listItems = $product->getListItems( 'price', $this->listTypes );
89
+			$map = $this->getMappedChunk($data, $this->getMapping());
90
+			$listItems = $product->getListItems('price', $this->listTypes);
91 91
 
92
-			foreach( $listItems as $listItem )
92
+			foreach ($listItems as $listItem)
93 93
 			{
94
-				if( ( $refItem = $listItem->getRefItem() ) !== null ) {
95
-					$listMap[ $refItem->getValue() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
94
+				if (($refItem = $listItem->getRefItem()) !== null) {
95
+					$listMap[$refItem->getValue()][$refItem->getType()][$listItem->getType()] = $listItem;
96 96
 				}
97 97
 			}
98 98
 
99
-			foreach( $map as $pos => $list )
99
+			foreach ($map as $pos => $list)
100 100
 			{
101
-				if( $this->checkEntry( $list ) === false ) {
101
+				if ($this->checkEntry($list) === false) {
102 102
 					continue;
103 103
 				}
104 104
 
105
-				$value = ( isset( $list['price.value'] ) ? $list['price.value'] : '0.00' );
106
-				$type = ( isset( $list['price.type'] ) ? $list['price.type'] : 'default' );
107
-				$typecode = ( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
105
+				$value = (isset($list['price.value']) ? $list['price.value'] : '0.00');
106
+				$type = (isset($list['price.type']) ? $list['price.type'] : 'default');
107
+				$typecode = (isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
108 108
 
109
-				if( isset( $listMap[$value][$type][$typecode] ) )
109
+				if (isset($listMap[$value][$type][$typecode]))
110 110
 				{
111 111
 					$listItem = $listMap[$value][$type][$typecode];
112 112
 					$refItem = $listItem->getRefItem();
113
-					unset( $listItems[ $listItem->getId() ] );
113
+					unset($listItems[$listItem->getId()]);
114 114
 				}
115 115
 				else
116 116
 				{
@@ -118,33 +118,33 @@  discard block
 block discarded – undo
118 118
 					$refItem = $manager->createItem();
119 119
 				}
120 120
 
121
-				$list['price.typeid'] = $this->getTypeId( 'price/type', 'product', $type );
121
+				$list['price.typeid'] = $this->getTypeId('price/type', 'product', $type);
122 122
 				$list['price.domain'] = 'product';
123 123
 
124
-				$refItem->fromArray( $this->addItemDefaults( $list ) );
125
-				$refItem = $manager->saveItem( $refItem );
124
+				$refItem->fromArray($this->addItemDefaults($list));
125
+				$refItem = $manager->saveItem($refItem);
126 126
 
127
-				$list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'price', $typecode );
127
+				$list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'price', $typecode);
128 128
 				$list['product.lists.parentid'] = $product->getId();
129 129
 				$list['product.lists.refid'] = $refItem->getId();
130 130
 				$list['product.lists.domain'] = 'price';
131 131
 
132
-				$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
133
-				$listManager->saveItem( $listItem, false );
132
+				$listItem->fromArray($this->addListItemDefaults($list, $pos));
133
+				$listManager->saveItem($listItem, false);
134 134
 			}
135 135
 
136
-			foreach( $listItems as $listItem ) {
136
+			foreach ($listItems as $listItem) {
137 137
 				$delete[] = $listItem->getRefId();
138 138
 			}
139 139
 
140
-			$manager->deleteItems( $delete );
141
-			$listManager->deleteItems( array_keys( $listItems ) );
140
+			$manager->deleteItems($delete);
141
+			$listManager->deleteItems(array_keys($listItems));
142 142
 
143
-			$data = $this->getObject()->process( $product, $data );
143
+			$data = $this->getObject()->process($product, $data);
144 144
 
145 145
 			$manager->commit();
146 146
 		}
147
-		catch( \Exception $e )
147
+		catch (\Exception $e)
148 148
 		{
149 149
 			$manager->rollback();
150 150
 			throw $e;
@@ -160,17 +160,17 @@  discard block
 block discarded – undo
160 160
 	 * @param array $list Associative list of domain item keys and their values, e.g. "price.status" => 1
161 161
 	 * @return array Given associative list enriched by default values if they were not already set
162 162
 	 */
163
-	protected function addItemDefaults( array $list )
163
+	protected function addItemDefaults(array $list)
164 164
 	{
165
-		if( !isset( $list['price.currencyid'] ) ) {
165
+		if (!isset($list['price.currencyid'])) {
166 166
 			$list['price.currencyid'] = $this->getContext()->getLocale()->getCurrencyId();
167 167
 		}
168 168
 
169
-		if( !isset( $list['price.label'] ) ) {
169
+		if (!isset($list['price.label'])) {
170 170
 			$list['price.label'] = $list['price.currencyid'] . ' ' . $list['price.value'];
171 171
 		}
172 172
 
173
-		if( !isset( $list['price.status'] ) ) {
173
+		if (!isset($list['price.status'])) {
174 174
 			$list['price.status'] = 1;
175 175
 		}
176 176
 
@@ -184,10 +184,10 @@  discard block
 block discarded – undo
184 184
 	 * @param array $list Associative list of key/value pairs from the mapping
185 185
 	 * @return boolean True if valid, false if not
186 186
 	 */
187
-	protected function checkEntry( array $list )
187
+	protected function checkEntry(array $list)
188 188
 	{
189
-		if( !isset( $list['price.value'] ) || $list['price.value'] === '' || isset( $list['product.lists.type'] )
190
-			&& $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes )
189
+		if (!isset($list['price.value']) || $list['price.value'] === '' || isset($list['product.lists.type'])
190
+			&& $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes)
191 191
 		) {
192 192
 			return false;
193 193
 		}
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Product/Import/Csv/Standard.php 2 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -351,8 +351,7 @@  discard block
 block discarded – undo
351 351
 			}
352 352
 
353 353
 			$container->close();
354
-		}
355
-		catch( \Exception $e )
354
+		} catch( \Exception $e )
356 355
 		{
357 356
 			$logger->log( 'Product import error: ' . $e->getMessage() );
358 357
 			$logger->log( $e->getTraceAsString() );
@@ -540,8 +539,7 @@  discard block
 block discarded – undo
540 539
 				}
541 540
 
542 541
 				$manager->commit();
543
-			}
544
-			catch( \Exception $e )
542
+			} catch( \Exception $e )
545 543
 			{
546 544
 				$manager->rollback();
547 545
 
Please login to merge, or discard this patch.
Spacing   +69 added lines, -69 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', 'Product import CSV' );
31
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Product import CSV');
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', 'Imports new and updates existing products from CSV files' );
42
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Imports new and updates existing products from CSV files');
43 43
 	}
44 44
 
45 45
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 		$context = $this->getContext();
55 55
 		$config = $context->getConfig();
56 56
 		$logger = $context->getLogger();
57
-		$domains = array( 'attribute', 'media', 'price', 'product', 'text' );
57
+		$domains = array('attribute', 'media', 'price', 'product', 'text');
58 58
 		$mappings = $this->getDefaultMapping();
59 59
 
60 60
 
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 		 * @see controller/common/product/import/csv/converter
75 75
 		 * @see controller/common/product/import/csv/max-size
76 76
 		 */
77
-		$domains = $config->get( 'controller/common/product/import/csv/domains', $domains );
77
+		$domains = $config->get('controller/common/product/import/csv/domains', $domains);
78 78
 
79 79
 		/** controller/jobs/product/import/csv/domains
80 80
 		 * List of item domain names that should be retrieved along with the product items
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 		 * @see controller/jobs/product/import/csv/backup
95 95
 		 * @see controller/common/product/import/csv/max-size
96 96
 		 */
97
-		$domains = $config->get( 'controller/jobs/product/import/csv/domains', $domains );
97
+		$domains = $config->get('controller/jobs/product/import/csv/domains', $domains);
98 98
 
99 99
 
100 100
 		/** controller/common/product/import/csv/mapping
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 		 * @see controller/common/product/import/csv/converter
123 123
 		 * @see controller/common/product/import/csv/max-size
124 124
 		 */
125
-		$mappings = $config->get( 'controller/common/product/import/csv/mapping', $mappings );
125
+		$mappings = $config->get('controller/common/product/import/csv/mapping', $mappings);
126 126
 
127 127
 		/** controller/jobs/product/import/csv/mapping
128 128
 		 * List of mappings between the position in the CSV file and item keys
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 		 * @see controller/jobs/product/import/csv/backup
143 143
 		 * @see controller/common/product/import/csv/max-size
144 144
 		 */
145
-		$mappings = $config->get( 'controller/jobs/product/import/csv/mapping', $mappings );
145
+		$mappings = $config->get('controller/jobs/product/import/csv/mapping', $mappings);
146 146
 
147 147
 
148 148
 		/** controller/common/product/import/csv/converter
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 		 * @see controller/common/product/import/csv/mapping
185 185
 		 * @see controller/common/product/import/csv/max-size
186 186
 		 */
187
-		$converters = $config->get( 'controller/common/product/import/csv/converter', [] );
187
+		$converters = $config->get('controller/common/product/import/csv/converter', []);
188 188
 
189 189
 		/** controller/jobs/product/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
 block discarded – undo
204 204
 		 * @see controller/jobs/product/import/csv/backup
205 205
 		 * @see controller/common/product/import/csv/max-size
206 206
 		 */
207
-		$converters = $config->get( 'controller/jobs/product/import/csv/converter', $converters );
207
+		$converters = $config->get('controller/jobs/product/import/csv/converter', $converters);
208 208
 
209 209
 
210 210
 		/** controller/common/product/import/csv/max-size
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 		 * @see controller/common/product/import/csv/mapping
225 225
 		 * @see controller/common/product/import/csv/converter
226 226
 		 */
227
-		$maxcnt = (int) $config->get( 'controller/common/product/import/csv/max-size', 1000 );
227
+		$maxcnt = (int) $config->get('controller/common/product/import/csv/max-size', 1000);
228 228
 
229 229
 
230 230
 		/** controller/jobs/product/import/csv/skip-lines
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 		 * @see controller/jobs/product/import/csv/backup
247 247
 		 * @see controller/common/product/import/csv/max-size
248 248
 		 */
249
-		$skiplines = (int) $config->get( 'controller/jobs/product/import/csv/skip-lines', 0 );
249
+		$skiplines = (int) $config->get('controller/jobs/product/import/csv/skip-lines', 0);
250 250
 
251 251
 
252 252
 		/** controller/jobs/product/import/csv/strict
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 		 * @see controller/jobs/product/import/csv/backup
271 271
 		 * @see controller/common/product/import/csv/max-size
272 272
 		 */
273
-		$strict = (bool) $config->get( 'controller/jobs/product/import/csv/strict', true );
273
+		$strict = (bool) $config->get('controller/jobs/product/import/csv/strict', true);
274 274
 
275 275
 
276 276
 		/** controller/jobs/product/import/csv/backup
@@ -303,74 +303,74 @@  discard block
 block discarded – undo
303 303
 		 * @see controller/jobs/product/import/csv/strict
304 304
 		 * @see controller/common/product/import/csv/max-size
305 305
 		 */
306
-		$backup = $config->get( 'controller/jobs/product/import/csv/backup' );
306
+		$backup = $config->get('controller/jobs/product/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 );
320
+			$codePos = $this->getCodePosition($mappings['item']);
321
+			$convlist = $this->getConverterList($converters);
322
+			$processor = $this->getProcessors($procMappings);
323 323
 			$container = $this->getContainer();
324 324
 			$path = $container->getName();
325 325
 
326
-			$msg = sprintf( 'Started product import from "%1$s" (%2$s)', $path, __CLASS__ );
327
-			$logger->log( $msg, \Aimeos\MW\Logger\Base::NOTICE );
326
+			$msg = sprintf('Started product import from "%1$s" (%2$s)', $path, __CLASS__);
327
+			$logger->log($msg, \Aimeos\MW\Logger\Base::NOTICE);
328 328
 
329
-			foreach( $container as $content )
329
+			foreach ($container as $content)
330 330
 			{
331 331
 				$name = $content->getName();
332 332
 
333
-				for( $i = 0; $i < $skiplines; $i++ ) {
333
+				for ($i = 0; $i < $skiplines; $i++) {
334 334
 					$content->next();
335 335
 				}
336 336
 
337
-				while( ( $data = $this->getData( $content, $maxcnt, $codePos ) ) !== [] )
337
+				while (($data = $this->getData($content, $maxcnt, $codePos)) !== [])
338 338
 				{
339
-					$data = $this->convertData( $convlist, $data );
340
-					$products = $this->getProducts( array_keys( $data ), $domains );
341
-					$errcnt = $this->import( $products, $data, $mappings['item'], $processor, $strict );
342
-					$chunkcnt = count( $data );
339
+					$data = $this->convertData($convlist, $data);
340
+					$products = $this->getProducts(array_keys($data), $domains);
341
+					$errcnt = $this->import($products, $data, $mappings['item'], $processor, $strict);
342
+					$chunkcnt = count($data);
343 343
 
344 344
 					$msg = 'Imported product lines from "%1$s": %2$d/%3$d (%4$s)';
345
-					$logger->log( sprintf( $msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
345
+					$logger->log(sprintf($msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
346 346
 
347 347
 					$errors += $errcnt;
348 348
 					$total += $chunkcnt;
349
-					unset( $products, $data );
349
+					unset($products, $data);
350 350
 				}
351 351
 			}
352 352
 
353 353
 			$container->close();
354 354
 		}
355
-		catch( \Exception $e )
355
+		catch (\Exception $e)
356 356
 		{
357
-			$logger->log( 'Product import error: ' . $e->getMessage() );
358
-			$logger->log( $e->getTraceAsString() );
357
+			$logger->log('Product import error: ' . $e->getMessage());
358
+			$logger->log($e->getTraceAsString());
359 359
 
360
-			throw new \Aimeos\Controller\Jobs\Exception( $e->getMessage() );
360
+			throw new \Aimeos\Controller\Jobs\Exception($e->getMessage());
361 361
 		}
362 362
 
363 363
 		$msg = 'Finished product import from "%1$s": %2$d successful, %3$s errors, %4$s total (%5$s)';
364
-		$logger->log( sprintf( $msg, $path, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
364
+		$logger->log(sprintf($msg, $path, $total - $errors, $errors, $total, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
365 365
 
366
-		if( $errors > 0 )
366
+		if ($errors > 0)
367 367
 		{
368
-			$msg = sprintf( 'Invalid product lines in "%1$s": %2$d/%3$d', $path, $errors, $total );
369
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
368
+			$msg = sprintf('Invalid product lines in "%1$s": %2$d/%3$d', $path, $errors, $total);
369
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
370 370
 		}
371 371
 
372
-		if( !empty( $backup ) && @rename( $path, strftime( $backup ) ) === false ) {
373
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Unable to move imported file' ) );
372
+		if (!empty($backup) && @rename($path, strftime($backup)) === false) {
373
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Unable to move imported file'));
374 374
 		}
375 375
 	}
376 376
 
@@ -382,16 +382,16 @@  discard block
 block discarded – undo
382 382
 	 * @return integer Position of the "product.code" column
383 383
 	 * @throws \Aimeos\Controller\Jobs\Exception If no mapping for "product.code" is found
384 384
 	 */
385
-	protected function getCodePosition( array $mapping )
385
+	protected function getCodePosition(array $mapping)
386 386
 	{
387
-		foreach( $mapping as $pos => $key )
387
+		foreach ($mapping as $pos => $key)
388 388
 		{
389
-			if( $key === 'product.code' ) {
389
+			if ($key === 'product.code') {
390 390
 				return $pos;
391 391
 			}
392 392
 		}
393 393
 
394
-		throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No "product.code" column in CSV mapping found' ) );
394
+		throw new \Aimeos\Controller\Jobs\Exception(sprintf('No "product.code" column in CSV mapping found'));
395 395
 	}
396 396
 
397 397
 
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
 		 * @see controller/jobs/product/import/csv/container/content
427 427
 		 * @see controller/jobs/product/import/csv/container/options
428 428
 		 */
429
-		$location = $config->get( 'controller/jobs/product/import/csv/location', '.' );
429
+		$location = $config->get('controller/jobs/product/import/csv/location', '.');
430 430
 
431 431
 		/** controller/jobs/product/import/csv/container/type
432 432
 		 * Nave of the container type to read the data from
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
 		 * @see controller/jobs/product/import/csv/container/content
450 450
 		 * @see controller/jobs/product/import/csv/container/options
451 451
 		 */
452
-		$container = $config->get( 'controller/jobs/product/import/csv/container/type', 'Directory' );
452
+		$container = $config->get('controller/jobs/product/import/csv/container/type', 'Directory');
453 453
 
454 454
 		/** controller/jobs/product/import/csv/container/content
455 455
 		 * Name of the content type inside the container to read the data from
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
 		 * @see controller/jobs/product/import/csv/container/type
471 471
 		 * @see controller/jobs/product/import/csv/container/options
472 472
 		 */
473
-		$content = $config->get( 'controller/jobs/product/import/csv/container/content', 'CSV' );
473
+		$content = $config->get('controller/jobs/product/import/csv/container/content', 'CSV');
474 474
 
475 475
 		/** controller/jobs/product/import/csv/container/options
476 476
 		 * List of file container options for the product import files
@@ -488,9 +488,9 @@  discard block
 block discarded – undo
488 488
 		 * @see controller/jobs/product/import/csv/container/content
489 489
 		 * @see controller/jobs/product/import/csv/container/type
490 490
 		 */
491
-		$options = $config->get( 'controller/jobs/product/import/csv/container/options', [] );
491
+		$options = $config->get('controller/jobs/product/import/csv/container/options', []);
492 492
 
493
-		return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options );
493
+		return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options);
494 494
 	}
495 495
 
496 496
 
@@ -505,54 +505,54 @@  discard block
 block discarded – undo
505 505
 	 * @return integer Number of products that couldn't be imported
506 506
 	 * @throws \Aimeos\Controller\Jobs\Exception
507 507
 	 */
508
-	protected function import( array $products, array $data, array $mapping,
509
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor, $strict )
508
+	protected function import(array $products, array $data, array $mapping,
509
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor, $strict)
510 510
 	{
511 511
 		$errors = 0;
512 512
 		$context = $this->getContext();
513
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
513
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
514 514
 
515
-		foreach( $data as $code => $list )
515
+		foreach ($data as $code => $list)
516 516
 		{
517 517
 			$manager->begin();
518 518
 
519 519
 			try
520 520
 			{
521
-				if( isset( $products[$code] ) ) {
521
+				if (isset($products[$code])) {
522 522
 					$product = $products[$code];
523 523
 				} else {
524 524
 					$product = $manager->createItem();
525 525
 				}
526 526
 
527
-				$map = $this->getMappedChunk( $list, $mapping );
527
+				$map = $this->getMappedChunk($list, $mapping);
528 528
 
529
-				if( isset( $map[0] ) )
529
+				if (isset($map[0]))
530 530
 				{
531 531
 					$map = $map[0]; // there can only be one chunk for the base product data
532 532
 
533
-					$typecode = ( isset( $map['product.type'] ) ? $map['product.type'] : 'default' );
534
-					$map['product.typeid'] = $this->getTypeId( 'product/type', 'product', $typecode );
533
+					$typecode = (isset($map['product.type']) ? $map['product.type'] : 'default');
534
+					$map['product.typeid'] = $this->getTypeId('product/type', 'product', $typecode);
535 535
 
536
-					$product->fromArray( $this->addItemDefaults( $map ) );
537
-					$product = $manager->saveItem( $product );
536
+					$product->fromArray($this->addItemDefaults($map));
537
+					$product = $manager->saveItem($product);
538 538
 
539
-					$list = $processor->process( $product, $list );
539
+					$list = $processor->process($product, $list);
540 540
 				}
541 541
 
542 542
 				$manager->commit();
543 543
 			}
544
-			catch( \Exception $e )
544
+			catch (\Exception $e)
545 545
 			{
546 546
 				$manager->rollback();
547 547
 
548
-				$msg = sprintf( 'Unable to import product with code "%1$s": %2$s', $code, $e->getMessage() );
549
-				$context->getLogger()->log( $msg );
548
+				$msg = sprintf('Unable to import product with code "%1$s": %2$s', $code, $e->getMessage());
549
+				$context->getLogger()->log($msg);
550 550
 
551 551
 				$errors++;
552 552
 			}
553 553
 
554
-			if( $strict && !empty( $list ) ) {
555
-				$context->getLogger()->log( 'Not imported: ' . print_r( $list, true ) );
554
+			if ($strict && !empty($list)) {
555
+				$context->getLogger()->log('Not imported: ' . print_r($list, true));
556 556
 			}
557 557
 		}
558 558
 
@@ -566,9 +566,9 @@  discard block
 block discarded – undo
566 566
 	 * @param array $list Associative list of domain item keys and their values, e.g. "product.status" => 1
567 567
 	 * @return array Given associative list enriched by default values if they were not already set
568 568
 	 */
569
-	protected function addItemDefaults( array $list )
569
+	protected function addItemDefaults(array $list)
570 570
 	{
571
-		if( !isset( $list['product.status'] ) ) {
571
+		if (!isset($list['product.status'])) {
572 572
 			$list['product.status'] = 1;
573 573
 		}
574 574
 
Please login to merge, or discard this patch.
src/Controller/Common/Product/Import/Csv/Processor/Stock/Standard.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -131,8 +131,7 @@
 block discarded – undo
131 131
 			$data = $this->getObject()->process( $product, $data );
132 132
 
133 133
 			$manager->commit();
134
-		}
135
-		catch( \Exception $e )
134
+		} catch( \Exception $e )
136 135
 		{
137 136
 			$manager->rollback();
138 137
 			throw $e;
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -42,12 +42,12 @@  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\Product\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\Product\Import\Csv\Processor\Iface $object = null )
45
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
46
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
47 47
 	{
48
-		parent::__construct( $context, $mapping, $object );
48
+		parent::__construct($context, $mapping, $object);
49 49
 
50
-		$this->cache = $this->getCache( 'stocktype' );
50
+		$this->cache = $this->getCache('stocktype');
51 51
 	}
52 52
 
53 53
 
@@ -58,53 +58,53 @@  discard block
 block discarded – undo
58 58
 	 * @param array $data List of CSV fields with position as key and data as value
59 59
 	 * @return array List of data which hasn't been imported
60 60
 	 */
61
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
61
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
62 62
 	{
63
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'stock' );
63
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'stock');
64 64
 		$manager->begin();
65 65
 
66 66
 		try
67 67
 		{
68
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
69
-			$items = $this->getStockItems( $product->getCode() );
68
+			$map = $this->getMappedChunk($data, $this->getMapping());
69
+			$items = $this->getStockItems($product->getCode());
70 70
 
71
-			foreach( $map as $pos => $list )
71
+			foreach ($map as $pos => $list)
72 72
 			{
73
-				if( !array_key_exists( 'stock.stocklevel', $list ) ) {
73
+				if (!array_key_exists('stock.stocklevel', $list)) {
74 74
 					continue;
75 75
 				}
76 76
 
77
-				$stockType = ( isset( $list['stock.type'] ) ? $list['stock.type'] : 'default' );
77
+				$stockType = (isset($list['stock.type']) ? $list['stock.type'] : 'default');
78 78
 
79
-				if( !isset( $list['stock.typeid'] ) ) {
80
-					$list['stock.typeid'] = $this->cache->get( $stockType );
79
+				if (!isset($list['stock.typeid'])) {
80
+					$list['stock.typeid'] = $this->cache->get($stockType);
81 81
 				}
82 82
 
83
-				if( isset( $list['stock.dateback'] ) && $list['stock.dateback'] === '' ) {
83
+				if (isset($list['stock.dateback']) && $list['stock.dateback'] === '') {
84 84
 					$list['stock.dateback'] = null;
85 85
 				}
86 86
 
87
-				if( $list['stock.stocklevel'] === '' ) {
87
+				if ($list['stock.stocklevel'] === '') {
88 88
 					$list['stock.stocklevel'] = null;
89 89
 				}
90 90
 
91 91
 				$list['stock.productcode'] = $product->getCode();
92 92
 
93
-				if( ( $item = array_pop( $items ) ) === null ) {
93
+				if (($item = array_pop($items)) === null) {
94 94
 					$item = $manager->createItem();
95 95
 				}
96 96
 
97
-				$item->fromArray( $list );
98
-				$manager->saveItem( $item, false );
97
+				$item->fromArray($list);
98
+				$manager->saveItem($item, false);
99 99
 			}
100 100
 
101
-			$manager->deleteItems( array_keys( $items ) );
101
+			$manager->deleteItems(array_keys($items));
102 102
 
103
-			$data = $this->getObject()->process( $product, $data );
103
+			$data = $this->getObject()->process($product, $data);
104 104
 
105 105
 			$manager->commit();
106 106
 		}
107
-		catch( \Exception $e )
107
+		catch (\Exception $e)
108 108
 		{
109 109
 			$manager->rollback();
110 110
 			throw $e;
@@ -120,13 +120,13 @@  discard block
 block discarded – undo
120 120
 	 * @param string $code Unique product code
121 121
 	 * @return \Aimeos\MShop\Stock\Item\Iface[] Associative list of stock items
122 122
 	 */
123
-	protected function getStockItems( $code )
123
+	protected function getStockItems($code)
124 124
 	{
125
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'stock' );
125
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'stock');
126 126
 
127 127
 		$search = $manager->createSearch();
128
-		$search->setConditions( $search->compare( '==', 'stock.productcode', $code ) );
128
+		$search->setConditions($search->compare('==', 'stock.productcode', $code));
129 129
 
130
-		return $manager->searchItems( $search );
130
+		return $manager->searchItems($search);
131 131
 	}
132 132
 }
Please login to merge, or discard this patch.
controller/jobs/tests/Perf/Product/Import/Csv/StandardTest.php 1 patch
Spacing   +76 added lines, -76 removed lines patch added patch discarded remove patch
@@ -17,31 +17,31 @@  discard block
 block discarded – undo
17 17
 		$this->context = \TestHelperJobs::getContext('unitperf');
18 18
 
19 19
 		$config = $this->context->getConfig();
20
-		$config->set( 'controller/jobs/product/import/csv/location', 'tmp/product-import.zip' );
21
-		$config->set( 'controller/jobs/product/import/csv/container/type', 'Zip' );
22
-		$config->set( 'controller/jobs/product/import/csv/container/content', 'CSV' );
23
-		$config->set( 'controller/jobs/product/import/csv/mapping', $this->getMapping() );
20
+		$config->set('controller/jobs/product/import/csv/location', 'tmp/product-import.zip');
21
+		$config->set('controller/jobs/product/import/csv/container/type', 'Zip');
22
+		$config->set('controller/jobs/product/import/csv/container/content', 'CSV');
23
+		$config->set('controller/jobs/product/import/csv/mapping', $this->getMapping());
24 24
 
25
-		$container = \Aimeos\MW\Container\Factory::getContainer( 'tmp/product-import.zip', 'Zip', 'CSV', [] );
25
+		$container = \Aimeos\MW\Container\Factory::getContainer('tmp/product-import.zip', 'Zip', 'CSV', []);
26 26
 
27
-		$content = $container->create( 'product.csv' );
27
+		$content = $container->create('product.csv');
28 28
 
29
-		for( $i = 0; $i < 1000; $i++ )
29
+		for ($i = 0; $i < 1000; $i++)
30 30
 		{
31 31
 			$data = [];
32 32
 
33
-			$data = $this->addProduct( $data, $i );
34
-			$data = $this->addText( $data, $i );
35
-			$data = $this->addMedia( $data, $i );
36
-			$data = $this->addPrice( $data, $i );
37
-			$data = $this->addAttribute( $data, $i );
38
-			$data = $this->addProductRef( $data, $i );
39
-			$data = $this->addProperty( $data, $i );
33
+			$data = $this->addProduct($data, $i);
34
+			$data = $this->addText($data, $i);
35
+			$data = $this->addMedia($data, $i);
36
+			$data = $this->addPrice($data, $i);
37
+			$data = $this->addAttribute($data, $i);
38
+			$data = $this->addProductRef($data, $i);
39
+			$data = $this->addProperty($data, $i);
40 40
 
41
-			$content->add( $data );
41
+			$content->add($data);
42 42
 		}
43 43
 
44
-		$container->add( $content );
44
+		$container->add($content);
45 45
 
46 46
 		$container->close();
47 47
 	}
@@ -55,25 +55,25 @@  discard block
 block discarded – undo
55 55
 		$this->cleanupPrice();
56 56
 		$this->cleanupProduct();
57 57
 
58
-		unlink( 'tmp/product-import.zip' );
58
+		unlink('tmp/product-import.zip');
59 59
 	}
60 60
 
61 61
 
62 62
 	public function testImport()
63 63
 	{
64 64
 		$aimeos = \TestHelperJobs::getAimeos();
65
-		$cntl = \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController( $this->context, $aimeos, 'Standard' );
65
+		$cntl = \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController($this->context, $aimeos, 'Standard');
66 66
 
67
-		$start = microtime( true );
67
+		$start = microtime(true);
68 68
 
69 69
 		$cntl->run();
70 70
 
71
-		$stop = microtime( true );
72
-		echo "\n    product import CSV: " . ( ( $stop - $start ) ) . " sec\n";
71
+		$stop = microtime(true);
72
+		echo "\n    product import CSV: " . (($stop - $start)) . " sec\n";
73 73
 	}
74 74
 
75 75
 
76
-	protected function addAttribute( array $data, $cnt )
76
+	protected function addAttribute(array $data, $cnt)
77 77
 	{
78 78
 		$data[] = 'length'; // type
79 79
 		$data[] = 'import-' . ($cnt % 30); // code
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	}
87 87
 
88 88
 
89
-	protected function addMedia( array $data, $cnt )
89
+	protected function addMedia(array $data, $cnt)
90 90
 	{
91 91
 		$data[] = "/path/to/image-$cnt.jpg"; // url
92 92
 
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 	}
95 95
 
96 96
 
97
-	protected function addPrice( array $data, $cnt )
97
+	protected function addPrice(array $data, $cnt)
98 98
 	{
99 99
 		$data[] = 1; // quantity
100 100
 		$data[] = 'import-' . $cnt; // label
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 	}
106 106
 
107 107
 
108
-	protected function addProduct( array $data, $cnt )
108
+	protected function addProduct(array $data, $cnt)
109 109
 	{
110 110
 		$data[] = 'import-' . $cnt; // code
111 111
 		$data[] = 'import-' . $cnt; // label
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 	}
117 117
 
118 118
 
119
-	protected function addProductRef( array $data, $cnt )
119
+	protected function addProductRef(array $data, $cnt)
120 120
 	{
121 121
 		$data[] = 'import-' . ($cnt % 100); // code
122 122
 		$data[] = 'suggestion'; // type
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 	}
126 126
 
127 127
 
128
-	protected function addProperty( array $data, $cnt )
128
+	protected function addProperty(array $data, $cnt)
129 129
 	{
130 130
 		$data[] = 'package-weight'; // type
131 131
 		$data[] = '0.5'; // value
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 	}
135 135
 
136 136
 
137
-	protected function addText( array $data, $cnt )
137
+	protected function addText(array $data, $cnt)
138 138
 	{
139 139
 		$data[] = 'name'; // type
140 140
 		$data[] = 'import-name-' . $cnt; //content
@@ -149,132 +149,132 @@  discard block
 block discarded – undo
149 149
 
150 150
 	protected function cleanupAttribute()
151 151
 	{
152
-		$manager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( $this->context );
152
+		$manager = \Aimeos\MShop\Attribute\Manager\Factory::createManager($this->context);
153 153
 
154 154
 		$search = $manager->createSearch();
155 155
 		$expr = array(
156
-			$search->compare( '==', 'attribute.domain', 'product' ),
157
-			$search->compare( '==', 'attribute.label', 'import-%' ),
156
+			$search->compare('==', 'attribute.domain', 'product'),
157
+			$search->compare('==', 'attribute.label', 'import-%'),
158 158
 		);
159
-		$search->setConditions( $search->combine( '&&', $expr ) );
160
-		$search->setSortations( array( $search->sort( '+', 'attribute.id' ) ) );
159
+		$search->setConditions($search->combine('&&', $expr));
160
+		$search->setSortations(array($search->sort('+', 'attribute.id')));
161 161
 
162 162
 		$start = 0;
163 163
 
164 164
 		do
165 165
 		{
166
-			$result = $manager->searchItems( $search );
167
-			$manager->deleteItems( array_keys( $result ) );
166
+			$result = $manager->searchItems($search);
167
+			$manager->deleteItems(array_keys($result));
168 168
 
169
-			$count = count( $result );
169
+			$count = count($result);
170 170
 			$start += $count;
171
-			$search->setSlice( $start );
171
+			$search->setSlice($start);
172 172
 		}
173
-		while( $count == $search->getSliceSize() );
173
+		while ($count == $search->getSliceSize());
174 174
 	}
175 175
 
176 176
 
177 177
 	protected function cleanupMedia()
178 178
 	{
179
-		$manager = \Aimeos\MShop\Media\Manager\Factory::createManager( $this->context );
179
+		$manager = \Aimeos\MShop\Media\Manager\Factory::createManager($this->context);
180 180
 
181 181
 		$search = $manager->createSearch();
182 182
 		$expr = array(
183
-			$search->compare( '==', 'media.domain', 'product' ),
184
-			$search->compare( '==', 'media.label', 'import-%' ),
183
+			$search->compare('==', 'media.domain', 'product'),
184
+			$search->compare('==', 'media.label', 'import-%'),
185 185
 		);
186
-		$search->setConditions( $search->combine( '&&', $expr ) );
187
-		$search->setSortations( array( $search->sort( '+', 'media.id' ) ) );
186
+		$search->setConditions($search->combine('&&', $expr));
187
+		$search->setSortations(array($search->sort('+', 'media.id')));
188 188
 
189 189
 		$start = 0;
190 190
 
191 191
 		do
192 192
 		{
193
-			$result = $manager->searchItems( $search );
194
-			$manager->deleteItems( array_keys( $result ) );
193
+			$result = $manager->searchItems($search);
194
+			$manager->deleteItems(array_keys($result));
195 195
 
196
-			$count = count( $result );
196
+			$count = count($result);
197 197
 			$start += $count;
198
-			$search->setSlice( $start );
198
+			$search->setSlice($start);
199 199
 		}
200
-		while( $count == $search->getSliceSize() );
200
+		while ($count == $search->getSliceSize());
201 201
 	}
202 202
 
203 203
 
204 204
 	protected function cleanupPrice()
205 205
 	{
206
-		$manager = \Aimeos\MShop\Price\Manager\Factory::createManager( $this->context );
206
+		$manager = \Aimeos\MShop\Price\Manager\Factory::createManager($this->context);
207 207
 
208 208
 		$search = $manager->createSearch();
209 209
 		$expr = array(
210
-				$search->compare( '==', 'price.domain', 'product' ),
211
-				$search->compare( '==', 'price.label', 'import-%' ),
210
+				$search->compare('==', 'price.domain', 'product'),
211
+				$search->compare('==', 'price.label', 'import-%'),
212 212
 		);
213
-		$search->setConditions( $search->combine( '&&', $expr ) );
214
-		$search->setSortations( array( $search->sort( '+', 'price.id' ) ) );
213
+		$search->setConditions($search->combine('&&', $expr));
214
+		$search->setSortations(array($search->sort('+', 'price.id')));
215 215
 
216 216
 		$start = 0;
217 217
 
218 218
 		do
219 219
 		{
220
-			$result = $manager->searchItems( $search );
221
-			$manager->deleteItems( array_keys( $result ) );
220
+			$result = $manager->searchItems($search);
221
+			$manager->deleteItems(array_keys($result));
222 222
 
223
-			$count = count( $result );
223
+			$count = count($result);
224 224
 			$start += $count;
225
-			$search->setSlice( $start );
225
+			$search->setSlice($start);
226 226
 		}
227
-		while( $count == $search->getSliceSize() );
227
+		while ($count == $search->getSliceSize());
228 228
 	}
229 229
 
230 230
 
231 231
 	protected function cleanupProduct()
232 232
 	{
233
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
233
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
234 234
 
235 235
 		$search = $manager->createSearch();
236
-		$search->setConditions( $search->compare( '==', 'product.code', 'import-%' ) );
237
-		$search->setSortations( array( $search->sort( '+', 'product.id' ) ) );
236
+		$search->setConditions($search->compare('==', 'product.code', 'import-%'));
237
+		$search->setSortations(array($search->sort('+', 'product.id')));
238 238
 
239 239
 		$start = 0;
240 240
 
241 241
 		do
242 242
 		{
243
-			$result = $manager->searchItems( $search );
244
-			$manager->deleteItems( array_keys( $result ) );
243
+			$result = $manager->searchItems($search);
244
+			$manager->deleteItems(array_keys($result));
245 245
 
246
-			$count = count( $result );
246
+			$count = count($result);
247 247
 			$start += $count;
248
-			$search->setSlice( $start );
248
+			$search->setSlice($start);
249 249
 		}
250
-		while( $count == $search->getSliceSize() );
250
+		while ($count == $search->getSliceSize());
251 251
 	}
252 252
 
253 253
 
254 254
 	protected function cleanupText()
255 255
 	{
256
-		$manager = \Aimeos\MShop\Text\Manager\Factory::createManager( $this->context );
256
+		$manager = \Aimeos\MShop\Text\Manager\Factory::createManager($this->context);
257 257
 
258 258
 		$search = $manager->createSearch();
259 259
 		$expr = array(
260
-			$search->compare( '==', 'text.domain', 'product' ),
261
-			$search->compare( '==', 'text.label', 'import-%' ),
260
+			$search->compare('==', 'text.domain', 'product'),
261
+			$search->compare('==', 'text.label', 'import-%'),
262 262
 		);
263
-		$search->setConditions( $search->combine( '&&', $expr ) );
264
-		$search->setSortations( array( $search->sort( '+', 'text.id' ) ) );
263
+		$search->setConditions($search->combine('&&', $expr));
264
+		$search->setSortations(array($search->sort('+', 'text.id')));
265 265
 
266 266
 		$start = 0;
267 267
 
268 268
 		do
269 269
 		{
270
-			$result = $manager->searchItems( $search );
271
-			$manager->deleteItems( array_keys( $result ) );
270
+			$result = $manager->searchItems($search);
271
+			$manager->deleteItems(array_keys($result));
272 272
 
273
-			$count = count( $result );
273
+			$count = count($result);
274 274
 			$start += $count;
275
-			$search->setSlice( $start );
275
+			$search->setSlice($start);
276 276
 		}
277
-		while( $count == $search->getSliceSize() );
277
+		while ($count == $search->getSliceSize());
278 278
 	}
279 279
 
280 280
 
Please login to merge, or discard this patch.
controller/jobs/tests/Controller/Jobs/Admin/Log/StandardTest.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 		$this->context = \TestHelperJobs::getContext();
26 26
 		$aimeos = \TestHelperJobs::getAimeos();
27 27
 
28
-		$this->object = new \Aimeos\Controller\Jobs\Admin\Log\Standard( $this->context, $aimeos );
28
+		$this->object = new \Aimeos\Controller\Jobs\Admin\Log\Standard($this->context, $aimeos);
29 29
 	}
30 30
 
31 31
 
@@ -44,14 +44,14 @@  discard block
 block discarded – undo
44 44
 
45 45
 	public function testGetName()
46 46
 	{
47
-		$this->assertEquals( 'Log cleanup', $this->object->getName() );
47
+		$this->assertEquals('Log cleanup', $this->object->getName());
48 48
 	}
49 49
 
50 50
 
51 51
 	public function testGetDescription()
52 52
 	{
53 53
 		$text = 'Removes the old log entries from the database and archives them (optional)';
54
-		$this->assertEquals( $text, $this->object->getDescription() );
54
+		$this->assertEquals($text, $this->object->getDescription());
55 55
 	}
56 56
 
57 57
 
@@ -59,38 +59,38 @@  discard block
 block discarded – undo
59 59
 	{
60 60
 		$config = $this->context->getConfig();
61 61
 
62
-		$mock = $this->getMockBuilder( '\\Aimeos\\MAdmin\\Log\\Manager\\Standard' )
63
-			->setMethods( array( 'deleteItems' ) )
64
-			->setConstructorArgs( array( $this->context ) )
62
+		$mock = $this->getMockBuilder('\\Aimeos\\MAdmin\\Log\\Manager\\Standard')
63
+			->setMethods(array('deleteItems'))
64
+			->setConstructorArgs(array($this->context))
65 65
 			->getMock();
66 66
 
67
-		$mock->expects( $this->atLeastOnce() )->method( 'deleteItems' );
67
+		$mock->expects($this->atLeastOnce())->method('deleteItems');
68 68
 
69
-		$tmppath = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'tmp';
69
+		$tmppath = dirname(dirname(dirname(dirname(__DIR__)))) . DIRECTORY_SEPARATOR . 'tmp';
70 70
 		$name = 'ControllerJobsAdminLogDefaultRun';
71
-		$config->set( 'madmin/log/manager/name', $name );
72
-		$config->set( 'controller/jobs/admin/log/standard/limit-days', 0 );
73
-		$config->set( 'controller/jobs/admin/log/standard/path', $tmppath );
71
+		$config->set('madmin/log/manager/name', $name);
72
+		$config->set('controller/jobs/admin/log/standard/limit-days', 0);
73
+		$config->set('controller/jobs/admin/log/standard/path', $tmppath);
74 74
 
75
-		\Aimeos\MAdmin\Log\Manager\Factory::injectManager( '\\Aimeos\\MAdmin\\Log\\Manager\\' . $name, $mock );
75
+		\Aimeos\MAdmin\Log\Manager\Factory::injectManager('\\Aimeos\\MAdmin\\Log\\Manager\\' . $name, $mock);
76 76
 
77
-		if( !is_dir( $tmppath ) && mkdir( $tmppath ) === false ) {
78
-			throw new \RuntimeException( sprintf( 'Unable to create temporary path "%1$s"', $tmppath ) );
77
+		if (!is_dir($tmppath) && mkdir($tmppath) === false) {
78
+			throw new \RuntimeException(sprintf('Unable to create temporary path "%1$s"', $tmppath));
79 79
 		}
80 80
 
81 81
 		$this->object->run();
82 82
 
83
-		foreach( new \DirectoryIterator( $tmppath ) as $file )
83
+		foreach (new \DirectoryIterator($tmppath) as $file)
84 84
 		{
85
-			if( $file->isFile() && $file->getExtension() === 'zip' )
85
+			if ($file->isFile() && $file->getExtension() === 'zip')
86 86
 			{
87
-				$container = \Aimeos\MW\Container\Factory::getContainer( $file->getPathName(), 'Zip', 'CSV', [] );
88
-				$container->get( 'unittest facility.csv' );
89
-				unlink( $file->getPathName() );
87
+				$container = \Aimeos\MW\Container\Factory::getContainer($file->getPathName(), 'Zip', 'CSV', []);
88
+				$container->get('unittest facility.csv');
89
+				unlink($file->getPathName());
90 90
 				return;
91 91
 			}
92 92
 		}
93 93
 
94
-		$this->fail( 'Log archive file not found' );
94
+		$this->fail('Log archive file not found');
95 95
 	}
96 96
 }
Please login to merge, or discard this patch.
jobs/tests/Controller/Jobs/Order/Service/Payment/StandardTest.php 1 patch
Spacing   +67 added lines, -67 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 		$context = \TestHelperJobs::getContext();
25 25
 		$aimeos = \TestHelperJobs::getAimeos();
26 26
 
27
-		$this->object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos );
27
+		$this->object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos);
28 28
 	}
29 29
 
30 30
 
@@ -42,14 +42,14 @@  discard block
 block discarded – undo
42 42
 
43 43
 	public function testGetName()
44 44
 	{
45
-		$this->assertEquals( 'Capture authorized payments', $this->object->getName() );
45
+		$this->assertEquals('Capture authorized payments', $this->object->getName());
46 46
 	}
47 47
 
48 48
 
49 49
 	public function testGetDescription()
50 50
 	{
51 51
 		$text = 'Authorized payments of orders will be captured after dispatching or after a configurable amount of time';
52
-		$this->assertEquals( $text, $this->object->getDescription() );
52
+		$this->assertEquals($text, $this->object->getDescription());
53 53
 	}
54 54
 
55 55
 
@@ -60,49 +60,49 @@  discard block
 block discarded – undo
60 60
 
61 61
 
62 62
 		$name = 'ControllerJobsServicePaymentProcessDefaultRun';
63
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
64
-		$context->getConfig()->set( 'mshop/order/manager/name', $name );
63
+		$context->getConfig()->set('mshop/service/manager/name', $name);
64
+		$context->getConfig()->set('mshop/order/manager/name', $name);
65 65
 
66 66
 
67
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
68
-			->setMethods( array( 'getProvider', 'searchItems' ) )
69
-			->setConstructorArgs( array( $context ) )
67
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
68
+			->setMethods(array('getProvider', 'searchItems'))
69
+			->setConstructorArgs(array($context))
70 70
 			->getMock();
71 71
 
72
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
73
-			->setMethods( array( 'saveItem', 'searchItems' ) )
74
-			->setConstructorArgs( array( $context ) )
72
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
73
+			->setMethods(array('saveItem', 'searchItems'))
74
+			->setConstructorArgs(array($context))
75 75
 			->getMock();
76 76
 
77
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
78
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
77
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
78
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
79 79
 
80 80
 
81 81
 		$serviceItem = $serviceManagerStub->createItem();
82 82
 		$orderItem = $orderManagerStub->createItem();
83 83
 
84
-		$serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay' )
85
-			->setMethods( array( 'isImplemented', 'capture' ) )
86
-			->setConstructorArgs( array( $context, $serviceItem ) )
84
+		$serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay')
85
+			->setMethods(array('isImplemented', 'capture'))
86
+			->setConstructorArgs(array($context, $serviceItem))
87 87
 			->getMock();
88 88
 
89 89
 
90
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
91
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
90
+		$serviceManagerStub->expects($this->once())->method('searchItems')
91
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
92 92
 
93
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
94
-			->will( $this->returnValue( $serviceProviderStub ) );
93
+		$serviceManagerStub->expects($this->once())->method('getProvider')
94
+			->will($this->returnValue($serviceProviderStub));
95 95
 
96
-		$orderManagerStub->expects( $this->once() )->method( 'searchItems' )
97
-			->will( $this->onConsecutiveCalls( array( $orderItem ), [] ) );
96
+		$orderManagerStub->expects($this->once())->method('searchItems')
97
+			->will($this->onConsecutiveCalls(array($orderItem), []));
98 98
 
99
-		$serviceProviderStub->expects( $this->once() )->method( 'isImplemented' )
100
-			->will( $this->returnValue( true ) );
99
+		$serviceProviderStub->expects($this->once())->method('isImplemented')
100
+			->will($this->returnValue(true));
101 101
 
102
-		$serviceProviderStub->expects( $this->once() )->method( 'capture' );
102
+		$serviceProviderStub->expects($this->once())->method('capture');
103 103
 
104 104
 
105
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos );
105
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos);
106 106
 		$object->run();
107 107
 	}
108 108
 
@@ -114,52 +114,52 @@  discard block
 block discarded – undo
114 114
 
115 115
 
116 116
 		$name = 'ControllerJobsServicePaymentProcessDefaultRun';
117
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
118
-		$context->getConfig()->set( 'mshop/order/manager/name', $name );
117
+		$context->getConfig()->set('mshop/service/manager/name', $name);
118
+		$context->getConfig()->set('mshop/order/manager/name', $name);
119 119
 
120 120
 
121
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
122
-			->setMethods( array( 'saveItem', 'searchItems' ) )
123
-			->setConstructorArgs( array( $context ) )
121
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
122
+			->setMethods(array('saveItem', 'searchItems'))
123
+			->setConstructorArgs(array($context))
124 124
 			->getMock();
125 125
 
126
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
127
-			->setMethods( array( 'getProvider', 'searchItems' ) )
128
-			->setConstructorArgs( array( $context ) )
126
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
127
+			->setMethods(array('getProvider', 'searchItems'))
128
+			->setConstructorArgs(array($context))
129 129
 			->getMock();
130 130
 
131
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
132
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
131
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
132
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
133 133
 
134 134
 
135 135
 		$serviceItem = $serviceManagerStub->createItem();
136 136
 		$orderItem = $orderManagerStub->createItem();
137 137
 
138
-		$serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay' )
139
-			->setMethods( array( 'isImplemented', 'capture' ) )
140
-			->setConstructorArgs( array( $context, $serviceItem ) )
138
+		$serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay')
139
+			->setMethods(array('isImplemented', 'capture'))
140
+			->setConstructorArgs(array($context, $serviceItem))
141 141
 			->getMock();
142 142
 
143 143
 
144
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
145
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
144
+		$serviceManagerStub->expects($this->once())->method('searchItems')
145
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
146 146
 
147
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
148
-			->will( $this->returnValue( $serviceProviderStub ) );
147
+		$serviceManagerStub->expects($this->once())->method('getProvider')
148
+			->will($this->returnValue($serviceProviderStub));
149 149
 
150
-		$orderManagerStub->expects( $this->once() )->method( 'searchItems' )
151
-			->will( $this->onConsecutiveCalls( array( $orderItem ), [] ) );
150
+		$orderManagerStub->expects($this->once())->method('searchItems')
151
+			->will($this->onConsecutiveCalls(array($orderItem), []));
152 152
 
153
-		$serviceProviderStub->expects( $this->once() )->method( 'isImplemented' )
154
-			->will( $this->returnValue( true ) );
153
+		$serviceProviderStub->expects($this->once())->method('isImplemented')
154
+			->will($this->returnValue(true));
155 155
 
156
-		$serviceProviderStub->expects( $this->once() )->method( 'capture' )
157
-			->will( $this->throwException( new \Aimeos\MShop\Service\Exception( 'test oder service payment: capture' ) ) );
156
+		$serviceProviderStub->expects($this->once())->method('capture')
157
+			->will($this->throwException(new \Aimeos\MShop\Service\Exception('test oder service payment: capture')));
158 158
 
159
-		$orderManagerStub->expects( $this->never() )->method( 'saveItem' );
159
+		$orderManagerStub->expects($this->never())->method('saveItem');
160 160
 
161 161
 
162
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos );
162
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos);
163 163
 		$object->run();
164 164
 	}
165 165
 
@@ -171,36 +171,36 @@  discard block
 block discarded – undo
171 171
 
172 172
 
173 173
 		$name = 'ControllerJobsServicePaymentProcessDefaultRun';
174
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
175
-		$context->getConfig()->set( 'mshop/order/manager/name', $name );
174
+		$context->getConfig()->set('mshop/service/manager/name', $name);
175
+		$context->getConfig()->set('mshop/order/manager/name', $name);
176 176
 
177 177
 
178
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
179
-			->setMethods( array( 'saveItem', 'searchItems' ) )
180
-			->setConstructorArgs( array( $context ) )
178
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
179
+			->setMethods(array('saveItem', 'searchItems'))
180
+			->setConstructorArgs(array($context))
181 181
 			->getMock();
182 182
 
183
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
184
-			->setMethods( array( 'getProvider', 'searchItems' ) )
185
-			->setConstructorArgs( array( $context ) )
183
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
184
+			->setMethods(array('getProvider', 'searchItems'))
185
+			->setConstructorArgs(array($context))
186 186
 			->getMock();
187 187
 
188
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
189
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
188
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
189
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
190 190
 
191 191
 
192 192
 		$serviceItem = $serviceManagerStub->createItem();
193 193
 
194
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
195
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
194
+		$serviceManagerStub->expects($this->once())->method('searchItems')
195
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
196 196
 
197
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
198
-			->will( $this->throwException( new \Aimeos\MShop\Service\Exception( 'test service delivery process: getProvider' ) ) );
197
+		$serviceManagerStub->expects($this->once())->method('getProvider')
198
+			->will($this->throwException(new \Aimeos\MShop\Service\Exception('test service delivery process: getProvider')));
199 199
 
200
-		$orderManagerStub->expects( $this->never() )->method( 'searchItems' );
200
+		$orderManagerStub->expects($this->never())->method('searchItems');
201 201
 
202 202
 
203
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos );
203
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos);
204 204
 		$object->run();
205 205
 	}
206 206
 }
Please login to merge, or discard this patch.
controller/jobs/tests/Controller/Jobs/Order/Service/Async/StandardTest.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 		$context = \TestHelperJobs::getContext();
25 25
 		$aimeos = \TestHelperJobs::getAimeos();
26 26
 
27
-		$this->object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard( $context, $aimeos );
27
+		$this->object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard($context, $aimeos);
28 28
 	}
29 29
 
30 30
 
@@ -42,14 +42,14 @@  discard block
 block discarded – undo
42 42
 
43 43
 	public function testGetName()
44 44
 	{
45
-		$this->assertEquals( 'Batch update of payment/delivery status', $this->object->getName() );
45
+		$this->assertEquals('Batch update of payment/delivery status', $this->object->getName());
46 46
 	}
47 47
 
48 48
 
49 49
 	public function testGetDescription()
50 50
 	{
51 51
 		$text = 'Executes payment or delivery service providers that uses batch updates';
52
-		$this->assertEquals( $text, $this->object->getDescription() );
52
+		$this->assertEquals($text, $this->object->getDescription());
53 53
 	}
54 54
 
55 55
 
@@ -60,34 +60,34 @@  discard block
 block discarded – undo
60 60
 
61 61
 
62 62
 		$name = 'ControllerJobsServiceAsyncProcessDefaultRun';
63
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
63
+		$context->getConfig()->set('mshop/service/manager/name', $name);
64 64
 
65 65
 
66
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
67
-			->setMethods( array( 'getProvider', 'searchItems' ) )
68
-			->setConstructorArgs( array( $context ) )
66
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
67
+			->setMethods(array('getProvider', 'searchItems'))
68
+			->setConstructorArgs(array($context))
69 69
 			->getMock();
70 70
 
71
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
71
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
72 72
 
73 73
 
74 74
 		$serviceItem = $serviceManagerStub->createItem();
75 75
 
76
-		$serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Manual' )
77
-			->setConstructorArgs( array( $context, $serviceItem ) )
76
+		$serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Manual')
77
+			->setConstructorArgs(array($context, $serviceItem))
78 78
 			->getMock();
79 79
 
80 80
 
81
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
82
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
81
+		$serviceManagerStub->expects($this->once())->method('searchItems')
82
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
83 83
 
84
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
85
-			->will( $this->returnValue( $serviceProviderStub ) );
84
+		$serviceManagerStub->expects($this->once())->method('getProvider')
85
+			->will($this->returnValue($serviceProviderStub));
86 86
 
87
-		$serviceProviderStub->expects( $this->once() )->method( 'updateAsync' );
87
+		$serviceProviderStub->expects($this->once())->method('updateAsync');
88 88
 
89 89
 
90
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard( $context, $aimeos );
90
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard($context, $aimeos);
91 91
 		$object->run();
92 92
 	}
93 93
 
@@ -99,27 +99,27 @@  discard block
 block discarded – undo
99 99
 
100 100
 
101 101
 		$name = 'ControllerJobsServiceAsyncProcessDefaultRun';
102
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
102
+		$context->getConfig()->set('mshop/service/manager/name', $name);
103 103
 
104 104
 
105
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
106
-			->setMethods( array( 'getProvider', 'searchItems' ) )
107
-			->setConstructorArgs( array( $context ) )
105
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
106
+			->setMethods(array('getProvider', 'searchItems'))
107
+			->setConstructorArgs(array($context))
108 108
 			->getMock();
109 109
 
110
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
110
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
111 111
 
112 112
 
113 113
 		$serviceItem = $serviceManagerStub->createItem();
114 114
 
115
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
116
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
115
+		$serviceManagerStub->expects($this->once())->method('searchItems')
116
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
117 117
 
118
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
119
-			->will( $this->throwException( new \Aimeos\MShop\Service\Exception() ) );
118
+		$serviceManagerStub->expects($this->once())->method('getProvider')
119
+			->will($this->throwException(new \Aimeos\MShop\Service\Exception()));
120 120
 
121 121
 
122
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard( $context, $aimeos );
122
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard($context, $aimeos);
123 123
 		$object->run();
124 124
 	}
125 125
 }
Please login to merge, or discard this patch.