Completed
Push — master ( 484d40...618dc8 )
by Aimeos
03:12
created
controller/jobs/tests/Controller/Jobs/Admin/Log/FactoryTest.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
 		$context = \TestHelperJobs::getContext();
16 16
 		$aimeos = \TestHelperJobs::getAimeos();
17 17
 
18
-		$obj = \Aimeos\Controller\Jobs\Admin\Log\Factory::createController( $context, $aimeos );
19
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj );
18
+		$obj = \Aimeos\Controller\Jobs\Admin\Log\Factory::createController($context, $aimeos);
19
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj);
20 20
 	}
21 21
 
22 22
 
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
25 25
 		$context = \TestHelperJobs::getContext();
26 26
 		$aimeos = \TestHelperJobs::getAimeos();
27 27
 
28
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
29
-		\Aimeos\Controller\Jobs\Admin\Log\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
28
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
29
+		\Aimeos\Controller\Jobs\Admin\Log\Factory::createController($context, $aimeos, 'Wrong$$$Name');
30 30
 	}
31 31
 
32 32
 
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
 		$context = \TestHelperJobs::getContext();
36 36
 		$aimeos = \TestHelperJobs::getAimeos();
37 37
 
38
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
39
-		\Aimeos\Controller\Jobs\Admin\Log\Factory::createController( $context, $aimeos, 'WrongClass' );
38
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
39
+		\Aimeos\Controller\Jobs\Admin\Log\Factory::createController($context, $aimeos, 'WrongClass');
40 40
 	}
41 41
 
42 42
 
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 		$context = \TestHelperJobs::getContext();
46 46
 		$aimeos = \TestHelperJobs::getAimeos();
47 47
 
48
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
49
-		\Aimeos\Controller\Jobs\Admin\Log\Factory::createController( $context, $aimeos, 'Factory' );
48
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
49
+		\Aimeos\Controller\Jobs\Admin\Log\Factory::createController($context, $aimeos, 'Factory');
50 50
 	}
51 51
 
52 52
 }
Please login to merge, or discard this patch.
controller/jobs/tests/Controller/Jobs/Index/Optimize/FactoryTest.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
 		$context = \TestHelperJobs::getContext();
16 16
 		$aimeos = \TestHelperJobs::getAimeos();
17 17
 
18
-		$obj = \Aimeos\Controller\Jobs\Index\Optimize\Factory::createController( $context, $aimeos );
19
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj );
18
+		$obj = \Aimeos\Controller\Jobs\Index\Optimize\Factory::createController($context, $aimeos);
19
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj);
20 20
 	}
21 21
 
22 22
 
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
25 25
 		$context = \TestHelperJobs::getContext();
26 26
 		$aimeos = \TestHelperJobs::getAimeos();
27 27
 
28
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
29
-		\Aimeos\Controller\Jobs\Index\Optimize\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
28
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
29
+		\Aimeos\Controller\Jobs\Index\Optimize\Factory::createController($context, $aimeos, 'Wrong$$$Name');
30 30
 	}
31 31
 
32 32
 
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
 		$context = \TestHelperJobs::getContext();
36 36
 		$aimeos = \TestHelperJobs::getAimeos();
37 37
 
38
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
39
-		\Aimeos\Controller\Jobs\Index\Optimize\Factory::createController( $context, $aimeos, 'WrongClass' );
38
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
39
+		\Aimeos\Controller\Jobs\Index\Optimize\Factory::createController($context, $aimeos, 'WrongClass');
40 40
 	}
41 41
 
42 42
 
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 		$context = \TestHelperJobs::getContext();
46 46
 		$aimeos = \TestHelperJobs::getAimeos();
47 47
 
48
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
49
-		\Aimeos\Controller\Jobs\Index\Optimize\Factory::createController( $context, $aimeos, 'Factory' );
48
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
49
+		\Aimeos\Controller\Jobs\Index\Optimize\Factory::createController($context, $aimeos, 'Factory');
50 50
 	}
51 51
 
52 52
 }
