aimeos / ai-laravel

lib/custom/src/MW/Logger/Laravel4.php

Spacing +16 added lines, -16 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @param \Illuminate\\Log\Writer $logger Laravel logger object
 	 */
-	public function __construct( \Illuminate\Log\Writer $logger )
+	public function __construct(\Illuminate\Log\Writer $logger)
 	{
 		$this->logger = $logger;
 	}
@@ -44,38 +44,38 @@ 
 	 * @throws \Aimeos\MW\Logger\Exception If an error occurs in Zend_Log
 	 * @see \Aimeos\MW\Logger\Base for available log level constants
 	 */
-	public function log( $message, $priority = \Aimeos\MW\Logger\Base::ERR, $facility = 'message' )
+	public function log($message, $priority = \Aimeos\MW\Logger\Base::ERR, $facility = 'message')
 	{
 		try
 		{
-			if( !is_scalar( $message ) ) {
-				$message = json_encode( $message );
+			if (!is_scalar($message)) {
+				$message = json_encode($message);
 			}
 
-			switch( $priority )
+			switch ($priority)
 			{
 				case \Aimeos\MW\Logger\Base::EMERG:
-					$this->logger->emergency( $message ); break;
+					$this->logger->emergency($message); break;
 				case \Aimeos\MW\Logger\Base::ALERT:
-					$this->logger->alert( $message ); break;
+					$this->logger->alert($message); break;
 				case \Aimeos\MW\Logger\Base::CRIT:
-					$this->logger->critical( $message ); break;
+					$this->logger->critical($message); break;
 				case \Aimeos\MW\Logger\Base::ERR:
-					$this->logger->error( $message ); break;
+					$this->logger->error($message); break;
 				case \Aimeos\MW\Logger\Base::WARN:
-					$this->logger->warning( $message ); break;
+					$this->logger->warning($message); break;
 				case \Aimeos\MW\Logger\Base::NOTICE:
-					$this->logger->notice( $message ); break;
+					$this->logger->notice($message); break;
 				case \Aimeos\MW\Logger\Base::INFO:
-					$this->logger->info( $message ); break;
+					$this->logger->info($message); break;
 				case \Aimeos\MW\Logger\Base::DEBUG:
-					$this->logger->debug( $message ); break;
+					$this->logger->debug($message); break;
 				default:
-					throw new \Aimeos\MW\Logger\Exception( 'Invalid log level' );
+					throw new \Aimeos\MW\Logger\Exception('Invalid log level');
 			}
 		}
-		catch( \Exception $e )	{
-			throw new \Aimeos\MW\Logger\Exception( $e->getMessage(), $e->getCode(), $e );
+		catch (\Exception $e) {
+			throw new \Aimeos\MW\Logger\Exception($e->getMessage(), $e->getCode(), $e);
 		}
 	}
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -53,8 +53,7 @@
 			}
 
 			$this->logger->log( $message, $this->translatePriority( $priority ) );
-		}
-		catch( \Exception $e )	{
+		} catch( \Exception $e )	{
 			throw new \Aimeos\MW\Logger\Exception( $e->getMessage(), $e->getCode(), $e );
 		}
 	}

lib/custom/src/MW/Logger/Laravel5.php

Spacing +10 added lines, -10 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @param \Illuminate\Contracts\Logging\Log $logger Laravel logger object
 	 */
-	public function __construct( \Illuminate\Contracts\Logging\Log $logger )
+	public function __construct(\Illuminate\Contracts\Logging\Log $logger)
 	{
 		$this->logger = $logger;
 	}
@@ -44,18 +44,18 @@ 
 	 * @throws \Aimeos\MW\Logger\Exception If an error occurs in Zend_Log
 	 * @see \Aimeos\MW\Logger\Base for available log level constants
 	 */
-	public function log( $message, $priority = \Aimeos\MW\Logger\Base::ERR, $facility = 'message' )
+	public function log($message, $priority = \Aimeos\MW\Logger\Base::ERR, $facility = 'message')
 	{
 		try
 		{
-			if( !is_scalar( $message ) ) {
-				$message = json_encode( $message );
+			if (!is_scalar($message)) {
+				$message = json_encode($message);
 			}
 
-			$this->logger->log( $message, $this->translatePriority( $priority ) );
+			$this->logger->log($message, $this->translatePriority($priority));
 		}
-		catch( \Exception $e )	{
-			throw new \Aimeos\MW\Logger\Exception( $e->getMessage(), $e->getCode(), $e );
+		catch (\Exception $e) {
+			throw new \Aimeos\MW\Logger\Exception($e->getMessage(), $e->getCode(), $e);
 		}
 	}
 
@@ -67,9 +67,9 @@ 
 	 * @return integer Log level from Monolog\Logger
 	 * @throws \Aimeos\MW\Logger\Exception If log level is unknown
 	 */
-	protected function translatePriority( $priority )
+	protected function translatePriority($priority)
 	{
-		switch( $priority )
+		switch ($priority)
 		{
 			case \Aimeos\MW\Logger\Base::EMERG:
 				return 'emergency';
@@ -88,7 +88,7 @@ 
 			case \Aimeos\MW\Logger\Base::DEBUG:
 				return 'debug';
 			default:
-				throw new \Aimeos\MW\Logger\Exception( 'Invalid log level' );
+				throw new \Aimeos\MW\Logger\Exception('Invalid log level');
 		}
 	}
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -53,8 +53,7 @@
 			}
 
 			$this->logger->log( $message, $this->translatePriority( $priority ) );
-		}
-		catch( \Exception $e )	{
+		} catch( \Exception $e )	{
 			throw new \Aimeos\MW\Logger\Exception( $e->getMessage(), $e->getCode(), $e );
 		}
 	}

