Inspection of "Fixed scrutinizer-ci issues" - aimeos/ai-controller-jobs - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 96b5a6...c41e60 )

by Aimeos

created 2016-04-27 22:54 UTC

Status

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Index\Optimize\Standard( $context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Index\Optimize\Standard($context, $aimeos);
 	}
 
 
@@ -42,14 +42,14 @@  discard block
 block discarded – undo
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Catalog index optimization', $this->object->getName() );
+		$this->assertEquals('Catalog index optimization', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Optimizes the catalog index for searching products';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
@@ -60,21 +60,21 @@  discard block
 block discarded – undo
 
 
 		$name = 'ControllerJobsCatalogIndexOptimizeDefaultRun';
-		$context->getConfig()->set( 'mshop/index/manager/name', $name );
+		$context->getConfig()->set('mshop/index/manager/name', $name);
 
 
-		$indexManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Index\\Manager\\Standard' )
-			->setMethods( array( 'optimize' ) )
-			->setConstructorArgs( array( $context ) )
+		$indexManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Index\\Manager\\Standard')
+			->setMethods(array('optimize'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Catalog\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Index\\Manager\\' . $name, $indexManagerStub );
+		\Aimeos\MShop\Catalog\Manager\Factory::injectManager('\\Aimeos\\MShop\\Index\\Manager\\' . $name, $indexManagerStub);
 
 
-		$indexManagerStub->expects( $this->once() )->method( 'optimize' );
+		$indexManagerStub->expects($this->once())->method('optimize');
 
 
-		$object = new \Aimeos\Controller\Jobs\Index\Optimize\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Index\Optimize\Standard($context, $aimeos);
 		$object->run();
 	}
 }

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
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$obj = \Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController( $context, $aimeos );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj );
+		$obj = \Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController($context, $aimeos);
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj);
 	}
 
 
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController($context, $aimeos, 'Wrong$$$Name');
 	}
 
 
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController( $context, $aimeos, 'WrongClass' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController($context, $aimeos, 'WrongClass');
 	}
 
 
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController( $context, $aimeos, 'Factory' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Index\Rebuild\Factory::createController($context, $aimeos, 'Factory');
 	}
 
 }

Please login to merge, or discard this patch.

controller/jobs/tests/Controller/Jobs/Index/Rebuild/StandardTest.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Index\Rebuild\Standard( $context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Index\Rebuild\Standard($context, $aimeos);
 	}
 
 
@@ -42,14 +42,14 @@  discard block
 block discarded – undo
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Catalog index rebuild', $this->object->getName() );
+		$this->assertEquals('Catalog index rebuild', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Rebuilds the catalog index for searching products';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
@@ -60,22 +60,22 @@  discard block
 block discarded – undo
 
 
 		$name = 'ControllerJobsCatalogIndexRebuildDefaultRun';
-		$context->getConfig()->set( 'mshop/index/manager/name', $name );
+		$context->getConfig()->set('mshop/index/manager/name', $name);
 
 
-		$indexManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Index\\Manager\\Standard' )
-			->setMethods( array( 'rebuildIndex', 'cleanupIndex' ) )
-			->setConstructorArgs( array( $context ) )
+		$indexManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Index\\Manager\\Standard')
+			->setMethods(array('rebuildIndex', 'cleanupIndex'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Catalog\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Index\\Manager\\' . $name, $indexManagerStub );
+		\Aimeos\MShop\Catalog\Manager\Factory::injectManager('\\Aimeos\\MShop\\Index\\Manager\\' . $name, $indexManagerStub);
 
 
-		$indexManagerStub->expects( $this->once() )->method( 'rebuildIndex' );
-		$indexManagerStub->expects( $this->once() )->method( 'cleanupIndex' );
+		$indexManagerStub->expects($this->once())->method('rebuildIndex');
+		$indexManagerStub->expects($this->once())->method('cleanupIndex');
 
 
-		$object = new \Aimeos\Controller\Jobs\Index\Rebuild\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Index\Rebuild\Standard($context, $aimeos);
 		$object->run();
 	}
 }

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
 	 */
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperJobs::getContext();
 		$this->aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Product\Export\Sitemap\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Product\Export\Sitemap\Standard($this->context, $this->aimeos);
 	}
 
 
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
 	 */
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
 		$this->object = null;
