aimeos / ai-controller-jobs

controller/common/src/Controller/Common/Product/Import/Csv/Base.php

Doc Comments +1 added lines, -1 removed lines

@@ -242,7 +242,7 @@
 	/**
 	 * Returns the processor object for saving the product related information
 	 *
-	 * @param array $mapping Associative list of processor types as keys and index/data mappings as values
+	 * @param array $mappings Associative list of processor types as keys and index/data mappings as values
 	 * @return \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface Processor object
 	 */
 	protected function getProcessors( array $mappings )

Spacing +56 added lines, -56 removed lines

@@ -30,14 +30,14 @@ 
 	 * @param array $data Associative list of product codes and lists of CSV field indexes and their data
 	 * @return array Associative list of CSV field indexes and their converted data
 	 */
-	protected function convertData( array $convlist, array $data )
+	protected function convertData(array $convlist, array $data)
 	{
-		foreach( $convlist as $idx => $converter )
+		foreach ($convlist as $idx => $converter)
 		{
-			foreach( $data as $code => $list )
+			foreach ($data as $code => $list)
 			{
-				if( isset( $list[$idx] ) ) {
-					$data[$code][$idx] = $converter->translate( $list[$idx] );
+				if (isset($list[$idx])) {
+					$data[$code][$idx] = $converter->translate($list[$idx]);
 				}
 			}
 		}
@@ -53,38 +53,38 @@ 
 	 * @param string|null Name of the cache implementation
 	 * @return \Aimeos\Controller\Common\Product\Import\Csv\Cache\Iface Cache object
 	 */
-	protected function getCache( $type, $name = null )
+	protected function getCache($type, $name = null)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
 		$iface = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface';
 
-		if( ctype_alnum( $type ) === false )
+		if (ctype_alnum($type) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . $type : '<not a string>';
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
-		if( $name === null ) {
-			$name = $config->get( 'controller/common/product/import/csv/cache/' . $type . '/name', 'Standard' );
+		if ($name === null) {
+			$name = $config->get('controller/common/product/import/csv/cache/' . $type . '/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . $type . '\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
-		$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . ucfirst( $type ) . '\\' . $name;
+		$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . ucfirst($type) . '\\' . $name;
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" not found', $classname));
 		}
 
-		$object = new $classname( $context );
+		$object = new $classname($context);
 
-		if( !( $object instanceof $iface ) ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );
+		if (!($object instanceof $iface)) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $iface));
 		}
 
 		return $object;
@@ -97,12 +97,12 @@ 
 	 * @param array $convmap List of converter names for the values at the position in the CSV file
 	 * @return array Associative list of positions and converter objects
 	 */
-	protected function getConverterList( array $convmap )
+	protected function getConverterList(array $convmap)
 	{
 		$convlist = array();
 
-		foreach( $convmap as $idx => $name ) {
-			$convlist[$idx] = \Aimeos\MW\Convert\Factory::createConverter( $name );
+		foreach ($convmap as $idx => $name) {
+			$convlist[$idx] = \Aimeos\MW\Convert\Factory::createConverter($name);
 		}
 
 		return $convlist;
@@ -117,15 +117,15 @@ 
 	 * @param integer $codePos Column position which contains the unique product code (starting from 0)
 	 * @return array List of arrays with product codes as keys and list of values from the CSV file
 	 */
-	protected function getData( \Aimeos\MW\Container\Content\Iface $content, $maxcnt, $codePos )
+	protected function getData(\Aimeos\MW\Container\Content\Iface $content, $maxcnt, $codePos)
 	{
 		$count = 0;
 		$data = array();
 
-		while( $content->valid() && $count++ < $maxcnt )
+		while ($content->valid() && $count++ < $maxcnt)
 		{
 			$row = $content->current();
-			$data[ $row[$codePos] ] = $row;
+			$data[$row[$codePos]] = $row;
 			$content->next();
 		}
 
@@ -222,13 +222,13 @@ 
 	 * @param array $list List of CSV fields with the CSV field position as key
 	 * @return Associative list of domain item keys and the converted values
 	 */
-	protected function getMappedData( array $mapping, array $list )
+	protected function getMappedData(array $mapping, array $list)
 	{
 		$map = array();
 
-		foreach( $mapping as $idx => $key )
+		foreach ($mapping as $idx => $key)
 		{
-			if( !isset( $list[$idx] ) ) {
+			if (!isset($list[$idx])) {
 				break;
 			}
 
@@ -245,39 +245,39 @@ 
 	 * @param array $mapping Associative list of processor types as keys and index/data mappings as values
 	 * @return \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface Processor object
 	 */
-	protected function getProcessors( array $mappings )
+	protected function getProcessors(array $mappings)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
 		$iface = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface';
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $context, array() );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($context, array());
 
-		foreach( $mappings as $type => $mapping )
+		foreach ($mappings as $type => $mapping)
 		{
-			if( ctype_alnum( $type ) === false )
+			if (ctype_alnum($type) === false)
 			{
 				$classname = is_string($type) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . $type : '<not a string>';
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 			}
 
-			$name = $config->get( 'controller/common/product/import/csv/processor/' . $type . '/name', 'Standard' );
+			$name = $config->get('controller/common/product/import/csv/processor/' . $type . '/name', 'Standard');
 
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
 				$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . $type . '\\' . $name : '<not a string>';
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 			}
 
-			$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . ucfirst( $type ) . '\\' . $name;
+			$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . ucfirst($type) . '\\' . $name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" not found', $classname));
 			}
 
-			$object = new $classname( $context, $mapping, $object );
+			$object = new $classname($context, $mapping, $object);
 
-			if( !( $object instanceof $iface ) ) {
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );
+			if (!($object instanceof $iface)) {
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $iface));
 			}
 		}
 
@@ -292,17 +292,17 @@ 
 	 * @param array $domains List of domains whose items should be fetched too
 	 * @return array Associative list of product codes as key and product items as value
 	 */
-	protected function getProducts( array $codes, array $domains )
+	protected function getProducts(array $codes, array $domains)
 	{
 		$result = array();
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $codes ) );
-		$search->setSlice( 0, count( $codes ) );
+		$search->setConditions($search->compare('==', 'product.code', $codes));
+		$search->setSlice(0, count($codes));
 
-		foreach( $manager->searchItems( $search, $domains ) as $item ) {
-			$result[ $item->getCode() ] = $item;
+		foreach ($manager->searchItems($search, $domains) as $item) {
+			$result[$item->getCode()] = $item;
 		}
 
 		return $result;
@@ -317,23 +317,23 @@ 
 	 * @param string $code Unique code of the type item
 	 * @return string Unique ID of the type item
 	 */
-	protected function getTypeId( $path, $domain, $code )
+	protected function getTypeId($path, $domain, $code)
 	{
-		if( !isset( self::$types[$path][$domain] ) )
+		if (!isset(self::$types[$path][$domain]))
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $path );
-			$key = str_replace( '/', '.', $path );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $path);
+			$key = str_replace('/', '.', $path);
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', $key . '.domain', $domain ) );
+			$search->setConditions($search->compare('==', $key . '.domain', $domain));
 
-			foreach( $manager->searchItems( $search ) as $id => $item ) {
-				self::$types[$path][$domain][ $item->getCode() ] = $id;
+			foreach ($manager->searchItems($search) as $id => $item) {
+				self::$types[$path][$domain][$item->getCode()] = $id;
 			}
 		}
 
-		if( !isset( self::$types[$path][$domain][$code] ) ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No type item for "%1$s/%2$s" in "%3$s" found', $domain, $code, $path ) );
+		if (!isset(self::$types[$path][$domain][$code])) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('No type item for "%1$s/%2$s" in "%3$s" found', $domain, $code, $path));
 		}
 
 		return self::$types[$path][$domain][$code];

controller/common/tests/Controller/Common/Product/Import/Csv/Processor/Attribute/StandardTest.php

Doc Comments +6 added lines

@@ -304,6 +304,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function create( $code )
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
@@ -340,6 +343,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function get( $code )
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );

Spacing +99 added lines, -99 removed lines

@@ -15,16 +15,16 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, array() );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, array());
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -55,32 +55,32 @@ 
 			8 => 'variant',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$pos = 0;
 		$listItems = $product->getListItems();
 		$expected = array(
-			array( 'variant', 'length', '30' ),
-			array( 'variant', 'width', '29' ),
-			array( 'variant', 'color', 'white' ),
+			array('variant', 'length', '30'),
+			array('variant', 'width', '29'),
+			array('variant', 'color', 'white'),
 		);
 
-		$this->assertEquals( 3, count( $listItems ) );
+		$this->assertEquals(3, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( 1, $listItem->getStatus() );
-			$this->assertEquals( 'attribute', $listItem->getDomain() );
-			$this->assertEquals( $expected[$pos][0], $listItem->getType() );
-			$this->assertEquals( $expected[$pos][1], $listItem->getRefItem()->getType() );
-			$this->assertEquals( $expected[$pos][2], $listItem->getRefItem()->getCode() );
+			$this->assertEquals(1, $listItem->getStatus());
+			$this->assertEquals('attribute', $listItem->getDomain());
+			$this->assertEquals($expected[$pos][0], $listItem->getType());
+			$this->assertEquals($expected[$pos][1], $listItem->getRefItem()->getType());
+			$this->assertEquals($expected[$pos][2], $listItem->getRefItem()->getCode());
 			$pos++;
 		}
 	}
@@ -100,29 +100,29 @@ 
 			2 => 'variant',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$this->delete( $product );
+		$this->delete($product);
 
 
 		$pos = 0;
-		$codes = array( 'white', 'black', 'aimeos' );
+		$codes = array('white', 'black', 'aimeos');
 
-		foreach( $product->getListItems() as $listItems )
+		foreach ($product->getListItems() as $listItems)
 		{
-			$this->assertEquals( 3, count( $listItems ) );
+			$this->assertEquals(3, count($listItems));
 
-			foreach( $listItems as $listItem )
+			foreach ($listItems as $listItem)
 			{
-				$this->assertEquals( 1, $listItem->getStatus() );
-				$this->assertEquals( 'attribute', $listItem->getDomain() );
-				$this->assertEquals( 'variant', $listItem->getType() );
-				$this->assertEquals( $codes[$pos], $listItem->getRefItem()->getCode() );
+				$this->assertEquals(1, $listItem->getStatus());
+				$this->assertEquals('attribute', $listItem->getDomain());
+				$this->assertEquals('variant', $listItem->getType());
+				$this->assertEquals($codes[$pos], $listItem->getRefItem()->getCode());
 				$pos++;
 			}
 		}
@@ -146,27 +146,27 @@ 
 			1 => '29',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$result = $object->process( $product, $dataUpdate );
+		$result = $object->process($product, $dataUpdate);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'width', $listItem->getRefItem()->getType() );
-		$this->assertEquals( '29', $listItem->getRefItem()->getCode() );
+		$this->assertEquals('width', $listItem->getRefItem()->getType());
+		$this->assertEquals('29', $listItem->getRefItem()->getCode());
 	}
 
 
@@ -182,23 +182,23 @@ 
 			1 => '30',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, array(), $this->endpoint );
-		$result = $object->process( $product, array() );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, array(), $this->endpoint);
+		$result = $object->process($product, array());
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -218,18 +218,18 @@ 
 			3 => '30',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -245,19 +245,19 @@ 
 			1 => '30',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint);
 
 		try {
-			$result = $object->process( $product, $data );
-		} catch( \Exception $e ) {
-			$this->delete( $product );
+			$result = $object->process($product, $data);
+		} catch (\Exception $e) {
+			$this->delete($product);
 			return;
 		}
 
-		$this->delete( $product );
-		$this->markTestFail( 'No exception thrown' );
+		$this->delete($product);
+		$this->markTestFail('No exception thrown');
 	}
 
 
@@ -281,76 +281,76 @@ 
 			5 => 'default',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/product/import/csv/processor/attribute/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/product/import/csv/processor/attribute/listtypes', array('default'));
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'default', $listItem->getType() );
-		$this->assertEquals( 'width', $listItem->getRefItem()->getType() );
-		$this->assertEquals( '30', $listItem->getRefItem()->getCode() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('width', $listItem->getRefItem()->getType());
+		$this->assertEquals('30', $listItem->getRefItem()->getCode());
 	}
 
 
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$typeManager = $manager->getSubManager( 'type' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$typeManager = $manager->getSubManager('type');
 
 		$typeSearch = $typeManager->createSearch();
-		$typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) );
-		$typeResult = $typeManager->searchItems( $typeSearch );
+		$typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default'));
+		$typeResult = $typeManager->searchItems($typeSearch);
 
-		if( ( $typeItem = reset( $typeResult ) ) === false ) {
-			throw new \Exception( 'No product type "default" found' );
+		if (($typeItem = reset($typeResult)) === false) {
+			throw new \Exception('No product type "default" found');
 		}
 
 		$item = $manager->createItem();
-		$item->setTypeid( $typeItem->getId() );
-		$item->setCode( $code );
+		$item->setTypeid($typeItem->getId());
+		$item->setCode($code);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		return $item;
 	}
 
 
-	protected function delete( \Aimeos\MShop\Product\Item\Iface $product )
+	protected function delete(\Aimeos\MShop\Product\Item\Iface $product)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$listManager = $manager->getSubManager( 'lists' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( $product->getListItems('attribute') as $listItem ) {
-			$listManager->deleteItem( $listItem->getId() );
+		foreach ($product->getListItems('attribute') as $listItem) {
+			$listManager->deleteItem($listItem->getId());
 		}
 
-		$manager->deleteItem( $product->getId() );
+		$manager->deleteItem($product->getId());
 	}
 
 
-	protected function get( $code )
+	protected function get($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $code ) );
+		$search->setConditions($search->compare('==', 'product.code', $code));
 
