Completed
Push — master ( 6c002e...adcfe9 )
by Aimeos
03:19
created
src/Controller/Common/Order/Export/Csv/Processor/Invoice/Standard.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -40,21 +40,21 @@
 block discarded – undo
40 40
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items
41 41
 	 * @return array Two dimensional associative list of order data representing the lines in CSV
42 42
 	 */
43
-	public function process( \Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order )
43
+	public function process(\Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order)
44 44
 	{
45 45
 		$result = [];
46 46
 		$list = $invoice->toArray() + $order->toArray();
47 47
 
48
-		foreach( $this->getMapping() as $pos => $key )
48
+		foreach ($this->getMapping() as $pos => $key)
49 49
 		{
50
-			if( array_key_exists( $key, $list ) ) {
50
+			if (array_key_exists($key, $list)) {
51 51
 				$result[$pos] = $list[$key];
52 52
 			} else {
53 53
 				$result[$pos] = '';
54 54
 			}
55 55
 		}
56 56
 
57
-		ksort( $result );
57
+		ksort($result);
58 58
 
59 59
 		return [$result];
60 60
 	}
Please login to merge, or discard this patch.
common/src/Controller/Common/Order/Export/Csv/Processor/Iface.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
26 26
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
27 27
 	 */
28
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping );
28
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping);
29 29
 
30 30
 
31 31
 	/**
@@ -35,5 +35,5 @@  discard block
 block discarded – undo
35 35
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items
36 36
 	 * @return array Two dimensional associative list of order data representing the lines in CSV
37 37
 	 */
38
-	public function process( \Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order );
38
+	public function process(\Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order);
39 39
 }
40 40
\ No newline at end of file
Please login to merge, or discard this patch.
common/src/Controller/Common/Coupon/Import/Csv/Processor/Base.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 	 * Initializes the object
30 30
 	 *
31 31
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
32
-	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
32
+	 * @param string[] $mapping Associative list of field position in CSV as key and domain item key as value
33 33
 	 * @param \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object Decorated processor
34 34
 	 */
35 35
 	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -32,8 +32,8 @@  discard block
 block discarded – undo
32 32
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
33 33
 	 * @param \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object Decorated processor
34 34
 	 */