Please login to merge, or discard this patch.
controller/jobs/tests/Controller/Jobs/Index/Rebuild/FactoryTest.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
 		$context = \TestHelperJobs::getContext();
16 16
 		$aimeos = \TestHelperJobs::getAimeos();
17 17
 
18
-		$obj = \Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController( $context, $aimeos );
19
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj );
18
+		$obj = \Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController($context, $aimeos);
19
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj);
20 20
 	}
21 21
 
22 22
 
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
25 25
 		$context = \TestHelperJobs::getContext();
26 26
 		$aimeos = \TestHelperJobs::getAimeos();
27 27
 
28
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
29
-		\Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
28
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
29
+		\Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController($context, $aimeos, 'Wrong$$$Name');
30 30
 	}
31 31
 
32 32
 
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
 		$context = \TestHelperJobs::getContext();
36 36
 		$aimeos = \TestHelperJobs::getAimeos();
37 37
 
38
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
39
-		\Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController( $context, $aimeos, 'WrongClass' );
38
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
39
+		\Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController($context, $aimeos, 'WrongClass');
40 40
 	}
41 41
 
42 42
 
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 		$context = \TestHelperJobs::getContext();
46 46
 		$aimeos = \TestHelperJobs::getAimeos();
47 47
 
48
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
49
-		\Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController( $context, $aimeos, 'Factory' );
48
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
49
+		\Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController($context, $aimeos, 'Factory');
50 50
 	}
51 51
 
52 52
 }
Please login to merge, or discard this patch.
jobs/tests/Controller/Jobs/Product/Export/Sitemap/StandardTest.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -22,12 +22,12 @@  discard block
 block discarded – undo
22 22
 	 */
23 23
 	protected function setUp()
24 24
 	{
25
-		\Aimeos\MShop\Factory::setCache( true );
25
+		\Aimeos\MShop\Factory::setCache(true);
26 26
 
27 27
 		$this->context = \TestHelperJobs::getContext();
28 28
 		$this->aimeos = \TestHelperJobs::getAimeos();
29 29
 
30
-		$this->object = new \Aimeos\Controller\Jobs\Product\Export\Sitemap\Standard( $this->context, $this->aimeos );
30
+		$this->object = new \Aimeos\Controller\Jobs\Product\Export\Sitemap\Standard($this->context, $this->aimeos);
31 31
 	}
32 32
 
33 33
 
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	 */
40 40
 	protected function tearDown()