lib/custom/src/MW/Session/Laravel4.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param \Illuminate\Session\Store $object Laravel session object
 	 */
-	public function __construct( \Illuminate\Session\Store $object )
+	public function __construct(\Illuminate\Session\Store $object)
 	{
 		$this->object = $object;
 	}
@@ -43,9 +43,9 @@ 
 	 * @param mixed $default Value returned if requested key isn't found
 	 * @return mixed Value associated to the requested key
 	 */
-	public function get( $name, $default = null )
+	public function get($name, $default = null)
 	{
-		return $this->object->get( $name, $default );
+		return $this->object->get($name, $default);
 	}
 
 
@@ -58,8 +58,8 @@ 
 	 * @param mixed $value Value that should be associated with the given key
 	 * @return void
 	 */
-	public function set( $name, $value )
+	public function set($name, $value)
 	{
-		$this->object->put( $name, $value );
+		$this->object->put($name, $value);
 	}
 }

lib/custom/src/MW/Session/Laravel5.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param \Illuminate\Session\SessionInterface $object Laravel session object
 	 */
-	public function __construct( \Illuminate\Session\SessionInterface $object )
+	public function __construct(\Illuminate\Session\SessionInterface $object)
 	{
 		$this->object = $object;
 	}
@@ -43,9 +43,9 @@ 
 	 * @param mixed $default Value returned if requested key isn't found
 	 * @return mixed Value associated to the requested key
 	 */
-	public function get( $name, $default = null )
+	public function get($name, $default = null)
 	{
-		return $this->object->get( $name, $default );
+		return $this->object->get($name, $default);
 	}
 
 
@@ -58,8 +58,8 @@ 
 	 * @param mixed $value Value that should be associated with the given key
 	 * @return void
 	 */
-	public function set( $name, $value )
+	public function set($name, $value)
 	{
-		$this->object->set( $name, $value );
+		$this->object->set($name, $value);
 	}
 }

lib/custom/src/MW/View/Helper/Request/Laravel5.php

Spacing +2 added lines, -2 removed lines

@@ -30,9 +30,9 @@
 	 * @param \\Aimeos\MW\View\Iface $view View instance with registered view helpers
 	 * @param \Illuminate\Http\Request $request Laravel request object
 	 */
-	public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request )
+	public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request)
 	{
-		parent::__construct( $view );
+		parent::__construct($view);
 
 		$this->request = $request;
 	}

lib/custom/src/MW/View/Helper/Url/Laravel4.php

Spacing +7 added lines, -7 removed lines

@@ -32,9 +32,9 @@ 
 	 * @param \Illuminate\Routing\UrlGenerator $builder Laravel URL builder object
 	 * @param array Associative list of fixed parameters that should be available for all routes
 	 */