35
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
36
-		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object = null )
35
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
36
+		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object = null)
37 37
 	{
38 38
 		$this->context = $context;
39 39
 		$this->mapping = $mapping;
@@ -71,8 +71,8 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	protected function getObject()
73 73
 	{
74
-		if( $this->object === null ) {
75
-			throw new \Aimeos\Controller\Jobs\Exception( 'No processor object available' );
74
+		if ($this->object === null) {
75
+			throw new \Aimeos\Controller\Jobs\Exception('No processor object available');
76 76
 		}
77 77
 
78 78
 		return $this->object;
Please login to merge, or discard this patch.
controller/common/src/Controller/Common/Coupon/Import/Csv/Base.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -26,17 +26,17 @@  discard block
 block discarded – undo
26 26
 	 * @param array $codes List of coupon codes
27 27
 	 * @return array Associative list of coupon codes as key and coupon code items as value
28 28
 	 */
29
-	protected function getCouponCodeItems( array $codes )
29
+	protected function getCouponCodeItems(array $codes)
30 30
 	{
31 31
 		$result = [];
32
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
32
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
33 33
 
34 34
 		$search = $manager->createSearch();
35
-		$search->setConditions( $search->compare( '==', 'coupon.code.code', $codes ) );
36
-		$search->setSlice( 0, count( $codes ) );
35
+		$search->setConditions($search->compare('==', 'coupon.code.code', $codes));
36
+		$search->setSlice(0, count($codes));
37 37
 
38
-		foreach( $manager->searchItems( $search ) as $item ) {
39
-			$result[ $item->getCode() ] = $item;
38
+		foreach ($manager->searchItems($search) as $item) {
39
+			$result[$item->getCode()] = $item;
40 40
 		}
41 41
 
42 42
 		return $result;
@@ -51,15 +51,15 @@  discard block
 block discarded – undo
51 51
 	 * @param integer $codePos Column position which contains the unique coupon code (starting from 0)
52 52
 	 * @return array List of arrays with coupon codes as keys and list of values from the CSV file
53 53
 	 */
54
-	protected function getData( \Aimeos\MW\Container\Content\Iface $content, $maxcnt, $codePos )
54
+	protected function getData(\Aimeos\MW\Container\Content\Iface $content, $maxcnt, $codePos)
55 55
 	{
56 56
 		$count = 0;
57 57
 		$data = [];
58 58
 
59
-		while( $content->valid() && $count++ < $maxcnt )
59
+		while ($content->valid() && $count++ < $maxcnt)
60 60
 		{
61 61
 			$row = $content->current();
62
-			$data[ $row[$codePos] ] = $row;
62
+			$data[$row[$codePos]] = $row;
63 63
 			$content->next();
64 64
 		}
65 65
 
@@ -98,21 +98,21 @@  discard block
 block discarded – undo
98 98
 	 * @param array $mapping List of domain item keys with the CSV field position as key
99 99
 	 * @return array List of associative arrays containing the chunked properties
100 100
 	 */
101
-	protected function getMappedChunk( array &$data, array $mapping )
101
+	protected function getMappedChunk(array &$data, array $mapping)
102 102
 	{
103 103
 		$idx = 0;
104 104
 		$map = [];
105 105
 
106
-		foreach( $mapping as $pos => $key )
106
+		foreach ($mapping as $pos => $key)
107 107
 		{
108
-			if( isset( $map[$idx][$key] ) ) {
108
+			if (isset($map[$idx][$key])) {
109 109
 				$idx++;
110 110
 			}
111 111
 
112
-			if( isset( $data[$pos] ) )
112
+			if (isset($data[$pos]))
113 113
 			{
114 114
 				$map[$idx][$key] = $data[$pos];
115
-				unset( $data[$pos] );
115
+				unset($data[$pos]);
116 116
 			}
117 117
 		}
118 118
 
@@ -126,39 +126,39 @@  discard block
 block discarded – undo
126 126
 	 * @param array $mappings Associative list of processor types as keys and index/data mappings as values
127 127
 	 * @return \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface Processor object
128 128
 	 */
129
-	protected function getProcessors( array $mappings )
129
+	protected function getProcessors(array $mappings)
130 130
 	{
131 131
 		$context = $this->getContext();
132 132
 		$config = $context->getConfig();
133 133
 		$iface = '\\Aimeos\\Controller\\Common\\Coupon\\Import\\Csv\\Processor\\Iface';
134
-		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Done( $context, [] );
134
+		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Done($context, []);
135 135
 
136
-		foreach( $mappings as $type => $mapping )
136
+		foreach ($mappings as $type => $mapping)
137 137
 		{
138
-			if( ctype_alnum( $type ) === false )
138
+			if (ctype_alnum($type) === false)
139 139
 			{
140 140
 				$classname = is_string($type) ? '\\Aimeos\\Controller\\Common\\Coupon\\Import\\Csv\\Processor\\' . $type : '<not a string>';
141
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
141
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
142 142
 			}
143 143
 
144
-			$name = $config->get( 'controller/common/coupon/import/csv/processor/' . $type . '/name', 'Standard' );
144
+			$name = $config->get('controller/common/coupon/import/csv/processor/' . $type . '/name', 'Standard');
145 145
 
146
-			if( ctype_alnum( $name ) === false )
146
+			if (ctype_alnum($name) === false)
147 147
 			{
148 148
 				$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Coupon\\Import\\Csv\\Processor\\' . $type . '\\' . $name : '<not a string>';
149
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
149
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
150 150
 			}
151 151
 
152
-			$classname = '\\Aimeos\\Controller\\Common\\Coupon\\Import\\Csv\\Processor\\' . ucfirst( $type ) . '\\' . $name;
152
+			$classname = '\\Aimeos\\Controller\\Common\\Coupon\\Import\\Csv\\Processor\\' . ucfirst($type) . '\\' . $name;
153 153
 
154
-			if( class_exists( $classname ) === false ) {
155
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
154
+			if (class_exists($classname) === false) {
155
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" not found', $classname));
156 156
 			}
157 157
 
158
-			$object = new $classname( $context, $mapping, $object );
158
+			$object = new $classname($context, $mapping, $object);
159 159
 
160
-			if( !( $object instanceof $iface ) ) {
161
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );
160
+			if (!($object instanceof $iface)) {
161
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $iface));
162 162
 			}
163 163
 		}
164 164
 
Please login to merge, or discard this patch.
common/src/Controller/Common/Coupon/Import/Csv/Processor/Done.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -27,8 +27,8 @@  discard block
 block discarded – undo
27 27
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
28 28
 	 * @param \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object Decorated processor
29 29
 	 */
30
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
31
-		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object = null )
30
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
31
+		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object = null)
32 32
 	{
33 33
 	}
34 34
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @param array $data List of CSV fields with position as key and data as value
41 41
 	 * @return array List of data which hasn't been imported
42 42
 	 */
43
-	public function process( \Aimeos\MShop\Coupon\Item\Code\Iface $item, array $data )
43
+	public function process(\Aimeos\MShop\Coupon\Item\Code\Iface $item, array $data)
44 44
 	{
45 45
 		return $data;
46 46
 	}
Please login to merge, or discard this patch.
common/src/Controller/Common/Coupon/Import/Csv/Processor/Iface.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
26 26
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
27 27
 	 * @param \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object Decorated processor
28 28
 	 */
29
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
30
-		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object = null );
29
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
30
+		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object = null);
31 31
 
32 32
 
33 33
 	/**
@@ -37,5 +37,5 @@  discard block
 block discarded – undo
37 37
 	 * @param array $data List of CSV fields with position as key and data as value
38 38
 	 * @return array List of data which hasn't been imported
39 39
 	 */
40
-	public function process( \Aimeos\MShop\Coupon\Item\Code\Iface $item, array $data );
40
+	public function process(\Aimeos\MShop\Coupon\Item\Code\Iface $item, array $data);
41 41
 }
42 42
\ No newline at end of file
Please login to merge, or discard this patch.
tests/Controller/Common/Coupon/Import/Csv/Processor/Code/StandardTest.php 1 patch
Spacing   +35 added lines, -35 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\Coupon\Import\Csv\Processor\Done( $this->context, [] );
23
+		$this->endpoint = new \Aimeos\Controller\Common\Coupon\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
 
@@ -47,24 +47,24 @@  discard block
 block discarded – undo
47 47
 			3 => '',
48 48
 		);
49 49
 
50
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon' );
51
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon/code' );
50
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon');
51
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon/code');
52 52
 
53
-		$coupon = $manager->saveItem( $manager->createItem()->setProvider( 'test' ) );
53
+		$coupon = $manager->saveItem($manager->createItem()->setProvider('test'));
54 54
 		$couponCode = $codeManager->createItem();
55
-		$couponCode->setParentId( $coupon->getId() );
55
+		$couponCode->setParentId($coupon->getId());
56 56
 
57
-		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Code\Standard( $this->context, $mapping, $this->endpoint );
58
-		$object->process( $couponCode, $data );
57
+		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Code\Standard($this->context, $mapping, $this->endpoint);
58
+		$object->process($couponCode, $data);
59 59
 
60
-		$codeManager->deleteItem( $couponCode->getId() );
61
-		$manager->deleteItem( $coupon->getId() );
60
+		$codeManager->deleteItem($couponCode->getId());
61
+		$manager->deleteItem($coupon->getId());
62 62
 
63 63
 
64
-		$this->assertEquals( 10, $couponCode->getCount() );
65
-		$this->assertEquals( 'jobimporttest', $couponCode->getCode() );
66
-		$this->assertEquals( '2000-01-01 00:00:00', $couponCode->getDateStart() );
67
-		$this->assertEquals( null, $couponCode->getDateEnd() );
64
+		$this->assertEquals(10, $couponCode->getCount());
65
+		$this->assertEquals('jobimporttest', $couponCode->getCode());
66
+		$this->assertEquals('2000-01-01 00:00:00', $couponCode->getDateStart());
67
+		$this->assertEquals(null, $couponCode->getDateEnd());
68 68
 	}
69 69
 
70 70
 
@@ -86,23 +86,23 @@  discard block
 block discarded – undo
86 86
 		);