41 41
 	{
42
-		\Aimeos\MShop\Factory::setCache( false );
42
+		\Aimeos\MShop\Factory::setCache(false);
43 43
 		\Aimeos\MShop\Factory::clear();
44 44
 
45 45
 		$this->object = null;
@@ -48,14 +48,14 @@  discard block
 block discarded – undo
48 48
 
49 49
 	public function testGetName()
50 50
 	{
51
-		$this->assertEquals( 'Product site map', $this->object->getName() );
51
+		$this->assertEquals('Product site map', $this->object->getName());
52 52
 	}
53 53
 
54 54
 
55 55
 	public function testGetDescription()
56 56
 	{
57 57
 		$text = 'Creates a product site map for search engines';
58
-		$this->assertEquals( $text, $this->object->getDescription() );
58
+		$this->assertEquals($text, $this->object->getDescription());
59 59
 	}
60 60
 
61 61
 
@@ -64,22 +64,22 @@  discard block
 block discarded – undo
64 64
 		$this->object->run();
65 65
 		
66 66
 		$ds = DIRECTORY_SEPARATOR;
67
-		$this->assertFileExists( 'tmp' . $ds . 'aimeos-sitemap-1.xml.gz' );
68
-		$this->assertFileExists( 'tmp' . $ds . 'aimeos-sitemap-2.xml.gz' );
69
-		$this->assertFileExists( 'tmp' . $ds . 'aimeos-sitemap-index.xml.gz' );
67
+		$this->assertFileExists('tmp' . $ds . 'aimeos-sitemap-1.xml.gz');
68
+		$this->assertFileExists('tmp' . $ds . 'aimeos-sitemap-2.xml.gz');
69
+		$this->assertFileExists('tmp' . $ds . 'aimeos-sitemap-index.xml.gz');
70 70
 		
71
-		$file1 = gzread( gzopen( 'tmp' . $ds . 'aimeos-sitemap-1.xml.gz', 'rb' ), 0x1000 );
72
-		$file2 = gzread( gzopen( 'tmp' . $ds . 'aimeos-sitemap-2.xml.gz', 'rb' ), 0x1000 );
73
-		$index = gzread( gzopen( 'tmp' . $ds . 'aimeos-sitemap-index.xml.gz', 'rb' ), 0x1000 );
71
+		$file1 = gzread(gzopen('tmp' . $ds . 'aimeos-sitemap-1.xml.gz', 'rb'), 0x1000);
72
+		$file2 = gzread(gzopen('tmp' . $ds . 'aimeos-sitemap-2.xml.gz', 'rb'), 0x1000);
73
+		$index = gzread(gzopen('tmp' . $ds . 'aimeos-sitemap-index.xml.gz', 'rb'), 0x1000);
74 74
 
75
-		unlink( 'tmp' . $ds . 'aimeos-sitemap-1.xml.gz' );
76
-		unlink( 'tmp' . $ds . 'aimeos-sitemap-2.xml.gz' );
77
-		unlink( 'tmp' . $ds . 'aimeos-sitemap-index.xml.gz' );
75
+		unlink('tmp' . $ds . 'aimeos-sitemap-1.xml.gz');
76
+		unlink('tmp' . $ds . 'aimeos-sitemap-2.xml.gz');
77
+		unlink('tmp' . $ds . 'aimeos-sitemap-index.xml.gz');
78 78
 
79
-		$this->assertContains( 'Cafe-Noire-Expresso', $file1 );
80
-		$this->assertContains( 'Unittest%3A-Bundle', $file2 );
79
+		$this->assertContains('Cafe-Noire-Expresso', $file1);
80
+		$this->assertContains('Unittest%3A-Bundle', $file2);
81 81
 
82
-		$this->assertContains( 'aimeos-sitemap-1.xml.gz', $index );
83
-		$this->assertContains( 'aimeos-sitemap-2.xml.gz', $index );
82
+		$this->assertContains('aimeos-sitemap-1.xml.gz', $index);
83
+		$this->assertContains('aimeos-sitemap-2.xml.gz', $index);
84 84
 	}
85 85
 }
86 86
\ No newline at end of file
Please login to merge, or discard this patch.
controller/jobs/tests/Controller/Jobs/Product/Export/StandardTest.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -22,12 +22,12 @@  discard block
 block discarded – undo
22 22
 	 */
23 23
 	protected function setUp()
24 24
 	{
25
-		\Aimeos\MShop\Factory::setCache( true );
25
+		\Aimeos\MShop\Factory::setCache(true);
26 26
 
27 27
 		$this->context = \TestHelperJobs::getContext();
28 28
 		$this->aimeos = \TestHelperJobs::getAimeos();
29 29
 
30
-		$this->object = new \Aimeos\Controller\Jobs\Product\Export\Standard( $this->context, $this->aimeos );
30
+		$this->object = new \Aimeos\Controller\Jobs\Product\Export\Standard($this->context, $this->aimeos);
31 31
 	}
32 32
 
33 33
 
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	 */
40 40
 	protected function tearDown()