-	public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Routing\UrlGenerator $builder, array $fixed )
+	public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Routing\UrlGenerator $builder, array $fixed)
 	{
-		parent::__construct( $view );
+		parent::__construct($view);
 
 		$this->builder = $builder;
 		$this->fixed = $fixed;
@@ -52,11 +52,11 @@ 
 	 * @param array $config Additional configuration parameter per URL
 	 * @return string Complete URL that can be used in the template
 	 */
-	public function transform( $target = null, $controller = null, $action = null, array $params = array(), array $trailing = array(), array $config = array() )
+	public function transform($target = null, $controller = null, $action = null, array $params = array(), array $trailing = array(), array $config = array())
 	{
-		$values = $this->getValues( $config );
+		$values = $this->getValues($config);
 
-		return $this->builder->route( $target, $params + $this->fixed, $values['absoluteUri'] );
+		return $this->builder->route($target, $params + $this->fixed, $values['absoluteUri']);
 	}
 
 
@@ -66,13 +66,13 @@ 
 	 * @param array $config Associative list of key/value pairs
 	 * @return array Associative list of sanitized key/value pairs
 	 */
-	protected function getValues( array $config )
+	protected function getValues(array $config)
 	{
 		$values = array(
 			'absoluteUri' => false,
 		);
 
-		if( isset( $config['absoluteUri'] ) ) {
+		if (isset($config['absoluteUri'])) {
 			$values['absoluteUri'] = (bool) $config['absoluteUri'];
 		}
 

lib/custom/src/MW/View/Helper/Url/Laravel5.php

Spacing +7 added lines, -7 removed lines

@@ -32,9 +32,9 @@ 
 	 * @param \Illuminate\Contracts\Routing\UrlGenerator $builder Laravel URL builder object
 	 * @param array Associative list of fixed parameters that should be available for all routes
 	 */
-	public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Contracts\Routing\UrlGenerator $builder, array $fixed )
+	public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Contracts\Routing\UrlGenerator $builder, array $fixed)
 	{
-		parent::__construct( $view );
+		parent::__construct($view);
 
 		$this->builder = $builder;
 		$this->fixed = $fixed;
@@ -52,11 +52,11 @@ 
 	 * @param array $config Additional configuration parameter per URL
 	 * @return string Complete URL that can be used in the template
 	 */
-	public function transform( $target = null, $controller = null, $action = null, array $params = array(), array $trailing = array(), array $config = array() )
+	public function transform($target = null, $controller = null, $action = null, array $params = array(), array $trailing = array(), array $config = array())
 	{
-		$values = $this->getValues( $config );
+		$values = $this->getValues($config);
 
-		return $this->builder->route( $target, $params + $this->fixed, $values['absoluteUri'] );
+		return $this->builder->route($target, $params + $this->fixed, $values['absoluteUri']);
 	}
 
 
@@ -66,13 +66,13 @@ 
 	 * @param array $config Associative list of key/value pairs
 	 * @return array Associative list of sanitized key/value pairs
 	 */
-	protected function getValues( array $config )
+	protected function getValues(array $config)
 	{
 		$values = array(
 			'absoluteUri' => false,
 		);
 
-		if( isset( $config['absoluteUri'] ) ) {
+		if (isset($config['absoluteUri'])) {
 			$values['absoluteUri'] = (bool) $config['absoluteUri'];
 		}
 

lib/custom/tests/MShop/Customer/Manager/Address/LaravelTest.php

Spacing +100 added lines, -100 removed lines

@@ -21,18 +21,18 @@ 
 	{
 		$context = \TestHelper::getContext();
 		$this->editor = $context->getEditor();
-		$customer = new \Aimeos\MShop\Customer\Manager\Laravel( $context );
+		$customer = new \Aimeos\MShop\Customer\Manager\Laravel($context);
 
 		$search = $customer->createSearch();
 		$conditions = array(
-			$search->compare( '==', 'customer.code', 'unitCustomer1' ),
-			$search->compare( '==', 'customer.editor', $this->editor )
+			$search->compare('==', 'customer.code', 'unitCustomer1'),
+			$search->compare('==', 'customer.editor', $this->editor)
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$result = $customer->searchItems( $search );
+		$search->setConditions($search->combine('&&', $conditions));
+		$result = $customer->searchItems($search);
 
-		if( ( $customerItem = reset( $result ) ) === false ) {
-			throw new \Exception( sprintf( 'No customer item found for code "%1$s"', 'unitCustomer1' ) );
+		if (($customerItem = reset($result)) === false) {
+			throw new \Exception(sprintf('No customer item found for code "%1$s"', 'unitCustomer1'));
 		}
 
 		$this->fixture = array(
@@ -59,7 +59,7 @@ 
 			'customer.address.siteid' => $context->getLocale()->getSiteId(),
 		);
 
-		$this->object = $customer->getSubManager( 'address', 'Laravel' );
+		$this->object = $customer->getSubManager('address', 'Laravel');
 	}
 
 
@@ -68,126 +68,126 @@ 
 	 */
 	protected function tearDown()
 	{
-		unset( $this->object, $this->fixture );
+		unset($this->object, $this->fixture);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 	public function testGetSearchAttributes()
 	{
-		foreach( $this->object->getSearchAttributes() as $attribute ) {
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
+		foreach ($this->object->getSearchAttributes() as $attribute) {
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
 		}
 	}
 
 	public function testCreateItem()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem() );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem());
 	}
 
 	public function testGetItem()
 	{
 		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ) );
+		$search->setConditions($search->compare('~=', 'customer.address.company', 'ABC GmbH'));
 
-		$items = $this->object->searchItems( $search );
+		$items = $this->object->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'No address item with company "ABC" found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('No address item with company "ABC" found');
 		}
 
-		$this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
+		$this->assertEquals($item, $this->object->getItem($item->getId()));
 	}
 
 	public function testGetSubManager()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('unknown');
 	}
 
 	public function testSaveUpdateDeleteItem()
 	{
-		$item = new \Aimeos\MShop\Common\Item\Address\Standard( 'customer.address.', $this->fixture );
-		$item->setId( null );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item = new \Aimeos\MShop\Common\Item\Address\Standard('customer.address.', $this->fixture);
+		$item->setId(null);
+		$this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setPosition( 1 );
-		$itemExp->setCity( 'Berlin' );
-		$itemExp->setState( 'Berlin' );
-		$this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
-
-		$this->object->deleteItem( $itemSaved->getId() );
-
-
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getParentId(), $itemSaved->getParentId());
-		$this->assertEquals( $item->getPosition(), $itemSaved->getPosition());
-		$this->assertEquals( $item->getCompany(), $itemSaved->getCompany());
-		$this->assertEquals( $item->getVatID(), $itemSaved->getVatID());
-		$this->assertEquals( $item->getSalutation(), $itemSaved->getSalutation());
-		$this->assertEquals( $item->getTitle(), $itemSaved->getTitle());
-		$this->assertEquals( $item->getFirstname(), $itemSaved->getFirstname());
-		$this->assertEquals( $item->getLastname(), $itemSaved->getLastname());
-		$this->assertEquals( $item->getAddress1(), $itemSaved->getAddress1());
-		$this->assertEquals( $item->getAddress2(), $itemSaved->getAddress2());
-		$this->assertEquals( $item->getAddress3(), $itemSaved->getAddress3());
-		$this->assertEquals( $item->getPostal(), $itemSaved->getPostal());
-		$this->assertEquals( $item->getCity(), $itemSaved->getCity());
-		$this->assertEquals( $item->getState(), $itemSaved->getState());
-		$this->assertEquals( $item->getCountryId(), $itemSaved->getCountryId());
-		$this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId());
-		$this->assertEquals( $item->getTelephone(), $itemSaved->getTelephone());
-		$this->assertEquals( $item->getEmail(), $itemSaved->getEmail());
-		$this->assertEquals( $item->getTelefax(), $itemSaved->getTelefax());
-		$this->assertEquals( $item->getWebsite(), $itemSaved->getWebsite());
-		$this->assertEquals( $item->getFlag(), $itemSaved->getFlag());
-
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
+		$itemExp->setPosition(1);
+		$itemExp->setCity('Berlin');
+		$itemExp->setState('Berlin');
+		$this->object->saveItem($itemExp);
+		$itemUpd = $this->object->getItem($itemExp->getId());
+
+		$this->object->deleteItem($itemSaved->getId());
+
+
+		$this->assertTrue($item->getId() !== null);
+		$this->assertEquals($item->getId(), $itemSaved->getId());
+		$this->assertEquals($item->getParentId(), $itemSaved->getParentId());
+		$this->assertEquals($item->getPosition(), $itemSaved->getPosition());
+		$this->assertEquals($item->getCompany(), $itemSaved->getCompany());
+		$this->assertEquals($item->getVatID(), $itemSaved->getVatID());
+		$this->assertEquals($item->getSalutation(), $itemSaved->getSalutation());
+		$this->assertEquals($item->getTitle(), $itemSaved->getTitle());
+		$this->assertEquals($item->getFirstname(), $itemSaved->getFirstname());
+		$this->assertEquals($item->getLastname(), $itemSaved->getLastname());
+		$this->assertEquals($item->getAddress1(), $itemSaved->getAddress1());
+		$this->assertEquals($item->getAddress2(), $itemSaved->getAddress2());
+		$this->assertEquals($item->getAddress3(), $itemSaved->getAddress3());
+		$this->assertEquals($item->getPostal(), $itemSaved->getPostal());
+		$this->assertEquals($item->getCity(), $itemSaved->getCity());
+		$this->assertEquals($item->getState(), $itemSaved->getState());
+		$this->assertEquals($item->getCountryId(), $itemSaved->getCountryId());
+		$this->assertEquals($item->getLanguageId(), $itemSaved->getLanguageId());
+		$this->assertEquals($item->getTelephone(), $itemSaved->getTelephone());
+		$this->assertEquals($item->getEmail(), $itemSaved->getEmail());
+		$this->assertEquals($item->getTelefax(), $itemSaved->getTelefax());
+		$this->assertEquals($item->getWebsite(), $itemSaved->getWebsite());
+		$this->assertEquals($item->getFlag(), $itemSaved->getFlag());
+
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
 		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
 
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
-		$this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId());
-		$this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition());
-		$this->assertEquals( $itemExp->getCompany(), $itemUpd->getCompany());
-		$this->assertEquals( $itemExp->getVatID(), $itemUpd->getVatID());
-		$this->assertEquals( $itemExp->getSalutation(), $itemUpd->getSalutation());
-		$this->assertEquals( $itemExp->getTitle(), $itemUpd->getTitle());
-		$this->assertEquals( $itemExp->getFirstname(), $itemUpd->getFirstname());
-		$this->assertEquals( $itemExp->getLastname(), $itemUpd->getLastname());
-		$this->assertEquals( $itemExp->getAddress1(), $itemUpd->getAddress1());
-		$this->assertEquals( $itemExp->getAddress2(), $itemUpd->getAddress2());
-		$this->assertEquals( $itemExp->getAddress3(), $itemUpd->getAddress3());
-		$this->assertEquals( $itemExp->getPostal(), $itemUpd->getPostal());
-		$this->assertEquals( $itemExp->getCity(), $itemUpd->getCity());
-		$this->assertEquals( $itemExp->getState(), $itemUpd->getState());
-		$this->assertEquals( $itemExp->getCountryId(), $itemUpd->getCountryId());
-		$this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId());
-		$this->assertEquals( $itemExp->getTelephone(), $itemUpd->getTelephone());
-		$this->assertEquals( $itemExp->getEmail(), $itemUpd->getEmail());
-		$this->assertEquals( $itemExp->getTelefax(), $itemUpd->getTelefax());
-		$this->assertEquals( $itemExp->getWebsite(), $itemUpd->getWebsite());
-		$this->assertEquals( $itemExp->getFlag(), $itemUpd->getFlag());
-
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
+		$this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId());
+		$this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition());
+		$this->assertEquals($itemExp->getCompany(), $itemUpd->getCompany());
+		$this->assertEquals($itemExp->getVatID(), $itemUpd->getVatID());
+		$this->assertEquals($itemExp->getSalutation(), $itemUpd->getSalutation());
+		$this->assertEquals($itemExp->getTitle(), $itemUpd->getTitle());
+		$this->assertEquals($itemExp->getFirstname(), $itemUpd->getFirstname());
+		$this->assertEquals($itemExp->getLastname(), $itemUpd->getLastname());
+		$this->assertEquals($itemExp->getAddress1(), $itemUpd->getAddress1());
+		$this->assertEquals($itemExp->getAddress2(), $itemUpd->getAddress2());
+		$this->assertEquals($itemExp->getAddress3(), $itemUpd->getAddress3());
+		$this->assertEquals($itemExp->getPostal(), $itemUpd->getPostal());
+		$this->assertEquals($itemExp->getCity(), $itemUpd->getCity());
+		$this->assertEquals($itemExp->getState(), $itemUpd->getState());
+		$this->assertEquals($itemExp->getCountryId(), $itemUpd->getCountryId());
+		$this->assertEquals($itemExp->getLanguageId(), $itemUpd->getLanguageId());
+		$this->assertEquals($itemExp->getTelephone(), $itemUpd->getTelephone());
+		$this->assertEquals($itemExp->getEmail(), $itemUpd->getEmail());
+		$this->assertEquals($itemExp->getTelefax(), $itemUpd->getTelefax());
+		$this->assertEquals($itemExp->getWebsite(), $itemUpd->getWebsite());
+		$this->assertEquals($itemExp->getFlag(), $itemUpd->getFlag());
+
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
 
 		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