@@ -48,14 +48,14 @@  discard block
 block discarded – undo
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Product site map', $this->object->getName() );
+		$this->assertEquals('Product site map', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Creates a product site map for search engines';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
@@ -64,22 +64,22 @@  discard block
 block discarded – undo
 		$this->object->run();
 		
 		$ds = DIRECTORY_SEPARATOR;
-		$this->assertFileExists( 'tmp' . $ds . 'aimeos-sitemap-1.xml.gz' );
-		$this->assertFileExists( 'tmp' . $ds . 'aimeos-sitemap-2.xml.gz' );
-		$this->assertFileExists( 'tmp' . $ds . 'aimeos-sitemap-index.xml.gz' );
+		$this->assertFileExists('tmp' . $ds . 'aimeos-sitemap-1.xml.gz');
+		$this->assertFileExists('tmp' . $ds . 'aimeos-sitemap-2.xml.gz');
+		$this->assertFileExists('tmp' . $ds . 'aimeos-sitemap-index.xml.gz');
 		
-		$file1 = gzread( gzopen( 'tmp' . $ds . 'aimeos-sitemap-1.xml.gz', 'rb' ), 0x1000 );
-		$file2 = gzread( gzopen( 'tmp' . $ds . 'aimeos-sitemap-2.xml.gz', 'rb' ), 0x1000 );
-		$index = gzread( gzopen( 'tmp' . $ds . 'aimeos-sitemap-index.xml.gz', 'rb' ), 0x1000 );
+		$file1 = gzread(gzopen('tmp' . $ds . 'aimeos-sitemap-1.xml.gz', 'rb'), 0x1000);
+		$file2 = gzread(gzopen('tmp' . $ds . 'aimeos-sitemap-2.xml.gz', 'rb'), 0x1000);
+		$index = gzread(gzopen('tmp' . $ds . 'aimeos-sitemap-index.xml.gz', 'rb'), 0x1000);
 
-		unlink( 'tmp' . $ds . 'aimeos-sitemap-1.xml.gz' );
-		unlink( 'tmp' . $ds . 'aimeos-sitemap-2.xml.gz' );
-		unlink( 'tmp' . $ds . 'aimeos-sitemap-index.xml.gz' );
+		unlink('tmp' . $ds . 'aimeos-sitemap-1.xml.gz');
+		unlink('tmp' . $ds . 'aimeos-sitemap-2.xml.gz');
+		unlink('tmp' . $ds . 'aimeos-sitemap-index.xml.gz');
 
-		$this->assertContains( 'Cafe-Noire-Expresso', $file1 );
-		$this->assertContains( 'Unittest%3A-Bundle', $file2 );
+		$this->assertContains('Cafe-Noire-Expresso', $file1);
+		$this->assertContains('Unittest%3A-Bundle', $file2);
 
-		$this->assertContains( 'aimeos-sitemap-1.xml.gz', $index );
-		$this->assertContains( 'aimeos-sitemap-2.xml.gz', $index );
+		$this->assertContains('aimeos-sitemap-1.xml.gz', $index);
+		$this->assertContains('aimeos-sitemap-2.xml.gz', $index);
 	}
 }
\ 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
 	 */
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperJobs::getContext();
 		$this->aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Product\Export\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Product\Export\Standard($this->context, $this->aimeos);
 	}
 
 
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
 	 */
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
 		$this->object = null;
@@ -48,14 +48,14 @@  discard block
 block discarded – undo
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Product export', $this->object->getName() );
+		$this->assertEquals('Product export', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Exports all available products';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
@@ -64,16 +64,16 @@  discard block
 block discarded – undo
 		$this->object->run();
 		
 		$ds = DIRECTORY_SEPARATOR;
-		$this->assertFileExists( 'tmp' . $ds . 'aimeos-products-1.xml' );
-		$this->assertFileExists( 'tmp' . $ds . 'aimeos-products-2.xml' );
+		$this->assertFileExists('tmp' . $ds . 'aimeos-products-1.xml');
+		$this->assertFileExists('tmp' . $ds . 'aimeos-products-2.xml');
 		
-		$file1 = file_get_contents( 'tmp' . $ds . 'aimeos-products-1.xml' );
-		$file2 = file_get_contents( 'tmp' . $ds . 'aimeos-products-2.xml' );
+		$file1 = file_get_contents('tmp' . $ds . 'aimeos-products-1.xml');
+		$file2 = file_get_contents('tmp' . $ds . 'aimeos-products-2.xml');
 
-		unlink( 'tmp' . $ds . 'aimeos-products-1.xml' );
-		unlink( 'tmp' . $ds . 'aimeos-products-2.xml' );
+		unlink('tmp' . $ds . 'aimeos-products-1.xml');
+		unlink('tmp' . $ds . 'aimeos-products-2.xml');
 
-		$this->assertContains( 'CNE', $file1 );
-		$this->assertContains( 'U:BUNDLE', $file2 );
+		$this->assertContains('CNE', $file1);
+		$this->assertContains('U:BUNDLE', $file2);
 	}
 }
\ 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
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$obj = \Aimeos\Controller\Jobs\Product\Bought\Factory::createController( $context, $aimeos );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj );
+		$obj = \Aimeos\Controller\Jobs\Product\Bought\Factory::createController($context, $aimeos);
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj);
 	}
 
 
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController($context, $aimeos, 'Wrong$$$Name');
 	}
 
 
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController( $context, $aimeos, 'WrongClass' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController($context, $aimeos, 'WrongClass');
 	}
 
 
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController( $context, $aimeos, 'Factory' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController($context, $aimeos, 'Factory');
 	}
 }
\ 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
 	 */
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperJobs::getContext();
 		$this->aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Product\Bought\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Product\Bought\Standard($this->context, $this->aimeos);
 	}
 
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
 	 */
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
 		$this->object = null;