41 41
 	{
42
-		\Aimeos\MShop\Factory::setCache( false );
42
+		\Aimeos\MShop\Factory::setCache(false);
43 43
 		\Aimeos\MShop\Factory::clear();
44 44
 
45 45
 		$this->object = null;
@@ -48,14 +48,14 @@  discard block
 block discarded – undo
48 48
 
49 49
 	public function testGetName()
50 50
 	{
51
-		$this->assertEquals( 'Product export', $this->object->getName() );
51
+		$this->assertEquals('Product export', $this->object->getName());
52 52
 	}
53 53
 
54 54
 
55 55
 	public function testGetDescription()
56 56
 	{
57 57
 		$text = 'Exports all available products';
58
-		$this->assertEquals( $text, $this->object->getDescription() );
58
+		$this->assertEquals($text, $this->object->getDescription());
59 59
 	}
60 60
 
61 61
 
@@ -64,16 +64,16 @@  discard block
 block discarded – undo
64 64
 		$this->object->run();
65 65
 		
66 66
 		$ds = DIRECTORY_SEPARATOR;
67
-		$this->assertFileExists( 'tmp' . $ds . 'aimeos-products-1.xml' );
68
-		$this->assertFileExists( 'tmp' . $ds . 'aimeos-products-2.xml' );
67
+		$this->assertFileExists('tmp' . $ds . 'aimeos-products-1.xml');
68
+		$this->assertFileExists('tmp' . $ds . 'aimeos-products-2.xml');
69 69
 		
70
-		$file1 = file_get_contents( 'tmp' . $ds . 'aimeos-products-1.xml' );
71
-		$file2 = file_get_contents( 'tmp' . $ds . 'aimeos-products-2.xml' );
70
+		$file1 = file_get_contents('tmp' . $ds . 'aimeos-products-1.xml');
71
+		$file2 = file_get_contents('tmp' . $ds . 'aimeos-products-2.xml');
72 72
 
73
-		unlink( 'tmp' . $ds . 'aimeos-products-1.xml' );
74
-		unlink( 'tmp' . $ds . 'aimeos-products-2.xml' );
73
+		unlink('tmp' . $ds . 'aimeos-products-1.xml');
74
+		unlink('tmp' . $ds . 'aimeos-products-2.xml');
75 75
 
76
-		$this->assertContains( 'CNE', $file1 );
77
-		$this->assertContains( 'U:BUNDLE', $file2 );
76
+		$this->assertContains('CNE', $file1);
77
+		$this->assertContains('U:BUNDLE', $file2);
78 78
 	}
79 79
 }
80 80
\ No newline at end of file
Please login to merge, or discard this patch.
controller/jobs/tests/Controller/Jobs/Product/Bought/FactoryTest.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
 		$context = \TestHelperJobs::getContext();
16 16
 		$aimeos = \TestHelperJobs::getAimeos();
17 17
 
18
-		$obj = \Aimeos\Controller\Jobs\Product\Bought\Factory::createController( $context, $aimeos );
19
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj );
18
+		$obj = \Aimeos\Controller\Jobs\Product\Bought\Factory::createController($context, $aimeos);
19
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj);
20 20
 	}
21 21
 
22 22
 
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
25 25
 		$context = \TestHelperJobs::getContext();
26 26
 		$aimeos = \TestHelperJobs::getAimeos();
27 27
 
28
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
29
-		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
28
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
29
+		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController($context, $aimeos, 'Wrong$$$Name');
30 30
 	}
31 31
 
32 32
 
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
 		$context = \TestHelperJobs::getContext();
36 36
 		$aimeos = \TestHelperJobs::getAimeos();
37 37
 
38
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
39
-		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController( $context, $aimeos, 'WrongClass' );
38
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
39
+		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController($context, $aimeos, 'WrongClass');
40 40
 	}
41 41
 
42 42
 
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 		$context = \TestHelperJobs::getContext();
46 46
 		$aimeos = \TestHelperJobs::getAimeos();
47 47
 
48
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
49
-		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController( $context, $aimeos, 'Factory' );
48
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
49
+		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController($context, $aimeos, 'Factory');
50 50
 	}
51 51
 }
52 52
\ No newline at end of file
Please login to merge, or discard this patch.
controller/jobs/tests/Controller/Jobs/Product/Bought/StandardTest.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -23,12 +23,12 @@  discard block
 block discarded – undo
23 23
 	 */
24 24
 	protected function setUp()