+		$this->object->getItem($itemSaved->getId());
 	}
 
 	public function testCreateSearch()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch());
 	}
 
 
@@ -196,11 +196,11 @@ 
 		$search = $this->object->createSearch();
 
 		$conditions = array(
-			$search->compare( '==', 'customer.address.company', 'ABC' ),
-			$search->compare( '==', 'customer.address.editor', $this->editor )
+			$search->compare('==', 'customer.address.company', 'ABC'),
+			$search->compare('==', 'customer.address.editor', $this->editor)
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$this->assertEquals( 1, count( $this->object->searchItems( $search ) ) );
+		$search->setConditions($search->combine('&&', $conditions));
+		$this->assertEquals(1, count($this->object->searchItems($search)));
 	}
 
 
@@ -210,20 +210,20 @@ 
 		$search = $this->object->createSearch();
 
 		$conditions = array(
-			$search->compare( '~=', 'customer.address.company', 'ABC GmbH' ),
-			$search->compare( '==', 'customer.address.editor', $this->editor )
+			$search->compare('~=', 'customer.address.company', 'ABC GmbH'),
+			$search->compare('==', 'customer.address.editor', $this->editor)
 		);
 
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $conditions));
+		$search->setSlice(0, 1);
 
-		$results = $this->object->searchItems( $search, array(), $total );
+		$results = $this->object->searchItems($search, array(), $total);
 
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertEquals( 2, $total );
+		$this->assertEquals(1, count($results));
+		$this->assertEquals(2, $total);
 