87 87
 
88 88
 
89
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon' );
90
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon/code' );
89
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon');
90
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon/code');
91 91
 
92
-		$coupon = $manager->saveItem( $manager->createItem()->setProvider( 'test' ) );
92
+		$coupon = $manager->saveItem($manager->createItem()->setProvider('test'));
93 93
 		$couponCode = $codeManager->createItem();
94
-		$couponCode->setParentId( $coupon->getId() );
94
+		$couponCode->setParentId($coupon->getId());
95 95
 
96
-		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Code\Standard( $this->context, $mapping, $this->endpoint );
97
-		$object->process( $couponCode, $data );
98
-		$object->process( $couponCode, $dataUpdate );
96
+		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Code\Standard($this->context, $mapping, $this->endpoint);
97
+		$object->process($couponCode, $data);
98
+		$object->process($couponCode, $dataUpdate);
99 99
 
100
-		$codeManager->deleteItem( $couponCode->getId() );
101
-		$manager->deleteItem( $coupon->getId() );
100
+		$codeManager->deleteItem($couponCode->getId());
101
+		$manager->deleteItem($coupon->getId());
102 102
 
103 103
 
104
-		$this->assertEquals( 5, $couponCode->getCount() );
105
-		$this->assertEquals( 'jobimporttest', $couponCode->getCode() );
104
+		$this->assertEquals(5, $couponCode->getCount());
105
+		$this->assertEquals('jobimporttest', $couponCode->getCode());
106 106
 	}