@@ -49,28 +49,28 @@  discard block
 block discarded – undo
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Products bought together', $this->object->getName() );
+		$this->assertEquals('Products bought together', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Creates bought together product suggestions';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$stub = $this->getMockBuilder( '\\Aimeos\\MShop\\Product\\Manager\\Lists\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( array( 'deleteItems', 'saveItem' ) )
+		$stub = $this->getMockBuilder('\\Aimeos\\MShop\\Product\\Manager\\Lists\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(array('deleteItems', 'saveItem'))
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'product/lists', $stub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'product/lists', $stub);
 
-		$stub->expects( $this->atLeastOnce() )->method( 'deleteItems' );
-		$stub->expects( $this->atLeastOnce() )->method( 'saveItem' );
+		$stub->expects($this->atLeastOnce())->method('deleteItems');
+		$stub->expects($this->atLeastOnce())->method('saveItem');
 
 		$this->object->run();
 	}

Please login to merge, or discard this patch.

controller/jobs/tests/Controller/Jobs/Product/Import/Csv/StandardTest.php 1 patch

Spacing +94 added lines, -94 removed lines patch added patch discarded remove patch

@@ -22,16 +22,16 @@  discard block
 block discarded – undo
 	 */
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperJobs::getContext();
 		$this->aimeos = \TestHelperJobs::getAimeos();
 		$config = $this->context->getConfig();
 
-		$config->set( 'controller/jobs/product/import/csv/skip-lines', 1 );
-		$config->set( 'controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/valid' );
+		$config->set('controller/jobs/product/import/csv/skip-lines', 1);
+		$config->set('controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/valid');
 
-		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard($this->context, $this->aimeos);
 	}
 
 
@@ -43,104 +43,104 @@  discard block
 block discarded – undo
 	 */
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
 		$this->object = null;
 
-		if( file_exists( 'tmp/import.zip' ) ) {
-			unlink( 'tmp/import.zip' );
+		if (file_exists('tmp/import.zip')) {
+			unlink('tmp/import.zip');
 		}
 	}
 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Product import CSV', $this->object->getName() );