-		$result = $manager->searchItems( $search, array('attribute') );
+		$result = $manager->searchItems($search, array('attribute'));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Exception( sprintf( 'No product item for code "%1$s"', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Exception(sprintf('No product item for code "%1$s"', $code));
 		}
 
 		return $item;

controller/common/tests/Controller/Common/Product/Import/Csv/Processor/Catalog/StandardTest.php

Doc Comments +6 added lines

@@ -290,6 +290,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function create( $code )
 	{
 		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
@@ -316,6 +319,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function get( $code )
 	{
 		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );

Spacing +95 added lines, -95 removed lines

@@ -16,23 +16,23 @@ 
 
 	public static function setUpBeforeClass()
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperCntl::getContext() );
-		$typeManager = $manager->getSubmanager( 'type' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperCntl::getContext());
+		$typeManager = $manager->getSubmanager('type');
 
 		$typeSearch = $typeManager->createSearch();
-		$typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) );
-		$result = $typeManager->searchItems( $typeSearch );
+		$typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default'));
+		$result = $typeManager->searchItems($typeSearch);
 
-		if( ( $typeItem = reset( $result ) ) === false ) {
-			throw new \Exception( 'Product type "default" not found' );
+		if (($typeItem = reset($result)) === false) {
+			throw new \Exception('Product type "default" not found');
 		}
 
 		$item = $manager->createItem();
-		$item->setCode( 'job_csv_prod' );
-		$item->setTypeId( $typeItem->getId() );
-		$item->setStatus( 1 );
+		$item->setCode('job_csv_prod');
+		$item->setTypeId($typeItem->getId());
+		$item->setStatus(1);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		self::$product = $item;
 	}
@@ -40,23 +40,23 @@ 
 
 	public static function tearDownAfterClass()
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperCntl::getContext() );
-		$manager->deleteItem( self::$product->getId() );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperCntl::getContext());
+		$manager->deleteItem(self::$product->getId());
 	}
 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, array() );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, array());
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -77,30 +77,30 @@ 
 			3 => 'job_csv_test',
 		);
 
-		$category = $this->create( 'job_csv_test' );
+		$category = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( self::$product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process(self::$product, $data);
 
-		$category = $this->get( 'job_csv_test' );
-		$this->delete( $category );
+		$category = $this->get('job_csv_test');
+		$this->delete($category);
 
 
 		$pos = 0;
 		$listItems = $category->getListItems();
 		$expected = array(
-			array( 'default', 'job_csv_prod' ),
-			array( 'promotion', 'job_csv_prod' ),
+			array('default', 'job_csv_prod'),
+			array('promotion', 'job_csv_prod'),
 		);
 
-		$this->assertEquals( 2, count( $listItems ) );
+		$this->assertEquals(2, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( 1, $listItem->getStatus() );
-			$this->assertEquals( 'product', $listItem->getDomain() );
-			$this->assertEquals( $expected[$pos][0], $listItem->getType() );
-			$this->assertEquals( $expected[$pos][1], $listItem->getRefItem()->getCode() );
+			$this->assertEquals(1, $listItem->getStatus());
+			$this->assertEquals('product', $listItem->getDomain());
+			$this->assertEquals($expected[$pos][0], $listItem->getType());
+			$this->assertEquals($expected[$pos][1], $listItem->getRefItem()->getCode());
 			$pos++;
 		}
 	}
@@ -122,32 +122,32 @@ 
 			3 => "job_csv_test\njob_csv_test2",
 		);
 
-		$category = $this->create( 'job_csv_test' );
-		$category2 = $this->create( 'job_csv_test2' );
+		$category = $this->create('job_csv_test');
+		$category2 = $this->create('job_csv_test2');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( self::$product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process(self::$product, $data);
 
-		$category = $this->get( 'job_csv_test' );
-		$category2 = $this->get( 'job_csv_test2' );
+		$category = $this->get('job_csv_test');
+		$category2 = $this->get('job_csv_test2');
 
-		$this->delete( $category );
-		$this->delete( $category2 );
+		$this->delete($category);
+		$this->delete($category2);
 
 
 		$pos = 0;
-		$types = array( 'default', 'promotion', 'default', 'promotion' );
+		$types = array('default', 'promotion', 'default', 'promotion');
 
-		foreach( array( $category->getListItems(), $category2->getListItems() ) as $listItems )
+		foreach (array($category->getListItems(), $category2->getListItems()) as $listItems)
 		{
-			$this->assertEquals( 2, count( $listItems ) );
+			$this->assertEquals(2, count($listItems));
 
-			foreach( $listItems as $listItem )
+			foreach ($listItems as $listItem)
 			{
-				$this->assertEquals( 1, $listItem->getStatus() );
-				$this->assertEquals( 'product', $listItem->getDomain() );
-				$this->assertEquals( $types[$pos], $listItem->getType() );
-				$this->assertEquals( 'job_csv_prod', $listItem->getRefItem()->getCode() );
+				$this->assertEquals(1, $listItem->getStatus());
+				$this->assertEquals('product', $listItem->getDomain());
+				$this->assertEquals($types[$pos], $listItem->getType());
+				$this->assertEquals('job_csv_prod', $listItem->getRefItem()->getCode());
 				$pos++;
 			}
 		}
@@ -171,23 +171,23 @@ 
 			1 => 'job_csv_test',
 		);
 
-		$category = $this->create( 'job_csv_test' );
+		$category = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( self::$product, $data );
-		$result = $object->process( self::$product, $dataUpdate );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process(self::$product, $data);
+		$result = $object->process(self::$product, $dataUpdate);
 
-		$category = $this->get( 'job_csv_test' );
-		$this->delete( $category );
+		$category = $this->get('job_csv_test');
+		$this->delete($category);
 
 
 		$listItems = $category->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'job_csv_prod', $listItem->getRefItem()->getCode() );
+		$this->assertEquals('job_csv_prod', $listItem->getRefItem()->getCode());
 	}
 
 
@@ -203,21 +203,21 @@ 
 			1 => 'job_csv_test',
 		);
 
-		$category = $this->create( 'job_csv_test' );
+		$category = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( self::$product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process(self::$product, $data);
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, array(), $this->endpoint );
-		$result = $object->process( self::$product, array() );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, array(), $this->endpoint);
+		$result = $object->process(self::$product, array());
 
-		$category = $this->get( 'job_csv_test' );
-		$this->delete( $category );
+		$category = $this->get('job_csv_test');
+		$this->delete($category);
 
 
 		$listItems = $category->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -237,18 +237,18 @@ 
 			3 => 'job_csv_test',
 		);
 
-		$category = $this->create( 'job_csv_test' );
+		$category = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( self::$product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process(self::$product, $data);
 
-		$category = $this->get( 'job_csv_test' );
-		$this->delete( $category );
+		$category = $this->get('job_csv_test');
+		$this->delete($category);
 
 
 		$listItems = $category->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -268,65 +268,65 @@ 
 			3 => 'job_csv_test',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/product/import/csv/processor/catalog/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/product/import/csv/processor/catalog/listtypes', array('default'));
 
-		$category = $this->create( 'job_csv_test' );
+		$category = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( self::$product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process(self::$product, $data);
 
-		$category = $this->get( 'job_csv_test' );
-		$this->delete( $category );
+		$category = $this->get('job_csv_test');
+		$this->delete($category);
 
 
 		$listItems = $category->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'default', $listItem->getType() );
-		$this->assertEquals( 'job_csv_prod', $listItem->getRefItem()->getCode() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('job_csv_prod', $listItem->getRefItem()->getCode());
 	}
 
 
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
 
 		$item = $manager->createItem();
-		$item->setCode( $code );
+		$item->setCode($code);
 
-		$manager->insertItem( $item );
+		$manager->insertItem($item);
 
 		return $item;
 	}
 
 