-		foreach( $results as $id => $item ) {
-			$this->assertEquals( $id, $item->getId() );
+		foreach ($results as $id => $item) {
+			$this->assertEquals($id, $item->getId());
 		}
 	}
 }

lib/custom/tests/MShop/Customer/Manager/LaravelTest.php

Spacing +134 added lines, -134 removed lines

@@ -22,14 +22,14 @@ 
 	{
 		$context = \TestHelper::getContext();
 		$this->editor = $context->getEditor();
-		$this->object = new \Aimeos\MShop\Customer\Manager\Laravel( $context );
+		$this->object = new \Aimeos\MShop\Customer\Manager\Laravel($context);
 
 		$this->fixture = array(
 			'label' => 'unitTest',
 			'status' => 2,
 		);
 
-		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' );
+		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.');
 	}
 
 
@@ -38,28 +38,28 @@ 
 	 */
 	protected function tearDown()
 	{
-		unset( $this->object, $this->fixture, $this->address );
+		unset($this->object, $this->fixture, $this->address);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 
 	public function testGetSearchAttributes()
 	{
-		foreach( $this->object->getSearchAttributes() as $attribute )
+		foreach ($this->object->getSearchAttributes() as $attribute)
 		{
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
 		}
 	}
 
 
 	public function testCreateItem()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem() );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem());
 	}
 
 