+		$this->assertEquals('Product import CSV', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Imports new and updates existing products from CSV files';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
-		$nondelete = array( 'attribute', 'product' );
-		$delete = array( 'media', 'price', 'text' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
+		$nondelete = array('attribute', 'product');
+		$delete = array('media', 'price', 'text');
 
 		$convert = array(
 			1 => 'Text/LatinUTF8',
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/converter', $convert );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/converter', $convert);
 
 		$this->object->run();
 
-		$result = $this->get( $prodcodes, array_merge( $delete, $nondelete ) );
-		$properties = $this->getProperties( array_keys( $result ) );
-		$this->delete( $prodcodes, $delete, $nondelete );
+		$result = $this->get($prodcodes, array_merge($delete, $nondelete));
+		$properties = $this->getProperties(array_keys($result));
+		$this->delete($prodcodes, $delete, $nondelete);
 
-		$this->assertEquals( 2, count( $result ) );
-		$this->assertEquals( 2, count( $properties ) );
+		$this->assertEquals(2, count($result));
+		$this->assertEquals(2, count($properties));
 
-		foreach( $result as $product ) {
-			$this->assertEquals( 5, count( $product->getListItems() ) );
+		foreach ($result as $product) {
+			$this->assertEquals(5, count($product->getListItems()));
 		}
 	}
 
 
 	public function testRunUpdate()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
-		$nondelete = array( 'attribute', 'product' );
-		$delete = array( 'media', 'price', 'text' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
+		$nondelete = array('attribute', 'product');
+		$delete = array('media', 'price', 'text');
 
 		$this->object->run();
 		$this->object->run();
 
-		$result = $this->get( $prodcodes, array_merge( $delete, $nondelete ) );
-		$properties = $this->getProperties( array_keys( $result ) );
-		$this->delete( $prodcodes, $delete, $nondelete );
+		$result = $this->get($prodcodes, array_merge($delete, $nondelete));
+		$properties = $this->getProperties(array_keys($result));
+		$this->delete($prodcodes, $delete, $nondelete);
 
-		$this->assertEquals( 2, count( $result ) );
-		$this->assertEquals( 2, count( $properties ) );
+		$this->assertEquals(2, count($result));
+		$this->assertEquals(2, count($properties));
 
-		foreach( $result as $product ) {
-			$this->assertEquals( 5, count( $product->getListItems() ) );
+		foreach ($result as $product) {
+			$this->assertEquals(5, count($product->getListItems()));
 		}
 	}
 
 
 	public function testRunPosition()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
-		$nondelete = array( 'attribute', 'product' );
-		$delete = array( 'media', 'price', 'text' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
+		$nondelete = array('attribute', 'product');
+		$delete = array('media', 'price', 'text');
 
 		$config = $this->context->getConfig();
-		$mapping = $config->set( 'controller/jobs/product/import/csv/mapping', array() );
-		$mapping['item'] = array( 0 => 'product.label', 1 => 'product.code' );
+		$mapping = $config->set('controller/jobs/product/import/csv/mapping', array());
+		$mapping['item'] = array(0 => 'product.label', 1 => 'product.code');
 
-		$config->set( 'controller/jobs/product/import/csv/mapping', $mapping );
-		$config->set( 'controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/position' );
+		$config->set('controller/jobs/product/import/csv/mapping', $mapping);
+		$config->set('controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/position');
 
 		$this->object->run();
 
-		$result = $this->get( $prodcodes, array_merge( $delete, $nondelete ) );
-		$this->delete( $prodcodes, $delete, $nondelete );
+		$result = $this->get($prodcodes, array_merge($delete, $nondelete));
+		$this->delete($prodcodes, $delete, $nondelete);
 
-		$this->assertEquals( 2, count( $result ) );
+		$this->assertEquals(2, count($result));
 	}
 
 
 	public function testRunProcessorInvalidPosition()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
 
 		$mapping = array(
 			'item' => array(
@@ -160,11 +160,11 @@  discard block
 block discarded – undo
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/mapping', $mapping);
 
 		$this->object->run();
 
-		$this->delete( $prodcodes, array( 'text', 'media' ), array() );
+		$this->delete($prodcodes, array('text', 'media'), array());
 	}
 
 
@@ -176,9 +176,9 @@  discard block
 block discarded – undo
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/mapping', $mapping);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
@@ -218,15 +218,15 @@  discard block
 block discarded – undo
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/mapping', $mapping);
 
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/product/import/csv/skip-lines', 0 );
-		$config->set( 'controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/invalid' );
+		$config->set('controller/jobs/product/import/csv/skip-lines', 0);
+		$config->set('controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/invalid');
 
-		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard($this->context, $this->aimeos);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
@@ -234,104 +234,104 @@  discard block
 block discarded – undo
 	public function testRunBackup()
 	{
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/product/import/csv/container/type', 'Zip' );
-		$config->set( 'controller/jobs/product/import/csv/location', 'tmp/import.zip' );
-		$config->set( 'controller/jobs/product/import/csv/backup', 'tmp/test-%Y-%m-%d.zip' );
+		$config->set('controller/jobs/product/import/csv/container/type', 'Zip');
+		$config->set('controller/jobs/product/import/csv/location', 'tmp/import.zip');
+		$config->set('controller/jobs/product/import/csv/backup', 'tmp/test-%Y-%m-%d.zip');
 
-		if( copy( __DIR__ . '/_testfiles/import.zip', 'tmp/import.zip' ) === false ) {
-			throw new \Exception( 'Unable to copy test file' );
+		if (copy(__DIR__ . '/_testfiles/import.zip', 'tmp/import.zip') === false) {
+			throw new \Exception('Unable to copy test file');
 		}
 
 		$this->object->run();
 
-		$filename = strftime( 'tmp/test-%Y-%m-%d.zip' );
-		$this->assertTrue( file_exists( $filename ) );
+		$filename = strftime('tmp/test-%Y-%m-%d.zip');
+		$this->assertTrue(file_exists($filename));
 
-		unlink( $filename );
+		unlink($filename);
 	}
 
 
 	public function testRunBackupInvalid()
 	{
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/product/import/csv/container/type', 'Zip' );
-		$config->set( 'controller/jobs/product/import/csv/location', 'tmp/import.zip' );
-		$config->set( 'controller/jobs/product/import/csv/backup', 'tmp/notexist/import.zip' );
+		$config->set('controller/jobs/product/import/csv/container/type', 'Zip');
+		$config->set('controller/jobs/product/import/csv/location', 'tmp/import.zip');
+		$config->set('controller/jobs/product/import/csv/backup', 'tmp/notexist/import.zip');
 
-		if( copy( __DIR__ . '/_testfiles/import.zip', 'tmp/import.zip' ) === false ) {
-			throw new \Exception( 'Unable to copy test file' );
+		if (copy(__DIR__ . '/_testfiles/import.zip', 'tmp/import.zip') === false) {
+			throw new \Exception('Unable to copy test file');
 		}
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
 
-	protected function delete( array $prodcodes, array $delete, array $nondelete )
+	protected function delete(array $prodcodes, array $delete, array $nondelete)
 	{
-		$catListManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context )->getSubmanager( 'lists' );
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$listManager = $productManager->getSubManager( 'lists' );
+		$catListManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context)->getSubmanager('lists');
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$listManager = $productManager->getSubManager('lists');
 
-		foreach( $this->get( $prodcodes, $delete + $nondelete ) as $id => $product )
+		foreach ($this->get($prodcodes, $delete + $nondelete) as $id => $product)
 		{
-			foreach( $delete as $domain )
+			foreach ($delete as $domain)
 			{
-				$manager = \Aimeos\MShop\Factory::createManager( $this->context, $domain );
+				$manager = \Aimeos\MShop\Factory::createManager($this->context, $domain);
 
-				foreach( $product->getListItems( $domain ) as $listItem )
+				foreach ($product->getListItems($domain) as $listItem)
 				{
-					$manager->deleteItem( $listItem->getRefItem()->getId() );
-					$listManager->deleteItem( $listItem->getId() );
+					$manager->deleteItem($listItem->getRefItem()->getId());
+					$listManager->deleteItem($listItem->getId());
 				}
 			}
 
-			foreach( $nondelete as $domain )
+			foreach ($nondelete as $domain)
 			{
-				$ids = array_keys( $product->getListItems( $domain ) );
-				$listManager->deleteItems( $ids );
+				$ids = array_keys($product->getListItems($domain));
+				$listManager->deleteItems($ids);
 			}
 
-			$productManager->deleteItem( $product->getId() );
+			$productManager->deleteItem($product->getId());
 
 			$search = $catListManager->createSearch();
-			$search->setConditions( $search->compare( '==', 'catalog.lists.refid', $id ) );
-			$result = $catListManager->searchItems( $search );
+			$search->setConditions($search->compare('==', 'catalog.lists.refid', $id));
+			$result = $catListManager->searchItems($search);
 
-			$catListManager->deleteItems( array_keys( $result ) );
+			$catListManager->deleteItems(array_keys($result));
 		}
 
 
-		$attrManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( $this->context );
+		$attrManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager($this->context);
 
 		$search = $attrManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'attribute.code', 'import-test' ) );
+		$search->setConditions($search->compare('==', 'attribute.code', 'import-test'));
 
-		$result = $attrManager->searchItems( $search );
+		$result = $attrManager->searchItems($search);
 
-		$attrManager->deleteItems( array_keys( $result ) );
+		$attrManager->deleteItems(array_keys($result));
 	}
 
 
-	protected function get( array $prodcodes, array $domains )
+	protected function get(array $prodcodes, array $domains)
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $prodcodes ) );
+		$search->setConditions($search->compare('==', 'product.code', $prodcodes));
 
-		return $productManager->searchItems( $search, $domains );
+		return $productManager->searchItems($search, $domains);
 	}
 
 