-	protected function delete( \Aimeos\MShop\Catalog\Item\Iface $catItem )
+	protected function delete(\Aimeos\MShop\Catalog\Item\Iface $catItem)
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
-		$listManager = $manager->getSubManager( 'lists' );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( $catItem->getListItems('product') as $listItem ) {
-			$listManager->deleteItem( $listItem->getId() );
+		foreach ($catItem->getListItems('product') as $listItem) {
+			$listManager->deleteItem($listItem->getId());
 		}
 
-		$manager->deleteItem( $catItem->getId() );
+		$manager->deleteItem($catItem->getId());
 	}
 
 
-	protected function get( $code )
+	protected function get($code)
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'catalog.code', $code ) );
+		$search->setConditions($search->compare('==', 'catalog.code', $code));
 
-		$result = $manager->searchItems( $search, array('product') );
+		$result = $manager->searchItems($search, array('product'));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Exception( sprintf( 'No catalog item for code "%1$s"', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Exception(sprintf('No catalog item for code "%1$s"', $code));
 		}
 
 		return $item;

controller/common/tests/Controller/Common/Product/Import/Csv/Processor/Media/StandardTest.php

Doc Comments +6 added lines

@@ -301,6 +301,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function create( $code )
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
@@ -340,6 +343,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function get( $code )
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );

Spacing +102 added lines, -102 removed lines

@@ -21,10 +21,10 @@ 
 	 */
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, array() );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, array());
 	}
 
 
@@ -36,7 +36,7 @@ 
 	 */
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -61,36 +61,36 @@ 
 			5 => 1,
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
+		$this->assertEquals(1, count($listItems));
 
-		$this->assertEquals( 1, $listItem->getStatus() );
-		$this->assertEquals( 0, $listItem->getPosition() );
-		$this->assertEquals( 'media', $listItem->getDomain() );
-		$this->assertEquals( 'default', $listItem->getType() );
+		$this->assertEquals(1, $listItem->getStatus());
+		$this->assertEquals(0, $listItem->getPosition());
+		$this->assertEquals('media', $listItem->getDomain());
+		$this->assertEquals('default', $listItem->getType());
 
 		$refItem = $listItem->getRefItem();
 
-		$this->assertEquals( 1, $refItem->getStatus() );
-		$this->assertEquals( 'default', $refItem->getType() );
-		$this->assertEquals( 'product', $refItem->getDomain() );
-		$this->assertEquals( 'test image', $refItem->getLabel() );
-		$this->assertEquals( 'image/jpeg', $refItem->getMimetype() );
-		$this->assertEquals( 'path/to/preview', $refItem->getPreview() );
-		$this->assertEquals( 'path/to/file', $refItem->getUrl() );
-		$this->assertEquals( 'de', $refItem->getLanguageId() );
+		$this->assertEquals(1, $refItem->getStatus());
+		$this->assertEquals('default', $refItem->getType());
+		$this->assertEquals('product', $refItem->getDomain());
+		$this->assertEquals('test image', $refItem->getLabel());
+		$this->assertEquals('image/jpeg', $refItem->getMimetype());
+		$this->assertEquals('path/to/preview', $refItem->getPreview());
+		$this->assertEquals('path/to/file', $refItem->getUrl());
+		$this->assertEquals('de', $refItem->getLanguageId());
 	}
 
 
@@ -104,24 +104,24 @@ 
 			0 => "path/to/0\npath/to/1\npath/to/2\npath/to/3",
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$pos = 0;
 		$listItems = $product->getListItems();
-		$expected = array( 'path/to/0', 'path/to/1', 'path/to/2', 'path/to/3' );
+		$expected = array('path/to/0', 'path/to/1', 'path/to/2', 'path/to/3');
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $expected[$pos], $listItem->getRefItem()->getUrl() );
+			$this->assertEquals($expected[$pos], $listItem->getRefItem()->getUrl());
 			$pos++;
 		}
 	}
@@ -143,23 +143,23 @@ 
 			3 => 'path/to/3',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$pos = 0;
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $data[$pos], $listItem->getRefItem()->getUrl() );
+			$this->assertEquals($data[$pos], $listItem->getRefItem()->getUrl());
 			$pos++;
 		}
 	}
@@ -182,27 +182,27 @@ 
 			1 => '',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$result = $object->process( $product, $dataUpdate );
+		$result = $object->process($product, $dataUpdate);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'path/to/new', $listItem->getRefItem()->getUrl() );
-		$this->assertEquals( null, $listItem->getRefItem()->getLanguageId() );
+		$this->assertEquals('path/to/new', $listItem->getRefItem()->getUrl());
+		$this->assertEquals(null, $listItem->getRefItem()->getLanguageId());
 	}
 
 
@@ -216,23 +216,23 @@ 
 			0 => '/path/to/file',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, array(), $this->endpoint );
-		$result = $object->process( $product, array() );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, array(), $this->endpoint);
+		$result = $object->process($product, array());
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -248,18 +248,18 @@ 
 			1 => '',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -279,78 +279,78 @@ 
 			3 => 'default',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/product/import/csv/processor/media/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/product/import/csv/processor/media/listtypes', array('default'));
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'default', $listItem->getType() );
-		$this->assertEquals( 'path/to/file2', $listItem->getRefItem()->getUrl() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('path/to/file2', $listItem->getRefItem()->getUrl());
 	}
 
 
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$typeManager = $manager->getSubManager( 'type' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$typeManager = $manager->getSubManager('type');
 
 		$typeSearch = $typeManager->createSearch();
-		$typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) );
-		$typeResult = $typeManager->searchItems( $typeSearch );
+		$typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default'));
+		$typeResult = $typeManager->searchItems($typeSearch);
 
-		if( ( $typeItem = reset( $typeResult ) ) === false ) {
-			throw new \Exception( 'No product type "default" found' );
+		if (($typeItem = reset($typeResult)) === false) {
+			throw new \Exception('No product type "default" found');
 		}
 
 		$item = $manager->createItem();
-		$item->setTypeid( $typeItem->getId() );
-		$item->setCode( $code );
+		$item->setTypeid($typeItem->getId());
+		$item->setCode($code);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		return $item;
 	}
 
 
-	protected function delete( \Aimeos\MShop\Product\Item\Iface $product )
+	protected function delete(\Aimeos\MShop\Product\Item\Iface $product)
 	{
-		$mediaManager = \Aimeos\MShop\Media\Manager\Factory::createManager( $this->context );
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$listManager = $manager->getSubManager( 'lists' );
+		$mediaManager = \Aimeos\MShop\Media\Manager\Factory::createManager($this->context);
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( $product->getListItems('media') as $listItem )
+		foreach ($product->getListItems('media') as $listItem)
 		{
-			$mediaManager->deleteItem( $listItem->getRefItem()->getId() );
-			$listManager->deleteItem( $listItem->getId() );
+			$mediaManager->deleteItem($listItem->getRefItem()->getId());
+			$listManager->deleteItem($listItem->getId());
 		}
 
-		$manager->deleteItem( $product->getId() );
+		$manager->deleteItem($product->getId());
 	}
 
 
-	protected function get( $code )
+	protected function get($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $code ) );
+		$search->setConditions($search->compare('==', 'product.code', $code));
 
-		$result = $manager->searchItems( $search, array('media') );
+		$result = $manager->searchItems($search, array('media'));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Exception( sprintf( 'No product item for code "%1$s"', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Exception(sprintf('No product item for code "%1$s"', $code));
 		}
 
 		return $item;

controller/common/tests/Controller/Common/Product/Import/Csv/Processor/Price/StandardTest.php

Doc Comments +6 added lines

@@ -272,6 +272,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function create( $code )
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
@@ -311,6 +314,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function get( $code )
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );

Spacing +94 added lines, -94 removed lines

@@ -21,10 +21,10 @@ 
 	 */
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, array() );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, array());
 	}
 
 
@@ -36,7 +36,7 @@ 
 	 */
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -67,38 +67,38 @@ 
 			8 => 1,
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
+		$this->assertEquals(1, count($listItems));
 
-		$this->assertEquals( 1, $listItem->getStatus() );
-		$this->assertEquals( 0, $listItem->getPosition() );
-		$this->assertEquals( 'price', $listItem->getDomain() );
-		$this->assertEquals( 'default', $listItem->getType() );
+		$this->assertEquals(1, $listItem->getStatus());
+		$this->assertEquals(0, $listItem->getPosition());
+		$this->assertEquals('price', $listItem->getDomain());
+		$this->assertEquals('default', $listItem->getType());
 
 		$refItem = $listItem->getRefItem();
 
-		$this->assertEquals( 1, $refItem->getStatus() );
-		$this->assertEquals( 'default', $refItem->getType() );
-		$this->assertEquals( 'product', $refItem->getDomain() );
-		$this->assertEquals( 'EUR 1.00', $refItem->getLabel() );
-		$this->assertEquals( 5, $refItem->getQuantity() );
-		$this->assertEquals( '1.00', $refItem->getValue() );
-		$this->assertEquals( '0.20', $refItem->getCosts() );
-		$this->assertEquals( '0.10', $refItem->getRebate() );
-		$this->assertEquals( '20.00', $refItem->getTaxrate() );
-		$this->assertEquals( 1, $refItem->getStatus() );
+		$this->assertEquals(1, $refItem->getStatus());
+		$this->assertEquals('default', $refItem->getType());
+		$this->assertEquals('product', $refItem->getDomain());
+		$this->assertEquals('EUR 1.00', $refItem->getLabel());
+		$this->assertEquals(5, $refItem->getQuantity());
+		$this->assertEquals('1.00', $refItem->getValue());
+		$this->assertEquals('0.20', $refItem->getCosts());
+		$this->assertEquals('0.10', $refItem->getRebate());
+		$this->assertEquals('20.00', $refItem->getTaxrate());
+		$this->assertEquals(1, $refItem->getStatus());
 	}
 
 
@@ -118,23 +118,23 @@ 
 			3 => '4.00',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$pos = 0;
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $data[$pos], $listItem->getRefItem()->getValue() );
+			$this->assertEquals($data[$pos], $listItem->getRefItem()->getValue());
 			$pos++;
 		}
 	}
@@ -154,26 +154,26 @@ 
 			0 => '2.00',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$result = $object->process( $product, $dataUpdate );
+		$result = $object->process($product, $dataUpdate);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( '2.00', $listItem->getRefItem()->getValue() );
+		$this->assertEquals('2.00', $listItem->getRefItem()->getValue());
 	}
 
 
@@ -187,23 +187,23 @@ 
 			0 => '1.00',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard( $this->context, array(), $this->endpoint );
-		$result = $object->process( $product, array() );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard($this->context, array(), $this->endpoint);
+		$result = $object->process($product, array());
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -219,18 +219,18 @@ 
 			1 => '',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -250,78 +250,78 @@ 
 			3 => 'default',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/product/import/csv/processor/price/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/product/import/csv/processor/price/listtypes', array('default'));
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'default', $listItem->getType() );
-		$this->assertEquals( '2.00', $listItem->getRefItem()->getValue() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('2.00', $listItem->getRefItem()->getValue());
 	}
 
 
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$typeManager = $manager->getSubManager( 'type' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$typeManager = $manager->getSubManager('type');
 
 		$typeSearch = $typeManager->createSearch();
-		$typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) );
-		$typeResult = $typeManager->searchItems( $typeSearch );
+		$typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default'));
+		$typeResult = $typeManager->searchItems($typeSearch);
 
-		if( ( $typeItem = reset( $typeResult ) ) === false ) {
-			throw new \Exception( 'No product type "default" found' );
+		if (($typeItem = reset($typeResult)) === false) {
+			throw new \Exception('No product type "default" found');
 		}
 
 		$item = $manager->createItem();
-		$item->setTypeid( $typeItem->getId() );
-		$item->setCode( $code );
+		$item->setTypeid($typeItem->getId());
+		$item->setCode($code);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		return $item;
 	}
 
 
-	protected function delete( \Aimeos\MShop\Product\Item\Iface $product )
+	protected function delete(\Aimeos\MShop\Product\Item\Iface $product)
 	{
-		$priceManager = \Aimeos\MShop\Price\Manager\Factory::createManager( $this->context );
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$listManager = $manager->getSubManager( 'lists' );
+		$priceManager = \Aimeos\MShop\Price\Manager\Factory::createManager($this->context);
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( $product->getListItems('price') as $listItem )
+		foreach ($product->getListItems('price') as $listItem)
 		{
-			$priceManager->deleteItem( $listItem->getRefItem()->getId() );
-			$listManager->deleteItem( $listItem->getId() );
+			$priceManager->deleteItem($listItem->getRefItem()->getId());
+			$listManager->deleteItem($listItem->getId());
 		}
 
-		$manager->deleteItem( $product->getId() );
+		$manager->deleteItem($product->getId());
 	}
 
 
-	protected function get( $code )
+	protected function get($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $code ) );
+		$search->setConditions($search->compare('==', 'product.code', $code));
 
-		$result = $manager->searchItems( $search, array('price') );
+		$result = $manager->searchItems($search, array('price'));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Exception( sprintf( 'No product item for code "%1$s"', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Exception(sprintf('No product item for code "%1$s"', $code));
 		}
 
 		return $item;

controller/common/tests/Controller/Common/Product/Import/Csv/Processor/Product/StandardTest.php

Doc Comments +6 added lines

@@ -245,6 +245,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function create( $code )
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
@@ -281,6 +284,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function get( $code )
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );

Spacing +87 added lines, -87 removed lines

@@ -15,16 +15,16 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, array() );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, array());
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -45,26 +45,26 @@ 
 			3 => 'CNE',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
-		$listItems1 = $product->getListItems( 'product', 'default' );
-		$listItems2 = $product->getListItems( 'product', 'suggestion' );
+		$listItems1 = $product->getListItems('product', 'default');
+		$listItems2 = $product->getListItems('product', 'suggestion');
 