25 25
 	{
26
-		\Aimeos\MShop\Factory::setCache( true );
26
+		\Aimeos\MShop\Factory::setCache(true);
27 27
 
28 28
 		$this->context = \TestHelperJobs::getContext();
29 29
 		$this->aimeos = \TestHelperJobs::getAimeos();
30 30
 
31
-		$this->object = new \Aimeos\Controller\Jobs\Product\Bought\Standard( $this->context, $this->aimeos );
31
+		$this->object = new \Aimeos\Controller\Jobs\Product\Bought\Standard($this->context, $this->aimeos);
32 32
 	}
33 33
 
34 34
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 */
41 41
 	protected function tearDown()
42 42
 	{
43
-		\Aimeos\MShop\Factory::setCache( false );
43
+		\Aimeos\MShop\Factory::setCache(false);
44 44
 		\Aimeos\MShop\Factory::clear();
45 45
 
46 46
 		$this->object = null;
@@ -49,28 +49,28 @@  discard block
 block discarded – undo
49 49
 
50 50
 	public function testGetName()
51 51
 	{
52
-		$this->assertEquals( 'Products bought together', $this->object->getName() );
52
+		$this->assertEquals('Products bought together', $this->object->getName());
53 53
 	}
54 54
 
55 55
 
56 56
 	public function testGetDescription()
57 57
 	{
58 58
 		$text = 'Creates bought together product suggestions';
59
-		$this->assertEquals( $text, $this->object->getDescription() );
59
+		$this->assertEquals($text, $this->object->getDescription());
60 60
 	}
61 61
 
62 62
 
63 63
 	public function testRun()
64 64
 	{
65
-		$stub = $this->getMockBuilder( '\\Aimeos\\MShop\\Product\\Manager\\Lists\\Standard' )
66
-			->setConstructorArgs( array( $this->context ) )
67
-			->setMethods( array( 'deleteItems', 'saveItem' ) )
65
+		$stub = $this->getMockBuilder('\\Aimeos\\MShop\\Product\\Manager\\Lists\\Standard')
66
+			->setConstructorArgs(array($this->context))
67
+			->setMethods(array('deleteItems', 'saveItem'))
68 68
 			->getMock();
69 69
 
70
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'product/lists', $stub );
70
+		\Aimeos\MShop\Factory::injectManager($this->context, 'product/lists', $stub);
71 71
 
72
-		$stub->expects( $this->atLeastOnce() )->method( 'deleteItems' );
73
-		$stub->expects( $this->atLeastOnce() )->method( 'saveItem' );
72
+		$stub->expects($this->atLeastOnce())->method('deleteItems');
73
+		$stub->expects($this->atLeastOnce())->method('saveItem');
74 74
 
75 75
 		$this->object->run();
76 76
 	}
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
@@ -129,8 +129,7 @@
 block discarded – undo
129 129
 			$remaining = $this->getObject()->process( $product, $data );
130 130
 
131 131
 			$manager->commit();
132
-		}
133
-		catch( \Exception $e )
132
+		} catch( \Exception $e )
134 133
 		{
135 134
 			$manager->rollback();
136 135
 			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 = array();
104 104
 
105
-			foreach( $this->getMappedChunk( $data ) as $list )
105
+			foreach ($this->getMappedChunk($data) 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 = array();
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
-			$remaining = $this->getObject()->process( $product, $data );
131
+			$remaining = $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/Stock/Standard.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -129,8 +129,7 @@
 block discarded – undo
129 129
 			$remaining = $this->getObject()->process( $product, $data );
130 130
 
131 131
 			$manager->commit();
132
-		}
133
-		catch( \Exception $e )
132
+		} catch( \Exception $e )
134 133
 		{
135 134
 			$manager->rollback();
136 135
 			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 );
69
-			$items = $this->getStockItems( $product->getCode() );
68
+			$map = $this->getMappedChunk($data);
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 );
97
+				$item->fromArray($list);
98
+				$manager->saveItem($item);
99 99
 			}
100 100
 
101
-			$manager->deleteItems( array_keys( $items ) );
101
+			$manager->deleteItems(array_keys($items));
102 102
 
103
-			$remaining = $this->getObject()->process( $product, $data );
103
+			$remaining = $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.