-	protected function getProperties( array $prodids )
+	protected function getProperties(array $prodids)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context )->getSubManager( 'property' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context)->getSubManager('property');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.property.parentid', $prodids ) );
-		$search->setSortations( array( $search->sort( '+', 'product.property.type.code' ) ) );
+		$search->setConditions($search->compare('==', 'product.property.parentid', $prodids));
+		$search->setSortations(array($search->sort('+', 'product.property.type.code')));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

controller/jobs/tests/Controller/Jobs/Customer/Email/Watch/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
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$obj = \Aimeos\Controller\Jobs\Customer\Email\Watch\Factory::createController( $context, $aimeos );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj );
+		$obj = \Aimeos\Controller\Jobs\Customer\Email\Watch\Factory::createController($context, $aimeos);
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj);
 	}
 
 
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Customer\Email\Watch\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Customer\Email\Watch\Factory::createController($context, $aimeos, 'Wrong$$$Name');
 	}
 
 
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Customer\Email\Watch\Factory::createController( $context, $aimeos, 'WrongClass' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Customer\Email\Watch\Factory::createController($context, $aimeos, 'WrongClass');
 	}
 
 
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Customer\Email\Watch\Factory::createController( $context, $aimeos, 'Factory' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Customer\Email\Watch\Factory::createController($context, $aimeos, 'Factory');
 	}
 
 }

Please login to merge, or discard this 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\Index\Optimize\Standard( $context, $aimeos );
	27	+ $this->object = new \Aimeos\Controller\Jobs\Index\Optimize\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( 'Catalog index optimization', $this->object->getName() );
	45	+ $this->assertEquals('Catalog index optimization', $this->object->getName());
46	46	}
47	47
48	48
49	49	public function testGetDescription()
50	50	{
51	51	$text = 'Optimizes the catalog index for searching products';
52		- $this->assertEquals( $text, $this->object->getDescription() );
	52	+ $this->assertEquals($text, $this->object->getDescription());
53	53	}
54	54
55	55
		@@ -60,21 +60,21 @@ discard block
		block discarded – undo
60	60
61	61
62	62	$name = 'ControllerJobsCatalogIndexOptimizeDefaultRun';
63		- $context->getConfig()->set( 'mshop/index/manager/name', $name );
	63	+ $context->getConfig()->set('mshop/index/manager/name', $name);
64	64
65	65
66		- $indexManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Index\\Manager\\Standard' )
67		- ->setMethods( array( 'optimize' ) )
68		- ->setConstructorArgs( array( $context ) )
	66	+ $indexManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Index\\Manager\\Standard')
	67	+ ->setMethods(array('optimize'))
	68	+ ->setConstructorArgs(array($context))
69	69	->getMock();
70	70
71		- \Aimeos\MShop\Catalog\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Index\\Manager\\' . $name, $indexManagerStub );
	71	+ \Aimeos\MShop\Catalog\Manager\Factory::injectManager('\\Aimeos\\MShop\\Index\\Manager\\' . $name, $indexManagerStub);
72	72
73	73
74		- $indexManagerStub->expects( $this->once() )->method( 'optimize' );
	74	+ $indexManagerStub->expects($this->once())->method('optimize');
75	75
76	76
77		- $object = new \Aimeos\Controller\Jobs\Index\Optimize\Standard( $context, $aimeos );
	77	+ $object = new \Aimeos\Controller\Jobs\Index\Optimize\Standard($context, $aimeos);
78	78	$object->run();
79	79	}
80	80	}

		@@ -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	}

		@@ -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

		@@ -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	}

		@@ -22,16 +22,16 @@ 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	$config = $this->context->getConfig();
30	30
31		- $config->set( 'controller/jobs/product/import/csv/skip-lines', 1 );
32		- $config->set( 'controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/valid' );
	31	+ $config->set('controller/jobs/product/import/csv/skip-lines', 1);
	32	+ $config->set('controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/valid');