-		$this->assertEquals( 1, count( $listItems1 ) );
-		$this->assertEquals( 1, count( $listItems2 ) );
+		$this->assertEquals(1, count($listItems1));
+		$this->assertEquals(1, count($listItems2));
 
-		$this->assertEquals( 1, reset( $listItems1 )->getStatus() );
-		$this->assertEquals( 1, reset( $listItems2 )->getStatus() );
+		$this->assertEquals(1, reset($listItems1)->getStatus());
+		$this->assertEquals(1, reset($listItems2)->getStatus());
 
-		$this->assertEquals( 'CNC', reset( $listItems1 )->getRefItem()->getCode() );
-		$this->assertEquals( 'CNE', reset( $listItems2 )->getRefItem()->getCode() );
+		$this->assertEquals('CNC', reset($listItems1)->getRefItem()->getCode());
+		$this->assertEquals('CNE', reset($listItems2)->getRefItem()->getCode());
 	}
 
 
@@ -80,27 +80,27 @@ 
 			1 => "CNC\nCNE",
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$pos = 0;
-		$codes = array( 'CNC', 'CNE' );
+		$codes = array('CNC', 'CNE');
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 2, count( $listItems ) );
+		$this->assertEquals(2, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( 1, $listItem->getStatus() );
-			$this->assertEquals( 'product', $listItem->getDomain() );
-			$this->assertEquals( 'default', $listItem->getType() );
-			$this->assertEquals( $codes[$pos], $listItem->getRefItem()->getCode() );
+			$this->assertEquals(1, $listItem->getStatus());
+			$this->assertEquals('product', $listItem->getDomain());
+			$this->assertEquals('default', $listItem->getType());
+			$this->assertEquals($codes[$pos], $listItem->getRefItem()->getCode());
 			$pos++;
 		}
 	}
@@ -123,26 +123,26 @@ 
 			1 => 'CNE',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$result = $object->process( $product, $dataUpdate );
+		$result = $object->process($product, $dataUpdate);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'CNE', $listItem->getRefItem()->getCode() );
+		$this->assertEquals('CNE', $listItem->getRefItem()->getCode());
 	}
 
 
@@ -158,21 +158,21 @@ 
 			1 => 'CNC',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard( $this->context, array(), $this->endpoint );
-		$result = $object->process( $product, array() );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard($this->context, array(), $this->endpoint);
+		$result = $object->process($product, array());
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
-		$this->assertEquals( 0, count( $product->getListItems() ) );
+		$this->assertEquals(0, count($product->getListItems()));
 	}
 
 
@@ -192,18 +192,18 @@ 
 			3 => 'CNE',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -223,75 +223,75 @@ 
 			3 => 'CNE',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/product/import/csv/processor/product/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/product/import/csv/processor/product/listtypes', array('default'));
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'default', $listItem->getType() );
-		$this->assertEquals( 'CNE', $listItem->getRefItem()->getCode() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('CNE', $listItem->getRefItem()->getCode());
 	}
 
 
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$typeManager = $manager->getSubManager( 'type' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$typeManager = $manager->getSubManager('type');
 
 		$typeSearch = $typeManager->createSearch();
-		$typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) );
-		$typeResult = $typeManager->searchItems( $typeSearch );
+		$typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default'));
+		$typeResult = $typeManager->searchItems($typeSearch);
 
-		if( ( $typeItem = reset( $typeResult ) ) === false ) {
-			throw new \Exception( 'No product type "default" found' );
+		if (($typeItem = reset($typeResult)) === false) {
+			throw new \Exception('No product type "default" found');
 		}
 
 		$item = $manager->createItem();
-		$item->setTypeid( $typeItem->getId() );
-		$item->setCode( $code );
+		$item->setTypeid($typeItem->getId());
+		$item->setCode($code);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		return $item;
 	}
 
 
-	protected function delete( \Aimeos\MShop\Product\Item\Iface $product )
+	protected function delete(\Aimeos\MShop\Product\Item\Iface $product)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$listManager = $manager->getSubManager( 'lists' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( $product->getListItems('product') as $listItem ) {
-			$listManager->deleteItem( $listItem->getId() );
+		foreach ($product->getListItems('product') as $listItem) {
+			$listManager->deleteItem($listItem->getId());
 		}
 
-		$manager->deleteItem( $product->getId() );
+		$manager->deleteItem($product->getId());
 	}
 
 
-	protected function get( $code )
+	protected function get($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $code ) );
+		$search->setConditions($search->compare('==', 'product.code', $code));
 
-		$result = $manager->searchItems( $search, array('product') );
+		$result = $manager->searchItems($search, array('product'));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Exception( sprintf( 'No product item for code "%1$s"', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Exception(sprintf('No product item for code "%1$s"', $code));
 		}
 
 		return $item;

controller/common/tests/Controller/Common/Product/Import/Csv/Processor/Property/StandardTest.php

Doc Comments +6 added lines

@@ -177,6 +177,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function create( $code )
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
@@ -213,6 +216,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function get( $code )
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );

Spacing +73 added lines, -73 removed lines

@@ -15,16 +15,16 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, array() );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, array());
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -47,29 +47,29 @@ 
 			4 => '50',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$items = $this->getProperties( $product->getId() );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$items = $this->getProperties($product->getId());
+		$this->delete($product);
 
 
 		$pos = 0;
 		$expected = array(
-			array( 'package-weight', '3.00', 'de' ),
-			array( 'package-width', '50', null ),
+			array('package-weight', '3.00', 'de'),
+			array('package-width', '50', null),
 		);
 
-		$this->assertEquals( 2, count( $items ) );
+		$this->assertEquals(2, count($items));
 
-		foreach( $items as $item )
+		foreach ($items as $item)
 		{
-			$this->assertEquals( $expected[$pos][0], $item->getType() );
-			$this->assertEquals( $expected[$pos][1], $item->getValue() );
-			$this->assertEquals( $expected[$pos][2], $item->getLanguageId() );
+			$this->assertEquals($expected[$pos][0], $item->getType());
+			$this->assertEquals($expected[$pos][1], $item->getValue());
+			$this->assertEquals($expected[$pos][2], $item->getLanguageId());
 			$pos++;
 		}
 	}
@@ -92,27 +92,27 @@ 
 			1 => '10',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$result = $object->process( $product, $dataUpdate );
+		$result = $object->process($product, $dataUpdate);
 
-		$product = $this->get( 'job_csv_test' );
-		$items = $this->getProperties( $product->getId() );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$items = $this->getProperties($product->getId());
+		$this->delete($product);
 
 
-		$item = reset( $items );
+		$item = reset($items);
 
-		$this->assertEquals( 1, count( $items ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Product\\Item\\Property\\Iface', $item );
+		$this->assertEquals(1, count($items));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Product\\Item\\Property\\Iface', $item);
 
-		$this->assertEquals( 'package-height', $item->getType() );
-		$this->assertEquals( '10', $item->getValue() );
+		$this->assertEquals('package-height', $item->getType());
+		$this->assertEquals('10', $item->getValue());
 	}
 
 
@@ -128,22 +128,22 @@ 
 			1 => '3.00',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, array(), $this->endpoint );
-		$result = $object->process( $product, array() );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, array(), $this->endpoint);
+		$result = $object->process($product, array());
 