107 107
 
108 108
 
@@ -119,20 +119,20 @@  discard block
 block discarded – undo
119 119
 		);
120 120
 
121 121
 
122
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon' );
123
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon/code' );
122
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon');
123
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon/code');
124 124
 
125
-		$coupon = $manager->saveItem( $manager->createItem()->setProvider( 'test' ) );
125
+		$coupon = $manager->saveItem($manager->createItem()->setProvider('test'));
126 126
 		$couponCode = $codeManager->createItem();
127
-		$couponCode->setParentId( $coupon->getId() );
127
+		$couponCode->setParentId($coupon->getId());
128 128
 
129
-		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Code\Standard( $this->context, $mapping, $this->endpoint );
130
-		$object->process( $couponCode, $data );
129
+		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Code\Standard($this->context, $mapping, $this->endpoint);
130
+		$object->process($couponCode, $data);
131 131
 
132
-		$codeManager->deleteItem( $couponCode->getId() );
133
-		$manager->deleteItem( $coupon->getId() );
132
+		$codeManager->deleteItem($couponCode->getId());
133
+		$manager->deleteItem($coupon->getId());
134 134
 
135 135
 
136
-		$this->assertEquals( 0, $couponCode->getCount() );
136
+		$this->assertEquals(0, $couponCode->getCount());
137 137
 	}
138 138
 }
139 139
\ No newline at end of file
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Coupon/Import/Csv/Code/Standard.php 2 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -160,8 +160,7 @@  discard block
 block discarded – undo
160 160
 				$msg = 'Finished coupon import: %1$d successful, %2$s errors, %3$s total (%4$s)';
161 161
 				$logger->log( sprintf( $msg, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
162 162
 			}
163
-		}
164
-		catch( \Exception $e )
163
+		} catch( \Exception $e )
165 164
 		{
166 165
 			$logger->log( 'Coupon import error: ' . $e->getMessage() );
167 166
 			$logger->log( $e->getTraceAsString() );
@@ -309,8 +308,7 @@  discard block
 block discarded – undo
309 308
 				$list = $processor->process( $item, $list );
310 309
 
311 310
 				$manager->commit();
312
-			}
313
-			catch( \Exception $e )
311
+			} catch( \Exception $e )
314 312
 			{
315 313
 				$manager->rollback();
316 314
 
Please login to merge, or discard this patch.
Spacing   +47 added lines, -47 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', 'Coupon code import CSV' );
31
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Coupon code 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 coupon code from CSV files' );
42
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Imports new and updates existing coupon code from CSV files');
43 43
 	}
44 44
 
45 45
 
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 		 * @see controller/jobs/coupon/import/csv/code/skip-lines
72 72
 		 * @see controller/jobs/coupon/import/csv/code/max-size
73 73
 		 */
74
-		$mappings = $config->get( 'controller/jobs/coupon/import/csv/code/mapping', $mappings );
74
+		$mappings = $config->get('controller/jobs/coupon/import/csv/code/mapping', $mappings);
75 75
 