33	33
34		- $this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard( $this->context, $this->aimeos );
	34	+ $this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard($this->context, $this->aimeos);
35	35	}
36	36
37	37
		@@ -43,104 +43,104 @@ discard block
		block discarded – undo
43	43	*/
44	44	protected function tearDown()
45	45	{
46		- \Aimeos\MShop\Factory::setCache( false );
	46	+ \Aimeos\MShop\Factory::setCache(false);
47	47	\Aimeos\MShop\Factory::clear();
48	48
49	49	$this->object = null;
50	50
51		- if( file_exists( 'tmp/import.zip' ) ) {
52		- unlink( 'tmp/import.zip' );
	51	+ if (file_exists('tmp/import.zip')) {
	52	+ unlink('tmp/import.zip');
53	53	}
54	54	}
55	55
56	56
57	57	public function testGetName()
58	58	{
59		- $this->assertEquals( 'Product import CSV', $this->object->getName() );
	59	+ $this->assertEquals('Product import CSV', $this->object->getName());
60	60	}
61	61
62	62
63	63	public function testGetDescription()
64	64	{
65	65	$text = 'Imports new and updates existing products from CSV files';
66		- $this->assertEquals( $text, $this->object->getDescription() );
	66	+ $this->assertEquals($text, $this->object->getDescription());
67	67	}
68	68
69	69
70	70	public function testRun()
71	71	{
72		- $prodcodes = array( 'job_csv_test', 'job_csv_test2' );
73		- $nondelete = array( 'attribute', 'product' );
74		- $delete = array( 'media', 'price', 'text' );
	72	+ $prodcodes = array('job_csv_test', 'job_csv_test2');
	73	+ $nondelete = array('attribute', 'product');
	74	+ $delete = array('media', 'price', 'text');
75	75
76	76	$convert = array(
77	77	1 => 'Text/LatinUTF8',
78	78	);
79	79
80		- $this->context->getConfig()->set( 'controller/jobs/product/import/csv/converter', $convert );
	80	+ $this->context->getConfig()->set('controller/jobs/product/import/csv/converter', $convert);
81	81
82	82	$this->object->run();
83	83
84		- $result = $this->get( $prodcodes, array_merge( $delete, $nondelete ) );
85		- $properties = $this->getProperties( array_keys( $result ) );
86		- $this->delete( $prodcodes, $delete, $nondelete );
	84	+ $result = $this->get($prodcodes, array_merge($delete, $nondelete));
	85	+ $properties = $this->getProperties(array_keys($result));
	86	+ $this->delete($prodcodes, $delete, $nondelete);
87	87
88		- $this->assertEquals( 2, count( $result ) );
89		- $this->assertEquals( 2, count( $properties ) );
	88	+ $this->assertEquals(2, count($result));
	89	+ $this->assertEquals(2, count($properties));
90	90
91		- foreach( $result as $product ) {
92		- $this->assertEquals( 5, count( $product->getListItems() ) );
	91	+ foreach ($result as $product) {
	92	+ $this->assertEquals(5, count($product->getListItems()));
93	93	}
94	94	}
95	95
96	96
97	97	public function testRunUpdate()
98	98	{
99		- $prodcodes = array( 'job_csv_test', 'job_csv_test2' );
100		- $nondelete = array( 'attribute', 'product' );
101		- $delete = array( 'media', 'price', 'text' );
	99	+ $prodcodes = array('job_csv_test', 'job_csv_test2');
	100	+ $nondelete = array('attribute', 'product');
	101	+ $delete = array('media', 'price', 'text');
102	102
103	103	$this->object->run();
104	104	$this->object->run();
105	105
106		- $result = $this->get( $prodcodes, array_merge( $delete, $nondelete ) );
107		- $properties = $this->getProperties( array_keys( $result ) );
108		- $this->delete( $prodcodes, $delete, $nondelete );
	106	+ $result = $this->get($prodcodes, array_merge($delete, $nondelete));
	107	+ $properties = $this->getProperties(array_keys($result));
	108	+ $this->delete($prodcodes, $delete, $nondelete);
109	109
110		- $this->assertEquals( 2, count( $result ) );
111		- $this->assertEquals( 2, count( $properties ) );
	110	+ $this->assertEquals(2, count($result));
	111	+ $this->assertEquals(2, count($properties));
112	112
113		- foreach( $result as $product ) {
114		- $this->assertEquals( 5, count( $product->getListItems() ) );
	113	+ foreach ($result as $product) {
	114	+ $this->assertEquals(5, count($product->getListItems()));
115	115	}
116	116	}
117	117
118	118
119	119	public function testRunPosition()
120	120	{
121		- $prodcodes = array( 'job_csv_test', 'job_csv_test2' );
122		- $nondelete = array( 'attribute', 'product' );
123		- $delete = array( 'media', 'price', 'text' );
	121	+ $prodcodes = array('job_csv_test', 'job_csv_test2');
	122	+ $nondelete = array('attribute', 'product');
	123	+ $delete = array('media', 'price', 'text');
124	124
125	125	$config = $this->context->getConfig();
126		- $mapping = $config->set( 'controller/jobs/product/import/csv/mapping', array() );
127		- $mapping['item'] = array( 0 => 'product.label', 1 => 'product.code' );
	126	+ $mapping = $config->set('controller/jobs/product/import/csv/mapping', array());
	127	+ $mapping['item'] = array(0 => 'product.label', 1 => 'product.code');
128	128
129		- $config->set( 'controller/jobs/product/import/csv/mapping', $mapping );
130		- $config->set( 'controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/position' );
	129	+ $config->set('controller/jobs/product/import/csv/mapping', $mapping);
	130	+ $config->set('controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/position');
131	131
132	132	$this->object->run();
133	133
134		- $result = $this->get( $prodcodes, array_merge( $delete, $nondelete ) );
135		- $this->delete( $prodcodes, $delete, $nondelete );
	134	+ $result = $this->get($prodcodes, array_merge($delete, $nondelete));
	135	+ $this->delete($prodcodes, $delete, $nondelete);
136	136
137		- $this->assertEquals( 2, count( $result ) );
	137	+ $this->assertEquals(2, count($result));
138	138	}
139	139
140	140
141	141	public function testRunProcessorInvalidPosition()
142	142	{
143		- $prodcodes = array( 'job_csv_test', 'job_csv_test2' );
	143	+ $prodcodes = array('job_csv_test', 'job_csv_test2');
144	144
145	145	$mapping = array(
146	146	'item' => array(
		@@ -160,11 +160,11 @@ discard block
		block discarded – undo
160	160	),
161	161	);
162	162
163		- $this->context->getConfig()->set( 'controller/jobs/product/import/csv/mapping', $mapping );
	163	+ $this->context->getConfig()->set('controller/jobs/product/import/csv/mapping', $mapping);
164	164
165	165	$this->object->run();
166	166
167		- $this->delete( $prodcodes, array( 'text', 'media' ), array() );
	167	+ $this->delete($prodcodes, array('text', 'media'), array());
168	168	}
169	169
170	170
		@@ -176,9 +176,9 @@ discard block
		block discarded – undo
176	176	),
177	177	);
178	178
179		- $this->context->getConfig()->set( 'controller/jobs/product/import/csv/mapping', $mapping );
	179	+ $this->context->getConfig()->set('controller/jobs/product/import/csv/mapping', $mapping);
180	180
181		- $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
	181	+ $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
182	182	$this->object->run();
183	183	}
184	184
		@@ -218,15 +218,15 @@ discard block
		block discarded – undo