@@ -67,21 +67,21 @@ 
 	{
 		$search = $this->object->createSearch();
 		$conditions = array(
-			$search->compare( '==', 'customer.code', 'unitCustomer3' ),
-			$search->compare( '==', 'customer.editor', $this->editor )
+			$search->compare('==', 'customer.code', 'unitCustomer3'),
+			$search->compare('==', 'customer.editor', $this->editor)
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$items = $this->object->searchItems( $search, array( 'text' ) );
+		$search->setConditions($search->combine('&&', $conditions));
+		$items = $this->object->searchItems($search, array('text'));
 
-		if( ( $expected = reset( $items ) ) === false ) {
-			throw new \Exception( 'No customer item with code "unitCustomer3" found' );
+		if (($expected = reset($items)) === false) {
+			throw new \Exception('No customer item with code "unitCustomer3" found');
 		}
 
-		$actual = $this->object->getItem( $expected->getId(), array( 'text' ) );
+		$actual = $this->object->getItem($expected->getId(), array('text'));
 
-		$this->assertEquals( $expected, $actual );
-		$this->assertEquals( 3, count( $actual->getListItems( 'text' ) ) );
-		$this->assertEquals( 3, count( $actual->getRefItems( 'text' ) ) );
+		$this->assertEquals($expected, $actual);
+		$this->assertEquals(3, count($actual->getListItems('text')));
+		$this->assertEquals(3, count($actual->getRefItems('text')));
 	}
 
 
@@ -89,54 +89,54 @@ 
 	{
 		$item = $this->object->createItem();
 
-		$item->setCode( 'unitTest' );
-		$item->setLabel( 'unitTest' );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item->setCode('unitTest');
+		$item->setLabel('unitTest');
+		$this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setCode( 'unitTest2' );
-		$itemExp->setLabel( 'unitTest2' );
-		$this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
-
-		$this->object->deleteItem( $item->getId() );
-
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
-		$this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
-		$this->assertEquals( $item->getCode(), $itemSaved->getCode() );
-		$this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
-		$this->assertEquals( $item->getPaymentAddress(), $itemSaved->getPaymentAddress() );
-		$this->assertEquals( $item->getBirthday(), $itemSaved->getBirthday() );
-		$this->assertEquals( $item->getPassword(), $itemSaved->getPassword() );
-
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
-
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
-		$this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
-		$this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() );
-		$this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
-		$this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
-		$this->assertEquals( $itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress() );
-		$this->assertEquals( $itemExp->getBirthday(), $itemUpd->getBirthday() );
-		$this->assertEquals( $itemExp->getPassword(), $itemUpd->getPassword() );
-
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
-
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getItem( $item->getId() );
+		$itemExp->setCode('unitTest2');
+		$itemExp->setLabel('unitTest2');
+		$this->object->saveItem($itemExp);
+		$itemUpd = $this->object->getItem($itemExp->getId());
+
+		$this->object->deleteItem($item->getId());
+
+		$this->assertTrue($item->getId() !== null);
+		$this->assertEquals($item->getId(), $itemSaved->getId());
+		$this->assertEquals($item->getSiteId(), $itemSaved->getSiteId());
+		$this->assertEquals($item->getStatus(), $itemSaved->getStatus());
+		$this->assertEquals($item->getCode(), $itemSaved->getCode());
+		$this->assertEquals($item->getLabel(), $itemSaved->getLabel());
+		$this->assertEquals($item->getPaymentAddress(), $itemSaved->getPaymentAddress());
+		$this->assertEquals($item->getBirthday(), $itemSaved->getBirthday());
+		$this->assertEquals($item->getPassword(), $itemSaved->getPassword());
+
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
+
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
+		$this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId());
+		$this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus());
+		$this->assertEquals($itemExp->getCode(), $itemUpd->getCode());
+		$this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel());
+		$this->assertEquals($itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress());
+		$this->assertEquals($itemExp->getBirthday(), $itemUpd->getBirthday());
+		$this->assertEquals($itemExp->getPassword(), $itemUpd->getPassword());
+
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
+
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getItem($item->getId());
 	}
 
 
 	public function testCreateSearch()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch());
 	}
 
 
@@ -146,65 +146,65 @@ 
 		$search = $this->object->createSearch();
 
 		$expr = array();