76 76
 
77 77
 		/** controller/jobs/coupon/import/csv/code/max-size
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 		 * @see controller/jobs/coupon/import/csv/code/skip-lines
91 91
 		 * @see controller/jobs/coupon/import/csv/code/mapping
92 92
 		 */
93
-		$maxcnt = (int) $config->get( 'controller/jobs/coupon/import/csv/code/max-size', 1000 );
93
+		$maxcnt = (int) $config->get('controller/jobs/coupon/import/csv/code/max-size', 1000);
94 94
 
95 95
 
96 96
 		/** controller/jobs/coupon/import/csv/code/skip-lines
@@ -108,64 +108,64 @@  discard block
 block discarded – undo
108 108
 		 * @see controller/jobs/coupon/import/csv/code/mapping
109 109
 		 * @see controller/jobs/coupon/import/csv/code/max-size
110 110
 		 */
111
-		$skiplines = (int) $config->get( 'controller/jobs/coupon/import/csv/code/skip-lines', 0 );
111
+		$skiplines = (int) $config->get('controller/jobs/coupon/import/csv/code/skip-lines', 0);
112 112
 
113 113
 
114 114
 		try
115 115
 		{
116
-			$processor = $this->getProcessors( $mappings );
117
-			$codePos = $this->getCodePosition( $mappings['code'] );
118
-			$fs = $context->getFileSystemManager()->get( 'fs-import' );
116
+			$processor = $this->getProcessors($mappings);
117
+			$codePos = $this->getCodePosition($mappings['code']);
118
+			$fs = $context->getFileSystemManager()->get('fs-import');
119 119
 			$dir = 'couponcode/' . $context->getLocale()->getSite()->getCode();
120 120
 
121
-			if( $fs->isDir( $dir ) === false ) {
121
+			if ($fs->isDir($dir) === false) {
122 122
 				return;
123 123
 			}
124 124
 
125
-			foreach( $fs->scan( $dir ) as $filename )
125
+			foreach ($fs->scan($dir) as $filename)
126 126
 			{
127
-				if( $filename == '.' || $filename == '..' ) {
127
+				if ($filename == '.' || $filename == '..') {
128 128
 					continue;
129 129
 				}
130 130
 
131
-				list( $couponId, ) = explode( '.', $filename );
132
-				$container = $this->getContainer( $fs->readf( $dir . '/' . $filename ) );
131
+				list($couponId,) = explode('.', $filename);
132
+				$container = $this->getContainer($fs->readf($dir . '/' . $filename));
133 133
 
134
-				$msg = sprintf( 'Started coupon import from "%1$s" (%2$s)', $filename, __CLASS__ );
135
-				$logger->log( $msg, \Aimeos\MW\Logger\Base::NOTICE );
134
+				$msg = sprintf('Started coupon import from "%1$s" (%2$s)', $filename, __CLASS__);
135
+				$logger->log($msg, \Aimeos\MW\Logger\Base::NOTICE);
136 136
 
137
-				foreach( $container as $content )
137
+				foreach ($container as $content)
138 138
 				{
139
-					for( $i = 0; $i < $skiplines; $i++ ) {
139
+					for ($i = 0; $i < $skiplines; $i++) {
140 140
 						$content->next();
141 141
 					}
142 142
 
143
-					while( ( $data = $this->getData( $content, $maxcnt, $codePos ) ) !== [] )
143
+					while (($data = $this->getData($content, $maxcnt, $codePos)) !== [])
144 144
 					{
145
-						$items = $this->getCouponCodeItems( array_keys( $data ) );
146
-						$errcnt = $this->import( $items, $data, $couponId, $processor );
147
-						$chunkcnt = count( $data );
145
+						$items = $this->getCouponCodeItems(array_keys($data));
146
+						$errcnt = $this->import($items, $data, $couponId, $processor);
147
+						$chunkcnt = count($data);
148 148
 
149 149
 						$msg = 'Imported coupon lines from "%1$s": %2$d/%3$d (%4$s)';
150
-						$logger->log( sprintf( $msg, $filename, $chunkcnt - $errcnt, $chunkcnt, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
150
+						$logger->log(sprintf($msg, $filename, $chunkcnt - $errcnt, $chunkcnt, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
151 151
 
152 152
 						$errors += $errcnt;
153 153
 						$total += $chunkcnt;
154
-						unset( $items, $data );
154
+						unset($items, $data);
155 155
 					}
156 156
 				}
157 157
 
158 158
 				$container->close();
159
-				$fs->rm( $dir . '/' . $filename );
159
+				$fs->rm($dir . '/' . $filename);
160 160
 
161 161
 				$msg = 'Finished coupon import: %1$d successful, %2$s errors, %3$s total (%4$s)';
162
-				$logger->log( sprintf( $msg, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
162
+				$logger->log(sprintf($msg, $total - $errors, $errors, $total, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
163 163
 			}
164 164
 		}
165
-		catch( \Exception $e )
165
+		catch (\Exception $e)
166 166
 		{
167
-			$logger->log( 'Coupon import error: ' . $e->getMessage() );
168
-			$logger->log( $e->getTraceAsString() );
167
+			$logger->log('Coupon import error: ' . $e->getMessage());
168
+			$logger->log($e->getTraceAsString());
169 169
 
170 170
 			throw $e;
171 171
 		}
@@ -179,16 +179,16 @@  discard block
 block discarded – undo
179 179
 	 * @return integer Position of the "coupon.code" column
180 180
 	 * @throws \Aimeos\Controller\Jobs\Exception If no mapping for "coupon.code.code" is found
181 181
 	 */
182
-	protected function getCodePosition( array $mapping )
182
+	protected function getCodePosition(array $mapping)
183 183
 	{
184
-		foreach( $mapping as $pos => $key )
184
+		foreach ($mapping as $pos => $key)
185 185
 		{
186
-			if( $key === 'coupon.code.code' ) {
186
+			if ($key === 'coupon.code.code') {
187 187
 				return $pos;
188 188
 			}
189 189
 		}
190 190
 
191
-		throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No "coupon.code.code" column in CSV mapping found' ) );
191
+		throw new \Aimeos\Controller\Jobs\Exception(sprintf('No "coupon.code.code" column in CSV mapping found'));
192 192
 	}
193 193
 
194 194
 
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 	 * @param string $filepath Path to the container file
199 199
 	 * @return \Aimeos\MW\Container\Iface Container object
200 200
 	 */
201
-	protected function getContainer( $filepath )
201
+	protected function getContainer($filepath)
202 202
 	{
203 203
 		$config = $this->getContext()->getConfig();
204 204
 
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 		 * @see controller/jobs/coupon/import/csv/code/container/content
223 223
 		 * @see controller/jobs/coupon/import/csv/code/container/options
224 224
 		 */
225
-		$container = $config->get( 'controller/jobs/coupon/import/csv/code/container/type', 'File' );
225
+		$container = $config->get('controller/jobs/coupon/import/csv/code/container/type', 'File');
226 226
 
227 227
 		/** controller/jobs/coupon/import/csv/code/container/content
228 228
 		 * Name of the content type inside the container to read the data from
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 		 * @see controller/jobs/coupon/import/csv/code/container/type
243 243
 		 * @see controller/jobs/coupon/import/csv/code/container/options
244 244
 		 */
245
-		$content = $config->get( 'controller/jobs/coupon/import/csv/code/container/content', 'CSV' );
245
+		$content = $config->get('controller/jobs/coupon/import/csv/code/container/content', 'CSV');
246 246
 
247 247
 		/** controller/jobs/coupon/import/csv/code/container/options
248 248
 		 * List of file container options for the coupon import files
@@ -259,9 +259,9 @@  discard block
 block discarded – undo
259 259
 		 * @see controller/jobs/coupon/import/csv/code/container/content
260 260
 		 * @see controller/jobs/coupon/import/csv/code/container/type
261 261
 		 */
262
-		$options = $config->get( 'controller/jobs/coupon/import/csv/code/container/options', [] );
262
+		$options = $config->get('controller/jobs/coupon/import/csv/code/container/options', []);
263 263
 
264
-		return \Aimeos\MW\Container\Factory::getContainer( $filepath, $container, $content, $options );
264
+		return \Aimeos\MW\Container\Factory::getContainer($filepath, $container, $content, $options);
265 265
 	}
266 266
 
267 267
 
@@ -275,36 +275,36 @@  discard block
 block discarded – undo
275 275
 	 * @return integer Number of coupons that couldn't be imported
276 276
 	 * @throws \Aimeos\Controller\Jobs\Exception
277 277
 	 */
278
-	protected function import( array $items, array $data, $couponId,
279
-		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $processor )
278
+	protected function import(array $items, array $data, $couponId,
279
+		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $processor)
280 280
 	{
281 281
 		$errors = 0;
282 282
 		$context = $this->getContext();
283
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'coupon/code' );
283
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'coupon/code');
284 284
 
285
-		foreach( $data as $code => $list )
285
+		foreach ($data as $code => $list)
286 286
 		{
287 287
 			$manager->begin();
288 288
 
289 289
 			try
290 290
 			{
291
-				if( isset( $items[$code] ) ) {
291
+				if (isset($items[$code])) {
292 292
 					$item = $items[$code];
293 293
 				} else {
294 294
 					$item = $manager->createItem();
295 295
 				}
296 296
 
297
-				$item->setParentId( $couponId );
298
-				$list = $processor->process( $item, $list );
297
+				$item->setParentId($couponId);
298
+				$list = $processor->process($item, $list);
299 299
 
300 300
 				$manager->commit();
301 301
 			}
302
-			catch( \Exception $e )
302
+			catch (\Exception $e)
303 303
 			{
304 304
 				$manager->rollback();
305 305
 
306
-				$msg = sprintf( 'Unable to import coupon with code "%1$s": %2$s', $code, $e->getMessage() );
307
-				$context->getLogger()->log( $msg );
306
+				$msg = sprintf('Unable to import coupon with code "%1$s": %2$s', $code, $e->getMessage());
307
+				$context->getLogger()->log($msg);
308 308
 
309 309
 				$errors++;
310 310
 			}
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Coupon/Import/Csv/Code/Factory.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 * @param string|null $name Name of the controller or "Standard" if null
30 30
 	 * @return \Aimeos\Controller\Jobs\Iface New controller object
31 31
 	 */
32
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null )
32
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null)
33 33
 	{
34 34
 		/** controller/jobs/coupon/import/csv/code/name
35 35
 		 * Class name of the used coupon code import job controller implementation
@@ -64,20 +64,20 @@  discard block
 block discarded – undo
64 64
 		 * @since 2017.10
65 65
 		 * @category Developer
66 66
 		 */
67
-		if ( $name === null ) {
67
+		if ($name === null) {
68 68
 			$name = $context->getConfig()->get('controller/jobs/coupon/import/csv/code/name', 'Standard');
69 69
 		}
70 70
 
71
-		if ( ctype_alnum($name) === false )
71
+		if (ctype_alnum($name) === false)
72 72
 		{
73 73
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Jobs\\Coupon\\Import\\Csv\\Code\\' . $name : '<not a string>';
74
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
74
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
75 75
 		}
76 76
 
77 77
 		$iface = '\\Aimeos\\Controller\\Jobs\\Iface';
78 78
 		$classname = '\\Aimeos\\Controller\\Jobs\\Coupon\\Import\\Csv\\Code\\' . $name;
79 79
 
80
-		$controller = self::createControllerBase( $context, $aimeos, $classname, $iface );
80
+		$controller = self::createControllerBase($context, $aimeos, $classname, $iface);
81 81
 
82 82
 		/** controller/jobs/coupon/import/csv/code/decorators/excludes
83 83
 		 * Excludes decorators added by the "common" option from the coupon code import CSV job controller
@@ -154,6 +154,6 @@  discard block
 block discarded – undo
154 154
 		 * @see controller/jobs/coupon/import/csv/code/decorators/excludes
155 155
 		 * @see controller/jobs/coupon/import/csv/code/decorators/global
156 156
 		 */
157
-		return self::addControllerDecorators( $context, $aimeos, $controller, 'coupon/import/csv/code' );
157
+		return self::addControllerDecorators($context, $aimeos, $controller, 'coupon/import/csv/code');
158 158
 	}
159 159
 }
160 160
\ No newline at end of file
Please login to merge, or discard this patch.