-		$product = $this->get( 'job_csv_test' );
-		$items = $this->getProperties( $product->getId() );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$items = $this->getProperties($product->getId());
+		$this->delete($product);
 
 
-		$this->assertEquals( 0, count( $items ) );
+		$this->assertEquals(0, count($items));
 	}
 
 
@@ -163,81 +163,81 @@ 
 			3 => '3.00',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$items = $this->getProperties( $product->getId() );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$items = $this->getProperties($product->getId());
+		$this->delete($product);
 
 
-		$this->assertEquals( 1, count( $items ) );
+		$this->assertEquals(1, count($items));
 	}
 
 
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$typeManager = $manager->getSubManager( 'type' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$typeManager = $manager->getSubManager('type');
 
 		$typeSearch = $typeManager->createSearch();
-		$typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) );
-		$typeResult = $typeManager->searchItems( $typeSearch );
+		$typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default'));
+		$typeResult = $typeManager->searchItems($typeSearch);
 
-		if( ( $typeItem = reset( $typeResult ) ) === false ) {
-			throw new \Exception( 'No product type "default" found' );
+		if (($typeItem = reset($typeResult)) === false) {
+			throw new \Exception('No product type "default" found');
 		}
 
 		$item = $manager->createItem();
-		$item->setTypeid( $typeItem->getId() );
-		$item->setCode( $code );
+		$item->setTypeid($typeItem->getId());
+		$item->setCode($code);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		return $item;
 	}
 
 
-	protected function delete( \Aimeos\MShop\Product\Item\Iface $product )
+	protected function delete(\Aimeos\MShop\Product\Item\Iface $product)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$listManager = $manager->getSubManager( 'lists' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( $product->getListItems('attribute') as $listItem ) {
-			$listManager->deleteItem( $listItem->getId() );
+		foreach ($product->getListItems('attribute') as $listItem) {
+			$listManager->deleteItem($listItem->getId());
 		}
 
-		$manager->deleteItem( $product->getId() );
+		$manager->deleteItem($product->getId());
 	}
 
 
-	protected function get( $code )
+	protected function get($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $code ) );
+		$search->setConditions($search->compare('==', 'product.code', $code));
 
-		$result = $manager->searchItems( $search, array('attribute') );
+		$result = $manager->searchItems($search, array('attribute'));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Exception( sprintf( 'No product item for code "%1$s"', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Exception(sprintf('No product item for code "%1$s"', $code));
 		}
 
 		return $item;
 	}
 
 
-	protected function getProperties( $prodid )
+	protected function getProperties($prodid)
 	{
-		$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', $prodid ) );
-		$search->setSortations( array( $search->sort( '+', 'product.property.type.code' ) ) );
+		$search->setConditions($search->compare('==', 'product.property.parentid', $prodid));
+		$search->setSortations(array($search->sort('+', 'product.property.type.code')));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }
\ No newline at end of file

controller/common/tests/Controller/Common/Product/Import/Csv/Processor/Stock/StandardTest.php

Doc Comments +3 added lines

@@ -183,6 +183,9 @@
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function create( $code )
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );

Spacing +63 added lines, -63 removed lines

@@ -15,16 +15,16 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, array() );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, array());
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -41,21 +41,21 @@ 
 			1 => '2000-01-01 00:00:00',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$items = $this->getStockItems( $product->getId() );
-		$this->delete( $product );
+		$items = $this->getStockItems($product->getId());
+		$this->delete($product);
 
 
-		$this->assertEquals( 1, count( $items ) );
+		$this->assertEquals(1, count($items));
 
-		foreach( $items as $item )
+		foreach ($items as $item)
 		{
-			$this->assertEquals( 100, $item->getStocklevel() );
-			$this->assertEquals( '2000-01-01 00:00:00', $item->getDateBack() );
+			$this->assertEquals(100, $item->getStocklevel());
+			$this->assertEquals('2000-01-01 00:00:00', $item->getDateBack());
 		}
 	}
 
@@ -76,19 +76,19 @@ 
 			3 => '200',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$items = $this->getStockItems( $product->getId() );
-		$this->delete( $product );
+		$items = $this->getStockItems($product->getId());
+		$this->delete($product);
 
 
-		$this->assertEquals( 2, count( $items ) );
+		$this->assertEquals(2, count($items));
 
-		foreach( $items as $item ) {
-			$this->assertEquals( 200, $item->getStocklevel() );
+		foreach ($items as $item) {
+			$this->assertEquals(200, $item->getStocklevel());
 		}
 	}
 
@@ -107,21 +107,21 @@ 
 			0 => '20',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint);
 
-		$result = $object->process( $product, $data );
-		$result = $object->process( $product, $dataUpdate );
+		$result = $object->process($product, $data);
+		$result = $object->process($product, $dataUpdate);
 
-		$items = $this->getStockItems( $product->getId() );
-		$this->delete( $product );
+		$items = $this->getStockItems($product->getId());
+		$this->delete($product);
 
 
-		$item = reset( $items );
+		$item = reset($items);
 
-		$this->assertEquals( 1, count( $items ) );
-		$this->assertEquals( 20, $item->getStocklevel() );
+		$this->assertEquals(1, count($items));
+		$this->assertEquals(20, $item->getStocklevel());
 	}
 
 
@@ -135,19 +135,19 @@ 
 			0 => 50,
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, array(), $this->endpoint );
-		$result = $object->process( $product, array() );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, array(), $this->endpoint);
+		$result = $object->process($product, array());
 
-		$items = $this->getStockItems( $product->getId() );
-		$this->delete( $product );
+		$items = $this->getStockItems($product->getId());
+		$this->delete($product);
 
 
-		$this->assertEquals( 0, count( $items ) );
+		$this->assertEquals(0, count($items));
 	}
 
 
@@ -165,61 +165,61 @@ 
 			2 => '',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$items = $this->getStockItems( $product->getId() );
-		$this->delete( $product );
+		$items = $this->getStockItems($product->getId());
+		$this->delete($product);
 
-		$this->assertEquals( 1, count( $items ) );
+		$this->assertEquals(1, count($items));
 
-		foreach( $items as $item )
+		foreach ($items as $item)
 		{
-			$this->assertEquals( null, $item->getStocklevel() );
-			$this->assertEquals( null, $item->getDateBack() );
+			$this->assertEquals(null, $item->getStocklevel());
+			$this->assertEquals(null, $item->getDateBack());
 		}
 	}
 
 
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$typeManager = $manager->getSubManager( 'type' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$typeManager = $manager->getSubManager('type');
 
 		$typeSearch = $typeManager->createSearch();
-		$typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) );
-		$typeResult = $typeManager->searchItems( $typeSearch );
+		$typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default'));
+		$typeResult = $typeManager->searchItems($typeSearch);
 
-		if( ( $typeItem = reset( $typeResult ) ) === false ) {
-			throw new \Exception( 'No product type "default" found' );
+		if (($typeItem = reset($typeResult)) === false) {
+			throw new \Exception('No product type "default" found');
 		}
 
 		$item = $manager->createItem();
-		$item->setTypeid( $typeItem->getId() );
-		$item->setCode( $code );
+		$item->setTypeid($typeItem->getId());
+		$item->setCode($code);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		return $item;
 	}
 
 