218	218	),
219	219	);
220	220
221		- $this->context->getConfig()->set( 'controller/jobs/product/import/csv/mapping', $mapping );
	221	+ $this->context->getConfig()->set('controller/jobs/product/import/csv/mapping', $mapping);
222	222
223	223	$config = $this->context->getConfig();
224		- $config->set( 'controller/jobs/product/import/csv/skip-lines', 0 );
225		- $config->set( 'controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/invalid' );
	224	+ $config->set('controller/jobs/product/import/csv/skip-lines', 0);
	225	+ $config->set('controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/invalid');
226	226
227		- $this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard( $this->context, $this->aimeos );
	227	+ $this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard($this->context, $this->aimeos);
228	228
229		- $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
	229	+ $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
230	230	$this->object->run();
231	231	}
232	232
		@@ -234,104 +234,104 @@ discard block
		block discarded – undo
234	234	public function testRunBackup()
235	235	{
236	236	$config = $this->context->getConfig();
237		- $config->set( 'controller/jobs/product/import/csv/container/type', 'Zip' );
238		- $config->set( 'controller/jobs/product/import/csv/location', 'tmp/import.zip' );
239		- $config->set( 'controller/jobs/product/import/csv/backup', 'tmp/test-%Y-%m-%d.zip' );
	237	+ $config->set('controller/jobs/product/import/csv/container/type', 'Zip');
	238	+ $config->set('controller/jobs/product/import/csv/location', 'tmp/import.zip');
	239	+ $config->set('controller/jobs/product/import/csv/backup', 'tmp/test-%Y-%m-%d.zip');
240	240
241		- if( copy( __DIR__ . '/_testfiles/import.zip', 'tmp/import.zip' ) === false ) {
242		- throw new \Exception( 'Unable to copy test file' );
	241	+ if (copy(__DIR__ . '/_testfiles/import.zip', 'tmp/import.zip') === false) {
	242	+ throw new \Exception('Unable to copy test file');
243	243	}
244	244
245	245	$this->object->run();
246	246
247		- $filename = strftime( 'tmp/test-%Y-%m-%d.zip' );
248		- $this->assertTrue( file_exists( $filename ) );
	247	+ $filename = strftime('tmp/test-%Y-%m-%d.zip');
	248	+ $this->assertTrue(file_exists($filename));
249	249
250		- unlink( $filename );
	250	+ unlink($filename);
251	251	}
252	252
253	253
254	254	public function testRunBackupInvalid()
255	255	{
256	256	$config = $this->context->getConfig();
257		- $config->set( 'controller/jobs/product/import/csv/container/type', 'Zip' );
258		- $config->set( 'controller/jobs/product/import/csv/location', 'tmp/import.zip' );
259		- $config->set( 'controller/jobs/product/import/csv/backup', 'tmp/notexist/import.zip' );
	257	+ $config->set('controller/jobs/product/import/csv/container/type', 'Zip');
	258	+ $config->set('controller/jobs/product/import/csv/location', 'tmp/import.zip');
	259	+ $config->set('controller/jobs/product/import/csv/backup', 'tmp/notexist/import.zip');
260	260
261		- if( copy( __DIR__ . '/_testfiles/import.zip', 'tmp/import.zip' ) === false ) {
262		- throw new \Exception( 'Unable to copy test file' );
	261	+ if (copy(__DIR__ . '/_testfiles/import.zip', 'tmp/import.zip') === false) {
	262	+ throw new \Exception('Unable to copy test file');
263	263	}
264	264
265		- $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
	265	+ $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
266	266	$this->object->run();
267	267	}
268	268
269	269
270		- protected function delete( array $prodcodes, array $delete, array $nondelete )
	270	+ protected function delete(array $prodcodes, array $delete, array $nondelete)
271	271	{
272		- $catListManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context )->getSubmanager( 'lists' );
273		- $productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
274		- $listManager = $productManager->getSubManager( 'lists' );
	272	+ $catListManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context)->getSubmanager('lists');
	273	+ $productManager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
	274	+ $listManager = $productManager->getSubManager('lists');
275	275
276		- foreach( $this->get( $prodcodes, $delete + $nondelete ) as $id => $product )
	276	+ foreach ($this->get($prodcodes, $delete + $nondelete) as $id => $product)
277	277	{
278		- foreach( $delete as $domain )
	278	+ foreach ($delete as $domain)
279	279	{
280		- $manager = \Aimeos\MShop\Factory::createManager( $this->context, $domain );
	280	+ $manager = \Aimeos\MShop\Factory::createManager($this->context, $domain);
281	281
282		- foreach( $product->getListItems( $domain ) as $listItem )
	282	+ foreach ($product->getListItems($domain) as $listItem)
283	283	{
284		- $manager->deleteItem( $listItem->getRefItem()->getId() );
285		- $listManager->deleteItem( $listItem->getId() );
	284	+ $manager->deleteItem($listItem->getRefItem()->getId());
	285	+ $listManager->deleteItem($listItem->getId());
286	286	}
287	287	}
288	288
289		- foreach( $nondelete as $domain )
	289	+ foreach ($nondelete as $domain)
290	290	{
291		- $ids = array_keys( $product->getListItems( $domain ) );
292		- $listManager->deleteItems( $ids );
	291	+ $ids = array_keys($product->getListItems($domain));
	292	+ $listManager->deleteItems($ids);
293	293	}
294	294
295		- $productManager->deleteItem( $product->getId() );
	295	+ $productManager->deleteItem($product->getId());
296	296
297	297	$search = $catListManager->createSearch();
298		- $search->setConditions( $search->compare( '==', 'catalog.lists.refid', $id ) );
299		- $result = $catListManager->searchItems( $search );
	298	+ $search->setConditions($search->compare('==', 'catalog.lists.refid', $id));
	299	+ $result = $catListManager->searchItems($search);
300	300
301		- $catListManager->deleteItems( array_keys( $result ) );
	301	+ $catListManager->deleteItems(array_keys($result));
302	302	}
303	303
304	304
305		- $attrManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( $this->context );
	305	+ $attrManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager($this->context);
306	306
307	307	$search = $attrManager->createSearch();
308		- $search->setConditions( $search->compare( '==', 'attribute.code', 'import-test' ) );
	308	+ $search->setConditions($search->compare('==', 'attribute.code', 'import-test'));
309	309
310		- $result = $attrManager->searchItems( $search );
	310	+ $result = $attrManager->searchItems($search);
311	311
312		- $attrManager->deleteItems( array_keys( $result ) );
	312	+ $attrManager->deleteItems(array_keys($result));
313	313	}
314	314
315	315
316		- protected function get( array $prodcodes, array $domains )
	316	+ protected function get(array $prodcodes, array $domains)