-		$expr[] = $search->compare( '!=', 'customer.id', null );
-		$expr[] = $search->compare( '==', 'customer.label', 'Erika Mustermann' );
-		$expr[] = $search->compare( '==', 'customer.code', 'unitCustomer2' );
-
-		$expr[] = $search->compare( '>=', 'customer.salutation', '' );
-		$expr[] = $search->compare( '>=', 'customer.company', '' );
-		$expr[] = $search->compare( '>=', 'customer.vatid', '' );
-		$expr[] = $search->compare( '>=', 'customer.title', '' );
-		$expr[] = $search->compare( '>=', 'customer.firstname', '' );
-		$expr[] = $search->compare( '>=', 'customer.lastname', '' );
-		$expr[] = $search->compare( '>=', 'customer.address1', '' );
-		$expr[] = $search->compare( '>=', 'customer.address2', '' );
-		$expr[] = $search->compare( '>=', 'customer.address3', '' );
-		$expr[] = $search->compare( '>=', 'customer.postal', '' );
-		$expr[] = $search->compare( '>=', 'customer.city', '' );
-		$expr[] = $search->compare( '>=', 'customer.state', '' );
-		$expr[] = $search->compare( '!=', 'customer.languageid', null );
-		$expr[] = $search->compare( '>=', 'customer.countryid', '' );
-		$expr[] = $search->compare( '>=', 'customer.telephone', '' );
-		$expr[] = $search->compare( '>=', 'customer.email', '' );
-		$expr[] = $search->compare( '>=', 'customer.telefax', '' );
-		$expr[] = $search->compare( '>=', 'customer.website', '' );
-
-		$expr[] = $search->compare( '==', 'customer.birthday', '1970-01-01' );
-		$expr[] = $search->compare( '>=', 'customer.password', '' );
-		$expr[] = $search->compare( '==', 'customer.status', 0 );
-		$expr[] = $search->compare( '!=', 'customer.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '!=', 'customer.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.editor', $this->editor );
-
-		$expr[] = $search->compare( '!=', 'customer.address.id', null );
-		$expr[] = $search->compare( '!=', 'customer.address.parentid', null );
-		$expr[] = $search->compare( '==', 'customer.address.company', 'ABC GmbH' );
-		$expr[] = $search->compare( '==', 'customer.address.vatid', 'DE999999999' );
-		$expr[] = $search->compare( '==', 'customer.address.salutation', 'mr' );
-		$expr[] = $search->compare( '==', 'customer.address.title', 'Dr.' );
-		$expr[] = $search->compare( '==', 'customer.address.firstname', 'Good' );
-		$expr[] = $search->compare( '==', 'customer.address.lastname', 'Unittest' );
-		$expr[] = $search->compare( '==', 'customer.address.address1', 'Pickhuben' );
-		$expr[] = $search->compare( '==', 'customer.address.address2', '2-4' );
-		$expr[] = $search->compare( '==', 'customer.address.address3', '' );
-		$expr[] = $search->compare( '==', 'customer.address.postal', '11099' );
-		$expr[] = $search->compare( '==', 'customer.address.city', 'Berlin' );
-		$expr[] = $search->compare( '==', 'customer.address.state', 'Berlin' );
-		$expr[] = $search->compare( '==', 'customer.address.languageid', 'de' );
-		$expr[] = $search->compare( '==', 'customer.address.countryid', 'de' );
-		$expr[] = $search->compare( '==', 'customer.address.telephone', '055544332221' );
-		$expr[] = $search->compare( '==', 'customer.address.email', 'unitCustomer2@aimeos.org' );
-		$expr[] = $search->compare( '==', 'customer.address.telefax', '055544333212' );
-		$expr[] = $search->compare( '==', 'customer.address.website', 'unittest.aimeos.org' );
-		$expr[] = $search->compare( '==', 'customer.address.flag', 0 );
-		$expr[] = $search->compare( '==', 'customer.address.position', 1 );
-		$expr[] = $search->compare( '!=', 'customer.address.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '!=', 'customer.address.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.address.editor', $this->editor );
-
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$result = $this->object->searchItems( $search, array(), $total );
-		$this->assertEquals( 1, count( $result ) );
+		$expr[] = $search->compare('!=', 'customer.id', null);
+		$expr[] = $search->compare('==', 'customer.label', 'Erika Mustermann');
+		$expr[] = $search->compare('==', 'customer.code', 'unitCustomer2');
+
+		$expr[] = $search->compare('>=', 'customer.salutation', '');
+		$expr[] = $search->compare('>=', 'customer.company', '');
+		$expr[] = $search->compare('>=', 'customer.vatid', '');
+		$expr[] = $search->compare('>=', 'customer.title', '');
+		$expr[] = $search->compare('>=', 'customer.firstname', '');
+		$expr[] = $search->compare('>=', 'customer.lastname', '');
+		$expr[] = $search->compare('>=', 'customer.address1', '');
+		$expr[] = $search->compare('>=', 'customer.address2', '');
+		$expr[] = $search->compare('>=', 'customer.address3', '');
+		$expr[] = $search->compare('>=', 'customer.postal', '');
+		$expr[] = $search->compare('>=', 'customer.city', '');
+		$expr[] = $search->compare('>=', 'customer.state', '');
+		$expr[] = $search->compare('!=', 'customer.languageid', null);
+		$expr[] = $search->compare('>=', 'customer.countryid', '');
+		$expr[] = $search->compare('>=', 'customer.telephone', '');
+		$expr[] = $search->compare('>=', 'customer.email', '');
+		$expr[] = $search->compare('>=', 'customer.telefax', '');
+		$expr[] = $search->compare('>=', 'customer.website', '');
+
+		$expr[] = $search->compare('==', 'customer.birthday', '1970-01-01');
+		$expr[] = $search->compare('>=', 'customer.password', '');
+		$expr[] = $search->compare('==', 'customer.status', 0);
+		$expr[] = $search->compare('!=', 'customer.mtime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('!=', 'customer.ctime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.editor', $this->editor);
+
+		$expr[] = $search->compare('!=', 'customer.address.id', null);
+		$expr[] = $search->compare('!=', 'customer.address.parentid', null);
+		$expr[] = $search->compare('==', 'customer.address.company', 'ABC GmbH');
+		$expr[] = $search->compare('==', 'customer.address.vatid', 'DE999999999');
+		$expr[] = $search->compare('==', 'customer.address.salutation', 'mr');
+		$expr[] = $search->compare('==', 'customer.address.title', 'Dr.');
+		$expr[] = $search->compare('==', 'customer.address.firstname', 'Good');
+		$expr[] = $search->compare('==', 'customer.address.lastname', 'Unittest');
+		$expr[] = $search->compare('==', 'customer.address.address1', 'Pickhuben');
+		$expr[] = $search->compare('==', 'customer.address.address2', '2-4');
+		$expr[] = $search->compare('==', 'customer.address.address3', '');
+		$expr[] = $search->compare('==', 'customer.address.postal', '11099');
+		$expr[] = $search->compare('==', 'customer.address.city', 'Berlin');
+		$expr[] = $search->compare('==', 'customer.address.state', 'Berlin');
+		$expr[] = $search->compare('==', 'customer.address.languageid', 'de');
+		$expr[] = $search->compare('==', 'customer.address.countryid', 'de');
+		$expr[] = $search->compare('==', 'customer.address.telephone', '055544332221');
+		$expr[] = $search->compare('==', 'customer.address.email', 'unitCustomer2@aimeos.org');
+		$expr[] = $search->compare('==', 'customer.address.telefax', '055544333212');
+		$expr[] = $search->compare('==', 'customer.address.website', 'unittest.aimeos.org');
+		$expr[] = $search->compare('==', 'customer.address.flag', 0);
+		$expr[] = $search->compare('==', 'customer.address.position', 1);
+		$expr[] = $search->compare('!=', 'customer.address.mtime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('!=', 'customer.address.ctime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.address.editor', $this->editor);
+
+		$search->setConditions($search->combine('&&', $expr));
+		$result = $this->object->searchItems($search, array(), $total);
+		$this->assertEquals(1, count($result));
 	}
 
 
@@ -213,44 +213,44 @@ 
 		$total = 0;
 
 		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.address.editor', $this->editor ) );
-		$search->setSlice( 0, 2 );
+		$search->setConditions($search->compare('==', 'customer.address.editor', $this->editor));
+		$search->setSlice(0, 2);
 
-		$results = $this->object->searchItems( $search, array(), $total );
-		$this->assertEquals( 2, count( $results ) );
-		$this->assertEquals( 3, $total );
+		$results = $this->object->searchItems($search, array(), $total);
+		$this->assertEquals(2, count($results));
+		$this->assertEquals(3, $total);
 
-		foreach($results as $itemId => $item) {
-			$this->assertEquals( $itemId, $item->getId() );
+		foreach ($results as $itemId => $item) {
+			$this->assertEquals($itemId, $item->getId());
 		}
 	}
 
 
 	public function testSearchItemsBaseCriteria()
 	{
-		$search = $this->object->createSearch( true );
+		$search = $this->object->createSearch(true);
 		$conditions = array(
-			$search->compare( '==', 'customer.address.editor', $this->editor ),
+			$search->compare('==', 'customer.address.editor', $this->editor),
 			$search->getConditions()
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$this->assertEquals( 2, count( $this->object->searchItems( $search, array(), $total ) ) );
+		$search->setConditions($search->combine('&&', $conditions));
+		$this->assertEquals(2, count($this->object->searchItems($search, array(), $total)));
 	}
 
 
 	public function testGetSubManager()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address' ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address', 'Standard' ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address'));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address', 'Standard'));
 
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('unknown');
 	}
 
 
 	public function testGetSubManagerInvalidName()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'address', 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('address', 'unknown');
 	}
 }