-	protected function delete( \Aimeos\MShop\Product\Item\Iface $product )
+	protected function delete(\Aimeos\MShop\Product\Item\Iface $product)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$manager->deleteItem( $product->getId() );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$manager->deleteItem($product->getId());
 	}
 
 
-	protected function getStockItems( $prodid )
+	protected function getStockItems($prodid)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'product/stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'product/stock');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.stock.parentid', $prodid ) );
+		$search->setConditions($search->compare('==', 'product.stock.parentid', $prodid));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }
\ No newline at end of file

controller/common/tests/Controller/Common/Product/Import/Csv/Processor/Text/StandardTest.php

Doc Comments +6 added lines

@@ -291,6 +291,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function create( $code )
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
@@ -330,6 +333,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function get( $code )
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );

Spacing +98 added lines, -98 removed lines

@@ -21,10 +21,10 @@ 
 	 */
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, array() );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, array());
 	}
 
 
@@ -36,7 +36,7 @@ 
 	 */
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -59,35 +59,35 @@ 
 			4 => 1,
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
+		$this->assertEquals(1, count($listItems));
 
-		$this->assertEquals( 1, $listItem->getStatus() );
-		$this->assertEquals( 0, $listItem->getPosition() );
-		$this->assertEquals( 'text', $listItem->getDomain() );
-		$this->assertEquals( 'default', $listItem->getType() );
+		$this->assertEquals(1, $listItem->getStatus());
+		$this->assertEquals(0, $listItem->getPosition());
+		$this->assertEquals('text', $listItem->getDomain());
+		$this->assertEquals('default', $listItem->getType());
 
 		$refItem = $listItem->getRefItem();
 
-		$this->assertEquals( 1, $refItem->getStatus() );
-		$this->assertEquals( 'name', $refItem->getType() );
-		$this->assertEquals( 'product', $refItem->getDomain() );
-		$this->assertEquals( 'test text', $refItem->getLabel() );
-		$this->assertEquals( 'Job CSV test', $refItem->getContent() );
-		$this->assertEquals( 'de', $refItem->getLanguageId() );
-		$this->assertEquals( 1, $refItem->getStatus() );
+		$this->assertEquals(1, $refItem->getStatus());
+		$this->assertEquals('name', $refItem->getType());
+		$this->assertEquals('product', $refItem->getDomain());
+		$this->assertEquals('test text', $refItem->getLabel());
+		$this->assertEquals('Job CSV test', $refItem->getContent());
+		$this->assertEquals('de', $refItem->getLanguageId());
+		$this->assertEquals(1, $refItem->getStatus());
 	}
 
 
@@ -115,30 +115,30 @@ 
 			7 => 'Long: Job CSV test 2',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$pos = 0;
 		$listItems = $product->getListItems();
 		$expected = array(
-			0 => array( 'name', 'Job CSV test' ),
-			1 => array( 'short', 'Short: Job CSV test' ),
-			2 => array( 'long', 'Long: Job CSV test' ),
-			3 => array( 'long', 'Long: Job CSV test 2' ),
+			0 => array('name', 'Job CSV test'),
+			1 => array('short', 'Short: Job CSV test'),
+			2 => array('long', 'Long: Job CSV test'),
+			3 => array('long', 'Long: Job CSV test 2'),
 		);
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $expected[$pos][0], $listItem->getRefItem()->getType() );
-			$this->assertEquals( $expected[$pos][1], $listItem->getRefItem()->getContent() );
+			$this->assertEquals($expected[$pos][0], $listItem->getRefItem()->getType());
+			$this->assertEquals($expected[$pos][1], $listItem->getRefItem()->getContent());
 			$pos++;
 		}
 	}
@@ -161,27 +161,27 @@ 
 			1 => 'Short: Job CSV test',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$result = $object->process( $product, $dataUpdate );
+		$result = $object->process($product, $dataUpdate);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'short', $listItem->getRefItem()->getType() );
-		$this->assertEquals( 'Short: Job CSV test', $listItem->getRefItem()->getContent() );
+		$this->assertEquals('short', $listItem->getRefItem()->getType());
+		$this->assertEquals('Short: Job CSV test', $listItem->getRefItem()->getContent());
 	}
 
 
@@ -197,23 +197,23 @@ 
 			1 => 'Job CSV test',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, array(), $this->endpoint );
-		$result = $object->process( $product, array() );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, array(), $this->endpoint);
+		$result = $object->process($product, array());
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -233,18 +233,18 @@ 
 			3 => '',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -268,79 +268,79 @@ 
 			5 => 'default',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/product/import/csv/processor/text/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/product/import/csv/processor/text/listtypes', array('default'));
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'default', $listItem->getType() );
-		$this->assertEquals( 'short', $listItem->getRefItem()->getType() );
-		$this->assertEquals( 'test short', $listItem->getRefItem()->getContent() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('short', $listItem->getRefItem()->getType());
+		$this->assertEquals('test short', $listItem->getRefItem()->getContent());
 	}
 
 
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$typeManager = $manager->getSubManager( 'type' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$typeManager = $manager->getSubManager('type');
 
 		$typeSearch = $typeManager->createSearch();
-		$typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) );
-		$typeResult = $typeManager->searchItems( $typeSearch );
+		$typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default'));
+		$typeResult = $typeManager->searchItems($typeSearch);
 
-		if( ( $typeItem = reset( $typeResult ) ) === false ) {
-			throw new \Exception( 'No product type "default" found' );
+		if (($typeItem = reset($typeResult)) === false) {
+			throw new \Exception('No product type "default" found');
 		}
 
 		$item = $manager->createItem();
-		$item->setTypeid( $typeItem->getId() );
-		$item->setCode( $code );
+		$item->setTypeid($typeItem->getId());
+		$item->setCode($code);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		return $item;
 	}
 
 
-	protected function delete( \Aimeos\MShop\Product\Item\Iface $product )
+	protected function delete(\Aimeos\MShop\Product\Item\Iface $product)
 	{
-		$textManager = \Aimeos\MShop\Text\Manager\Factory::createManager( $this->context );
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$listManager = $manager->getSubManager( 'lists' );
+		$textManager = \Aimeos\MShop\Text\Manager\Factory::createManager($this->context);
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( $product->getListItems('text') as $listItem )
+		foreach ($product->getListItems('text') as $listItem)
 		{
-			$textManager->deleteItem( $listItem->getRefItem()->getId() );
-			$listManager->deleteItem( $listItem->getId() );
+			$textManager->deleteItem($listItem->getRefItem()->getId());
+			$listManager->deleteItem($listItem->getId());
 		}
 
-		$manager->deleteItem( $product->getId() );
+		$manager->deleteItem($product->getId());
 	}
 
 
-	protected function get( $code )
+	protected function get($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $code ) );
+		$search->setConditions($search->compare('==', 'product.code', $code));
 
-		$result = $manager->searchItems( $search, array('text') );
+		$result = $manager->searchItems($search, array('text'));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Exception( sprintf( 'No product item for code "%1$s"', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Exception(sprintf('No product item for code "%1$s"', $code));
 		}
 
 		return $item;