317	317	{
318		- $productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
	318	+ $productManager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
319	319
320	320	$search = $productManager->createSearch();
321		- $search->setConditions( $search->compare( '==', 'product.code', $prodcodes ) );
	321	+ $search->setConditions($search->compare('==', 'product.code', $prodcodes));
322	322
323		- return $productManager->searchItems( $search, $domains );
	323	+ return $productManager->searchItems($search, $domains);
324	324	}
325	325
326	326
327		- protected function getProperties( array $prodids )
	327	+ protected function getProperties(array $prodids)
328	328	{
329		- $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context )->getSubManager( 'property' );
	329	+ $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context)->getSubManager('property');
330	330
331	331	$search = $manager->createSearch();
332		- $search->setConditions( $search->compare( '==', 'product.property.parentid', $prodids ) );
333		- $search->setSortations( array( $search->sort( '+', 'product.property.type.code' ) ) );
	332	+ $search->setConditions($search->compare('==', 'product.property.parentid', $prodids));
	333	+ $search->setSortations(array($search->sort('+', 'product.property.type.code')));
334	334
335		- return $manager->searchItems( $search );
	335	+ return $manager->searchItems($search);
336	336	}
337	337	}
338	338	\ No newline at end of file

aimeos / ai-controller-jobs

Push — master ( 96b5a6...c41e60 )

Status

Category

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +94 added lines, -94 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch