aimeos / aimeos-core

lib/mshoplib/src/MShop/Product/Manager/Property/Standard.php

Spacing +6 added lines, -6 removed lines

@@ -563,13 +563,13 @@ 
 			 * @see mshop/product/manager/property/standard/delete/ansi
 			 * @see mshop/product/manager/property/standard/search/ansi
 			 */
-			$cfgPathCount =  'mshop/product/manager/property/standard/count';
+			$cfgPathCount = 'mshop/product/manager/property/standard/count';
 
 			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
 			while( ( $row = $results->fetch() ) !== false )
 			{
-				$map[ $row['product.property.id'] ] = $row;
-				$typeIds[ $row['product.property.typeid'] ] = null;
+				$map[$row['product.property.id']] = $row;
+				$typeIds[$row['product.property.typeid']] = null;
 			}
 
 			$dbm->release( $conn, $dbname );
@@ -590,9 +590,9 @@ 
 
 			foreach( $map as $id => $row )
 			{
-				if( isset( $typeItems[ $row['product.property.typeid'] ] ) )
+				if( isset( $typeItems[$row['product.property.typeid']] ) )
 				{
-					$row['product.property.type'] = $typeItems[ $row['product.property.typeid'] ]->getCode();
+					$row['product.property.type'] = $typeItems[$row['product.property.typeid']]->getCode();
 					$row['product.property.typename'] = $typeItems[$row['product.property.typeid']]->getName();
 				}
 
@@ -723,7 +723,7 @@ 
 		 * @see mshop/product/manager/property/decorators/global
 		 */
 
-		return $this->getSubManagerBase( 'product', 'property/' . $manager, $name );
+		return $this->getSubManagerBase( 'product', 'property/'.$manager, $name );
 	}
 
 

Braces +1 added lines, -2 removed lines

@@ -222,8 +222,7 @@
 				 * @see mshop/product/manager/property/standard/count/ansi
 				 */
 				$path = 'mshop/product/manager/property/standard/insert';
-			}
-			else
+			} else
 			{
 				/** mshop/product/manager/property/standard/update/mysql
 				 * Updates an existing product property record in the database

lib/mshoplib/setup/default/schema/order.php

Braces +18 added lines, -9 removed lines

@@ -16,7 +16,8 @@ 
 
 	'table' => array(
 
-		'mshop_order_base' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_order_base' );
 
@@ -45,7 +46,8 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_address' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_order_base_address' );
 
@@ -93,7 +95,8 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_product' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_product' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_order_base_product' );
 
@@ -134,7 +137,8 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_product_attr' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_product_attr' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_order_base_product_attr' );
 
@@ -160,7 +164,8 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_service' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_service' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_order_base_service' );
 
@@ -194,7 +199,8 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_service_attr' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_service_attr' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_order_base_service_attr' );
 
@@ -220,7 +226,8 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_coupon' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_coupon' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_order_base_coupon' );
 
@@ -247,7 +254,8 @@ 
 			return $schema;
 		},
 
-		'mshop_order' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_order' );
 
@@ -289,7 +297,8 @@ 
 			return $schema;
 		},
 
-		'mshop_order_status' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_status' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_order_status' );
 

Spacing +20 added lines, -20 removed lines

@@ -16,7 +16,7 @@ 
 
 	'table' => array(
 
-		'mshop_order_base' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_base' );
 
@@ -35,7 +35,7 @@ 
 			$table->addColumn( 'status', 'smallint', [] );
 			$table->addColumn( 'mtime', 'datetime', [] );
 			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
+			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
 
 			$table->setPrimaryKey( array( 'id' ), 'pk_msordba_id' );
 			$table->addIndex( array( 'sitecode', 'customerid' ), 'idx_msordba_scode_custid' );
@@ -45,7 +45,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_address' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_base_address' );
 
@@ -77,7 +77,7 @@ 
 			$table->addColumn( 'flag', 'integer', [] );
 			$table->addColumn( 'mtime', 'datetime', [] );
 			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
+			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
 
 			$table->setPrimaryKey( array( 'id' ), 'pk_msordbaad_id' );
 			$table->addUniqueIndex( array( 'baseid', 'type' ), 'unq_msordbaad_bid_type' );
@@ -95,7 +95,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_product' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_product' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_base_product' );
 
@@ -105,8 +105,8 @@ 
 			$table->addColumn( 'ordprodid', 'bigint', array( 'notnull' => false ) );
 			$table->addColumn( 'type', 'string', array( 'length' => 32 ) );
 			$table->addColumn( 'prodid', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'prodcode', 'string', array( 'length' => 32  ) );
-			$table->addColumn( 'suppliercode', 'string', array( 'length' => 32  ) );
+			$table->addColumn( 'prodcode', 'string', array( 'length' => 32 ) );
+			$table->addColumn( 'suppliercode', 'string', array( 'length' => 32 ) );
 			$table->addColumn( 'stocktype', 'string', array( 'length' => 32 ) );
 			$table->addColumn( 'name', 'string', array( 'length' => 255 ) );
 			$table->addColumn( 'mediaurl', 'string', array( 'length' => 255 ) );
@@ -122,7 +122,7 @@ 
 			$table->addColumn( 'status', 'smallint', array( 'default' => -1 ) );
 			$table->addColumn( 'mtime', 'datetime', [] );
 			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
+			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
 
 			$table->setPrimaryKey( array( 'id' ), 'pk_msordbapr_id' );
 			$table->addUniqueIndex( array( 'baseid', 'pos' ), 'unq_msordbapr_bid_pos' );
@@ -136,7 +136,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_product_attr' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_product_attr' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_base_product_attr' );
 
@@ -150,7 +150,7 @@ 
 			$table->addColumn( 'value', 'text', array( 'length' => 0xffff ) );
 			$table->addColumn( 'mtime', 'datetime', [] );
 			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
+			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
 
 			$table->setPrimaryKey( array( 'id' ), 'pk_msordbaprat_id' );
 			$table->addUniqueIndex( array( 'ordprodid', 'attrid', 'type', 'code' ), 'unq_msordbaprat_oid_aid_ty_cd' );
@@ -162,7 +162,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_service' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_service' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_base_service' );
 
@@ -182,7 +182,7 @@ 
 			$table->addColumn( 'taxflag', 'smallint', [] );
 			$table->addColumn( 'mtime', 'datetime', [] );
 			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
+			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
 
 			$table->setPrimaryKey( array( 'id' ), 'pk_msordbase_id' );
 			$table->addUniqueIndex( array( 'baseid', 'type', 'code' ), 'unq_msordbase_bid_type_code' );
@@ -196,7 +196,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_service_attr' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_service_attr' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_base_service_attr' );
 
@@ -210,7 +210,7 @@ 
 			$table->addColumn( 'value', 'text', array( 'length' => 0xffff ) );
 			$table->addColumn( 'mtime', 'datetime', [] );
 			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
+			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
 
 			$table->setPrimaryKey( array( 'id' ), 'pk_msordbaseat_id' );
 			$table->addUniqueIndex( array( 'ordservid', 'attrid', 'type', 'code' ), 'unq_msordbaseat_oid_aid_ty_cd' );
@@ -222,7 +222,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_coupon' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_coupon' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_base_coupon' );
 
@@ -233,7 +233,7 @@ 
 			$table->addColumn( 'code', 'string', array( 'length' => 32 ) );
 			$table->addColumn( 'mtime', 'datetime', [] );
 			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
+			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
 
 			$table->setPrimaryKey( array( 'id' ), 'pk_msordbaco_id' );
 			$table->addIndex( array( 'siteid', 'baseid', 'code' ), 'idx_msordbaco_sid_bid_code' );
@@ -249,7 +249,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order' );
 
@@ -268,7 +268,7 @@ 
 			$table->addColumn( 'chour', 'string', array( 'fixed' => 2 ) );
 			$table->addColumn( 'ctime', 'datetime', [] );
 			$table->addColumn( 'mtime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
+			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
 
 			$table->setPrimaryKey( array( 'id' ), 'pk_msord_id' );
 			$table->addIndex( array( 'siteid', 'type' ), 'idx_msord_sid_type' );
@@ -291,7 +291,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order_status' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_status' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_status' );
 
@@ -302,7 +302,7 @@ 
 			$table->addColumn( 'value', 'string', array( 'length' => 32 ) );
 			$table->addColumn( 'mtime', 'datetime', [] );
 			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
+			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
 
 			$table->setPrimaryKey( array( 'id' ), 'pk_msordst_id' );
 			$table->addIndex( array( 'siteid', 'parentid', 'type', 'value' ), 'idx_msordstatus_val_sid' );

lib/mshoplib/tests/MShop/Service/Provider/Payment/PayPalExpressTest.php

Spacing +1 added lines, -1 removed lines

@@ -159,7 +159,7 @@
 		$what = array( 'TOKEN' => 'UT-99999999' );
 
 		$error = '&ACK=Error&VERSION=87.0&BUILD=3136725&CORRELATIONID=1234567890&L_ERRORCODE0=0000&L_SHORTMESSAGE0=updatesync method error';
-		$success = '&TOKEN=UT-99999999&CORRELATIONID=1234567890&ACK=Success&VERSION=87.0&BUILD=3136725&PAYERID=PaypalUnitTestBuyer&TRANSACTIONID=111111110&PAYMENTSTATUS=Pending&PENDINGREASON=authorization&INVNUM=' . $this->order->getId();
+		$success = '&TOKEN=UT-99999999&CORRELATIONID=1234567890&ACK=Success&VERSION=87.0&BUILD=3136725&PAYERID=PaypalUnitTestBuyer&TRANSACTIONID=111111110&PAYMENTSTATUS=Pending&PENDINGREASON=authorization&INVNUM='.$this->order->getId();
 
 		$com = new TestPayPalExpress();
 		$com->addRule( $what, $error, $success );

lib/mshoplib/setup/unitperf/ProductAddBasePerfData.php

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
 
 			for( $j = 0; $j < $size; $j++ )
 			{
-				$code = 'perf-' . str_pad( $i * 1000 + $j, 5, '0', STR_PAD_LEFT );
+				$code = 'perf-'.str_pad( $i * 1000 + $j, 5, '0', STR_PAD_LEFT );
 
 				$productItem->setId( null );
 				$productItem->setCode( $code );
@@ -166,8 +166,8 @@ 
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', $prefix . '.domain', $domain ),
-			$search->compare( '==', $prefix . '.code', $code ),
+			$search->compare( '==', $prefix.'.domain', $domain ),
+			$search->compare( '==', $prefix.'.code', $code ),
 		);
 		$search->setConditions( $search->combine( '&&', $expr ) );
 		$result = $manager->searchItems( $search );

Braces +1 added lines, -2 removed lines

@@ -78,8 +78,7 @@
 		{
 			$count = (int) $this->count / 1000;
 			$size = 1000;
-		}
-		else
+		} else
 		{
 			$count = 1;
 			$size = $this->count;

lib/mshoplib/setup/unitperf/ProductAddSelectPerfData.php

Spacing +6 added lines, -6 removed lines

@@ -281,8 +281,8 @@ 
 				$cnt = $i * 1000 + $j;
 
 				$productItem->setId( null );
-				$productItem->setCode( 'perf-select-' . str_pad( $cnt, 5, '0', STR_PAD_LEFT ) );
-				$productItem->setLabel( 'Selection product ' . ( $cnt + 1 ) );
+				$productItem->setCode( 'perf-select-'.str_pad( $cnt, 5, '0', STR_PAD_LEFT ) );
+				$productItem->setLabel( 'Selection product '.( $cnt + 1 ) );
 				$productManager->saveItem( $productItem );
 
 				$selProducts[] = $productItem->getId();
@@ -290,8 +290,8 @@ 
 
 				$textItem->setId( null );
 				$textItem->setTypeId( $textTypeItems['short']->getId() );
-				$textItem->setLabel( 'Short description for ' . ( $cnt + 1 ) . '. selection product' );
-				$textItem->setContent( 'Short description for ' . ( $cnt + 1 ) . '. selection product' );
+				$textItem->setLabel( 'Short description for '.( $cnt + 1 ).'. selection product' );
+				$textItem->setContent( 'Short description for '.( $cnt + 1 ).'. selection product' );
 				$textManager->saveItem( $textItem );
 
 				$productListItem->setId( null );
@@ -302,8 +302,8 @@ 
 
 				$textItem->setId( null );
 				$textItem->setTypeId( $textTypeItems['long']->getId() );
-				$textItem->setLabel( 'Long description for ' . ( $cnt + 1 ) . '. selection product' );
-				$textItem->setContent( 'Long description for ' . ( $cnt + 1 ) . '. selection product. This may contain some "Lorem ipsum" text' );
+				$textItem->setLabel( 'Long description for '.( $cnt + 1 ).'. selection product' );
+				$textItem->setContent( 'Long description for '.( $cnt + 1 ).'. selection product. This may contain some "Lorem ipsum" text' );
 				$textManager->saveItem( $textItem );
 
 				$productListItem->setId( null );

Braces +1 added lines, -2 removed lines

@@ -78,8 +78,7 @@
 		{
 			$count = (int) $this->count / 1000;
 			$size = 1000;
-		}
-		else
+		} else
 		{
 			$count = 1;
 			$size = $this->count;

controller/common/tests/Controller/Common/Order/StandardTest.php

Doc Comments +3 added lines

@@ -595,6 +595,9 @@
 	}
 
 
+	/**
+	 * @param string $datepayment
+	 */
 	protected function getOrderItem( $datepayment )
 	{
 		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperCntl::getContext(), 'order' );

Braces +4 added lines, -2 removed lines

@@ -526,7 +526,8 @@ 
 			->setMethods( array( 'saveItem' ) )
 			->getMock();
 
-		$stockStub->expects( $this->once() )->method( 'saveItem' )->with( $this->callback( function( $item ) {
+		$stockStub->expects( $this->once() )->method( 'saveItem' )->with( $this->callback( function( $item )
+		{
 			return $item->getStocklevel() === 10;
 		} ) );
 
@@ -579,7 +580,8 @@ 
 			->setMethods( array( 'saveItem' ) )
 			->getMock();
 
-		$stockStub->expects( $this->once() )->method( 'saveItem' )->with( $this->callback( function( $item ) {
+		$stockStub->expects( $this->once() )->method( 'saveItem' )->with( $this->callback( function( $item )
+		{
 			return $item->getStocklevel() === 300;
 		} ) );
 

lib/mwlib/src/MW/Setup/Manager/Base.php

Spacing +4 added lines, -4 removed lines

@@ -48,11 +48,11 @@ 
 	{
 		if( strncmp( $classname, 'Aimeos\\MW\\Setup\\Task\\', 21 ) === 0 )
 		{
-			$fileName = substr( $classname, 21 ) . '.php';
+			$fileName = substr( $classname, 21 ).'.php';
 
 			foreach( self::$taskPaths as $path )
 			{
-				$file = $path . '/' . $fileName;
+				$file = $path.'/'.$fileName;
 
 				if( file_exists( $file ) === true && ( include_once $file ) !== false ) {
 					return true;
@@ -78,7 +78,7 @@ 
 			throw new \Aimeos\MW\Setup\Exception( sprintf( 'Invalid database adapter "%1$s"', $adapter ) );
 		}
 
-		$classname = '\\Aimeos\\MW\\Setup\\DBSchema\\' . ucwords( strtolower( $adapter ) );
+		$classname = '\\Aimeos\\MW\\Setup\\DBSchema\\'.ucwords( strtolower( $adapter ) );
 
 		if( class_exists( $classname ) === false ) {
 			throw new \Aimeos\MW\Setup\Exception( sprintf( 'Database schema class "%1$s" not found', $classname ) );
@@ -123,7 +123,7 @@ 
 				$this->includeFile( $item->getPathName() );
 
 				$taskname = substr( $item->getFilename(), 0, -4 );
-				$classname = '\\Aimeos\\MW\\Setup\\Task\\' . $taskname;
+				$classname = '\\Aimeos\\MW\\Setup\\Task\\'.$taskname;
 
 				if( class_exists( $classname ) === false ) {
 					throw new \Aimeos\MW\Setup\Exception( sprintf( 'Class "%1$s" not found', $classname ) );

lib/mshoplib/src/MShop/Common/Item/Address/Base.php

Doc Comments +2 added lines, -2 removed lines

@@ -675,7 +675,7 @@ 
 	 * Sets the longitude coordinate of the customer address
 	 *
 	 * @param string|null $value Longitude coordinate as decimal value or null
-	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item for chaining method calls
+	 * @return Base Customer item for chaining method calls
 	 */
 	public function setLongitude( $value )
 	{
@@ -708,7 +708,7 @@ 
 	 * Sets the latitude coordinate of the customer address
 	 *
 	 * @param string|null $value Latitude coordinate as decimal value or null
-	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item for chaining method calls
+	 * @return Base Customer item for chaining method calls
 	 */
 	public function setLatitude( $value )
 	{

Spacing +105 added lines, -105 removed lines

@@ -76,8 +76,8 @@ 
 	 */
 	public function getCompany()
 	{
-		if( isset( $this->data[$this->prefix . 'company'] ) ) {
-			return (string) $this->data[$this->prefix . 'company'];
+		if( isset( $this->data[$this->prefix.'company'] ) ) {
+			return (string) $this->data[$this->prefix.'company'];
 		}
 
 		return '';
@@ -94,7 +94,7 @@ 
 	{
 		if( $company == $this->getCompany() ) { return $this; }
 
-		$this->data[$this->prefix . 'company'] = (string) $company;
+		$this->data[$this->prefix.'company'] = (string) $company;
 		$this->setModified();
 
 		return $this;
@@ -107,8 +107,8 @@ 
 	 */
 	public function getVatID()
 	{
-		if( isset( $this->data[$this->prefix . 'vatid'] ) ) {
-			return (string) $this->data[$this->prefix . 'vatid'];
+		if( isset( $this->data[$this->prefix.'vatid'] ) ) {
+			return (string) $this->data[$this->prefix.'vatid'];
 		}
 
 		return '';
@@ -125,7 +125,7 @@ 
 	{
 		if( $vatid == $this->getVatID() ) { return $this; }
 
-		$this->data[$this->prefix . 'vatid'] = (string) $vatid;
+		$this->data[$this->prefix.'vatid'] = (string) $vatid;
 		$this->setModified();
 
 		return $this;
@@ -139,8 +139,8 @@ 
 	 */
 	public function getSalutation()
 	{
-		if( isset( $this->data[$this->prefix . 'salutation'] ) ) {
-			return (string) $this->data[$this->prefix . 'salutation'];
+		if( isset( $this->data[$this->prefix.'salutation'] ) ) {
+			return (string) $this->data[$this->prefix.'salutation'];
 		}
 
 		return \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN;
@@ -159,7 +159,7 @@ 
 
 		$this->checkSalutation( $salutation );
 
-		$this->data[$this->prefix . 'salutation'] = (string) $salutation;
+		$this->data[$this->prefix.'salutation'] = (string) $salutation;
 		$this->setModified();
 
 		return $this;
@@ -173,8 +173,8 @@ 
 	 */
 	public function getTitle()
 	{
-		if( isset( $this->data[$this->prefix . 'title'] ) ) {
-			return (string) $this->data[$this->prefix . 'title'];
+		if( isset( $this->data[$this->prefix.'title'] ) ) {
+			return (string) $this->data[$this->prefix.'title'];
 		}
 
 		return '';
@@ -191,7 +191,7 @@ 
 	{
 		if( $title == $this->getTitle() ) { return $this; }
 
-		$this->data[$this->prefix . 'title'] = (string) $title;
+		$this->data[$this->prefix.'title'] = (string) $title;
 		$this->setModified();
 
 		return $this;
@@ -205,8 +205,8 @@ 
 	 */
 	public function getFirstname()
 	{
-		if( isset( $this->data[$this->prefix . 'firstname'] ) ) {
-			return (string) $this->data[$this->prefix . 'firstname'];
+		if( isset( $this->data[$this->prefix.'firstname'] ) ) {
+			return (string) $this->data[$this->prefix.'firstname'];
 		}
 
 		return '';
@@ -223,7 +223,7 @@ 
 	{
 		if( $firstname == $this->getFirstname() ) { return $this; }
 
-		$this->data[$this->prefix . 'firstname'] = (string) $firstname;
+		$this->data[$this->prefix.'firstname'] = (string) $firstname;
 		$this->setModified();
 
 		return $this;
@@ -237,8 +237,8 @@ 
 	 */
 	public function getLastname()
 	{
-		if( isset( $this->data[$this->prefix . 'lastname'] ) ) {
-			return (string) $this->data[$this->prefix . 'lastname'];
+		if( isset( $this->data[$this->prefix.'lastname'] ) ) {
+			return (string) $this->data[$this->prefix.'lastname'];
 		}
 
 		return '';
@@ -255,7 +255,7 @@ 
 	{
 		if( $lastname == $this->getLastname() ) { return $this; }
 
-		$this->data[$this->prefix . 'lastname'] = (string) $lastname;
+		$this->data[$this->prefix.'lastname'] = (string) $lastname;
 		$this->setModified();
 
 		return $this;
@@ -269,8 +269,8 @@ 
 	 */
 	public function getAddress1()
 	{
-		if( isset( $this->data[$this->prefix . 'address1'] ) ) {
-			return (string) $this->data[$this->prefix . 'address1'];
+		if( isset( $this->data[$this->prefix.'address1'] ) ) {
+			return (string) $this->data[$this->prefix.'address1'];
 		}
 
 		return '';
@@ -287,7 +287,7 @@ 
 	{
 		if( $address1 == $this->getAddress1() ) { return $this; }
 
-		$this->data[$this->prefix . 'address1'] = (string) $address1;
+		$this->data[$this->prefix.'address1'] = (string) $address1;
 		$this->setModified();
 
 		return $this;
@@ -301,8 +301,8 @@ 
 	 */
 	public function getAddress2()
 	{
-		if( isset( $this->data[$this->prefix . 'address2'] ) ) {
-			return (string) $this->data[$this->prefix . 'address2'];
+		if( isset( $this->data[$this->prefix.'address2'] ) ) {
+			return (string) $this->data[$this->prefix.'address2'];
 		}
 
 		return '';
@@ -319,7 +319,7 @@ 
 	{
 		if( $address2 == $this->getAddress2() ) { return $this; }
 
-		$this->data[$this->prefix . 'address2'] = (string) $address2;
+		$this->data[$this->prefix.'address2'] = (string) $address2;
 		$this->setModified();
 
 		return $this;
@@ -333,8 +333,8 @@ 
 	 */
 	public function getAddress3()
 	{
-		if( isset( $this->data[$this->prefix . 'address3'] ) ) {
-			return (string) $this->data[$this->prefix . 'address3'];
+		if( isset( $this->data[$this->prefix.'address3'] ) ) {
+			return (string) $this->data[$this->prefix.'address3'];
 		}
 
 		return '';
@@ -351,7 +351,7 @@ 
 	{
 		if( $address3 == $this->getAddress3() ) { return $this; }
 
-		$this->data[$this->prefix . 'address3'] = (string) $address3;
+		$this->data[$this->prefix.'address3'] = (string) $address3;
 		$this->setModified();
 
 		return $this;
@@ -365,8 +365,8 @@ 
 	 */
 	public function getPostal()
 	{
-		if( isset( $this->data[$this->prefix . 'postal'] ) ) {
-			return (string) $this->data[$this->prefix . 'postal'];
+		if( isset( $this->data[$this->prefix.'postal'] ) ) {
+			return (string) $this->data[$this->prefix.'postal'];
 		}
 
 		return '';
@@ -383,7 +383,7 @@ 
 	{
 		if( $postal == $this->getPostal() ) { return $this; }
 
-		$this->data[$this->prefix . 'postal'] = (string) $postal;
+		$this->data[$this->prefix.'postal'] = (string) $postal;
 		$this->setModified();
 
 		return $this;
@@ -397,8 +397,8 @@ 
 	 */
 	public function getCity()
 	{
-		if( isset( $this->data[$this->prefix . 'city'] ) ) {
-			return (string) $this->data[$this->prefix . 'city'];
+		if( isset( $this->data[$this->prefix.'city'] ) ) {
+			return (string) $this->data[$this->prefix.'city'];
 		}
 
 		return '';
@@ -415,7 +415,7 @@ 
 	{
 		if( $city == $this->getCity() ) { return $this; }
 
-		$this->data[$this->prefix . 'city'] = (string) $city;
+		$this->data[$this->prefix.'city'] = (string) $city;
 		$this->setModified();
 
 		return $this;
@@ -429,8 +429,8 @@ 
 	 */
 	public function getState()
 	{
-		if( isset( $this->data[$this->prefix . 'state'] ) ) {
-			return (string) $this->data[$this->prefix . 'state'];
+		if( isset( $this->data[$this->prefix.'state'] ) ) {
+			return (string) $this->data[$this->prefix.'state'];
 		}
 
 		return '';
@@ -447,7 +447,7 @@ 
 	{
 		if( $state == $this->getState() ) { return $this; }
 
-		$this->data[$this->prefix . 'state'] = (string) $state;
+		$this->data[$this->prefix.'state'] = (string) $state;
 		$this->setModified();
 
 		return $this;
@@ -461,8 +461,8 @@ 
 	 */
 	public function getCountryId()
 	{
-		if( isset( $this->data[$this->prefix . 'countryid'] ) ) {
-			return (string) $this->data[$this->prefix . 'countryid'];
+		if( isset( $this->data[$this->prefix.'countryid'] ) ) {
+			return (string) $this->data[$this->prefix.'countryid'];
 		}
 
 		return null;
@@ -479,7 +479,7 @@ 
 	{
 		if( $countryid === $this->getCountryId() ) { return $this; }
 
-		$this->data[$this->prefix . 'countryid'] = strtoupper( (string) $countryid );
+		$this->data[$this->prefix.'countryid'] = strtoupper( (string) $countryid );
 		$this->setModified();
 
 		return $this;
@@ -493,8 +493,8 @@ 
 	 */
 	public function getLanguageId()
 	{
-		if( isset( $this->data[$this->prefix . 'languageid'] ) ) {
-			return (string) $this->data[$this->prefix . 'languageid'];
+		if( isset( $this->data[$this->prefix.'languageid'] ) ) {
+			return (string) $this->data[$this->prefix.'languageid'];
 		}
 
 		return null;
@@ -511,7 +511,7 @@ 
 	{
 		if( $langid === $this->getLanguageId() ) { return $this; }
 
-		$this->data[$this->prefix . 'languageid'] = (string) $langid;
+		$this->data[$this->prefix.'languageid'] = (string) $langid;
 		$this->setModified();
 
 		return $this;
@@ -525,8 +525,8 @@ 
 	 */
 	public function getTelephone()
 	{
-		if( isset( $this->data[$this->prefix . 'telephone'] ) ) {
-			return (string) $this->data[$this->prefix . 'telephone'];
+		if( isset( $this->data[$this->prefix.'telephone'] ) ) {
+			return (string) $this->data[$this->prefix.'telephone'];
 		}
 
 		return '';
@@ -543,7 +543,7 @@ 
 	{
 		if( $telephone == $this->getTelephone() ) { return $this; }
 
-		$this->data[$this->prefix . 'telephone'] = (string) $telephone;
+		$this->data[$this->prefix.'telephone'] = (string) $telephone;
 		$this->setModified();
 
 		return $this;
@@ -557,8 +557,8 @@ 
 	 */
 	public function getEmail()
 	{
-		if( isset( $this->data[$this->prefix . 'email'] ) ) {
-			return (string) $this->data[$this->prefix . 'email'];
+		if( isset( $this->data[$this->prefix.'email'] ) ) {
+			return (string) $this->data[$this->prefix.'email'];
 		}
 
 		return '';
@@ -579,7 +579,7 @@ 
 			throw new \Aimeos\MShop\Exception( sprintf( 'Invalid characters in email address: "%1$s"', $email ) );
 		}
 
-		$this->data[$this->prefix . 'email'] = (string) $email;
+		$this->data[$this->prefix.'email'] = (string) $email;
 		$this->setModified();
 
 		return $this;
@@ -593,8 +593,8 @@ 
 	 */
 	public function getTelefax()
 	{
-		if( isset( $this->data[$this->prefix . 'telefax'] ) ) {
-			return (string) $this->data[$this->prefix . 'telefax'];
+		if( isset( $this->data[$this->prefix.'telefax'] ) ) {
+			return (string) $this->data[$this->prefix.'telefax'];
 		}
 
 		return '';
@@ -611,7 +611,7 @@ 
 	{
 		if( $telefax == $this->getTelefax() ) { return $this; }
 
-		$this->data[$this->prefix . 'telefax'] = (string) $telefax;
+		$this->data[$this->prefix.'telefax'] = (string) $telefax;
 		$this->setModified();
 
 		return $this;
@@ -625,8 +625,8 @@ 
 	 */
 	public function getWebsite()
 	{
-		if( isset( $this->data[$this->prefix . 'website'] ) ) {
-			return (string) $this->data[$this->prefix . 'website'];
+		if( isset( $this->data[$this->prefix.'website'] ) ) {
+			return (string) $this->data[$this->prefix.'website'];
 		}
 
 		return '';
@@ -649,7 +649,7 @@ 
 			throw new \Aimeos\MShop\Exception( sprintf( 'Invalid web site URL "%1$s"', $website ) );
 		}
 
-		$this->data[$this->prefix . 'website'] = (string) $website;
+		$this->data[$this->prefix.'website'] = (string) $website;
 		$this->setModified();
 
 		return $this;
@@ -663,8 +663,8 @@ 
 	 */
 	public function getLongitude()
 	{
-		if( isset( $this->data[$this->prefix . 'longitude'] ) ) {
-			return (string) $this->data[$this->prefix . 'longitude'];
+		if( isset( $this->data[$this->prefix.'longitude'] ) ) {
+			return (string) $this->data[$this->prefix.'longitude'];
 		}
 
 		return null;
@@ -682,7 +682,7 @@ 
 		if( $value == '' ) { $value = null; }
 		if( $value === $this->getLongitude() ) { return $this; }
 
-		$this->data[$this->prefix . 'longitude'] = $value;
+		$this->data[$this->prefix.'longitude'] = $value;
 		$this->setModified();
 
 		return $this;
@@ -696,8 +696,8 @@ 
 	 */
 	public function getLatitude()
 	{
-		if( isset( $this->data[$this->prefix . 'latitude'] ) ) {
-			return (string) $this->data[$this->prefix . 'latitude'];
+		if( isset( $this->data[$this->prefix.'latitude'] ) ) {
+			return (string) $this->data[$this->prefix.'latitude'];
 		}
 
 		return null;
@@ -715,7 +715,7 @@ 
 		if( $value == '' ) { $value = null; }
 		if( $value === $this->getLatitude() ) { return $this; }
 
-		$this->data[$this->prefix . 'latitude'] = $value;
+		$this->data[$this->prefix.'latitude'] = $value;
 		$this->setModified();
 
 		return $this;
@@ -729,8 +729,8 @@ 
 	 */
 	public function getFlag()
 	{
-		if( isset( $this->data[$this->prefix . 'flag'] ) ) {
-			return (int) $this->data[$this->prefix . 'flag'];
+		if( isset( $this->data[$this->prefix.'flag'] ) ) {
+			return (int) $this->data[$this->prefix.'flag'];
 		}
 
 		return 0;
@@ -747,7 +747,7 @@ 
 	{
 		if( $flag == $this->getFlag() ) { return $this; }
 
-		$this->data[$this->prefix . 'flag'] = (int) $flag;
+		$this->data[$this->prefix.'flag'] = (int) $flag;
 		$this->setModified();
 
 		return $this;
@@ -816,27 +816,27 @@ 
 		{
 			switch( $key )
 			{
-				case $this->prefix . 'salutation': $this->setSalutation( $value ); break;
-				case $this->prefix . 'company': $this->setCompany( $value ); break;
-				case $this->prefix . 'vatid': $this->setVatID( $value ); break;
-				case $this->prefix . 'title': $this->setTitle( $value ); break;
-				case $this->prefix . 'firstname': $this->setFirstname( $value ); break;
-				case $this->prefix . 'lastname': $this->setLastname( $value ); break;
-				case $this->prefix . 'address1': $this->setAddress1( $value ); break;
-				case $this->prefix . 'address2': $this->setAddress2( $value ); break;
-				case $this->prefix . 'address3': $this->setAddress3( $value ); break;
-				case $this->prefix . 'postal': $this->setPostal( $value ); break;
-				case $this->prefix . 'city': $this->setCity( $value ); break;
-				case $this->prefix . 'state': $this->setState( $value ); break;
-				case $this->prefix . 'countryid': $this->setCountryId( $value ); break;
-				case $this->prefix . 'languageid': $this->setLanguageId( $value ); break;
-				case $this->prefix . 'telephone': $this->setTelephone( $value ); break;
-				case $this->prefix . 'telefax': $this->setTelefax( $value ); break;
-				case $this->prefix . 'email': $this->setEmail( $value ); break;
-				case $this->prefix . 'website': $this->setWebsite( $value ); break;
-				case $this->prefix . 'longitude': $this->setLongitude( $value ); break;
-				case $this->prefix . 'latitude': $this->setLatitude( $value ); break;
-				case $this->prefix . 'flag': $this->setFlag( $value ); break;
+				case $this->prefix.'salutation': $this->setSalutation( $value ); break;
+				case $this->prefix.'company': $this->setCompany( $value ); break;
+				case $this->prefix.'vatid': $this->setVatID( $value ); break;
+				case $this->prefix.'title': $this->setTitle( $value ); break;
+				case $this->prefix.'firstname': $this->setFirstname( $value ); break;
+				case $this->prefix.'lastname': $this->setLastname( $value ); break;
+				case $this->prefix.'address1': $this->setAddress1( $value ); break;
+				case $this->prefix.'address2': $this->setAddress2( $value ); break;
+				case $this->prefix.'address3': $this->setAddress3( $value ); break;
+				case $this->prefix.'postal': $this->setPostal( $value ); break;
+				case $this->prefix.'city': $this->setCity( $value ); break;
+				case $this->prefix.'state': $this->setState( $value ); break;
+				case $this->prefix.'countryid': $this->setCountryId( $value ); break;
+				case $this->prefix.'languageid': $this->setLanguageId( $value ); break;
+				case $this->prefix.'telephone': $this->setTelephone( $value ); break;
+				case $this->prefix.'telefax': $this->setTelefax( $value ); break;
+				case $this->prefix.'email': $this->setEmail( $value ); break;
+				case $this->prefix.'website': $this->setWebsite( $value ); break;
+				case $this->prefix.'longitude': $this->setLongitude( $value ); break;
+				case $this->prefix.'latitude': $this->setLatitude( $value ); break;
+				case $this->prefix.'flag': $this->setFlag( $value ); break;
 				default: $unknown[$key] = $value;
 			}
 		}
@@ -855,27 +855,27 @@ 
 	{
 		$list = parent::toArray( $private );
 
-		$list[$this->prefix . 'salutation'] = $this->getSalutation();
-		$list[$this->prefix . 'company'] = $this->getCompany();
-		$list[$this->prefix . 'vatid'] = $this->getVatID();
-		$list[$this->prefix . 'title'] = $this->getTitle();
-		$list[$this->prefix . 'firstname'] = $this->getFirstname();
-		$list[$this->prefix . 'lastname'] = $this->getLastname();
-		$list[$this->prefix . 'address1'] = $this->getAddress1();
-		$list[$this->prefix . 'address2'] = $this->getAddress2();
-		$list[$this->prefix . 'address3'] = $this->getAddress3();
-		$list[$this->prefix . 'postal'] = $this->getPostal();
-		$list[$this->prefix . 'city'] = $this->getCity();
-		$list[$this->prefix . 'state'] = $this->getState();
-		$list[$this->prefix . 'countryid'] = $this->getCountryId();
-		$list[$this->prefix . 'languageid'] = $this->getLanguageId();
-		$list[$this->prefix . 'telephone'] = $this->getTelephone();
-		$list[$this->prefix . 'telefax'] = $this->getTelefax();
-		$list[$this->prefix . 'email'] = $this->getEmail();
-		$list[$this->prefix . 'website'] = $this->getWebsite();
-		$list[$this->prefix . 'longitude'] = $this->getLongitude();
-		$list[$this->prefix . 'latitude'] = $this->getLatitude();
-		$list[$this->prefix . 'flag'] = $this->getFlag();
+		$list[$this->prefix.'salutation'] = $this->getSalutation();
+		$list[$this->prefix.'company'] = $this->getCompany();
+		$list[$this->prefix.'vatid'] = $this->getVatID();
+		$list[$this->prefix.'title'] = $this->getTitle();
+		$list[$this->prefix.'firstname'] = $this->getFirstname();
+		$list[$this->prefix.'lastname'] = $this->getLastname();
+		$list[$this->prefix.'address1'] = $this->getAddress1();
+		$list[$this->prefix.'address2'] = $this->getAddress2();
+		$list[$this->prefix.'address3'] = $this->getAddress3();
+		$list[$this->prefix.'postal'] = $this->getPostal();
+		$list[$this->prefix.'city'] = $this->getCity();
+		$list[$this->prefix.'state'] = $this->getState();
+		$list[$this->prefix.'countryid'] = $this->getCountryId();
+		$list[$this->prefix.'languageid'] = $this->getLanguageId();
+		$list[$this->prefix.'telephone'] = $this->getTelephone();
+		$list[$this->prefix.'telefax'] = $this->getTelefax();
+		$list[$this->prefix.'email'] = $this->getEmail();
+		$list[$this->prefix.'website'] = $this->getWebsite();
+		$list[$this->prefix.'longitude'] = $this->getLongitude();
+		$list[$this->prefix.'latitude'] = $this->getLatitude();
+		$list[$this->prefix.'flag'] = $this->getFlag();
 
 		return $list;
 	}

lib/mshoplib/src/MShop/Index/Manager/Text/Standard.php

Spacing +3 added lines, -3 removed lines

@@ -368,7 +368,7 @@ 
 		 * @see mshop/index/manager/text/decorators/global
 		 */
 
-		return $this->getSubManagerBase( 'index', 'text/' . $manager, $name );
+		return $this->getSubManagerBase( 'index', 'text/'.$manager, $name );
 	}
 
 
@@ -857,7 +857,7 @@ 
 
 		try {
 			$stmt->execute()->finish();
-		} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates
+		} catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates
 	}
 
 
@@ -874,7 +874,7 @@ 
 
 		$search = $manager->createSearch( true );
 		$expr = array(
-			$search->compare( '==', $domain . '.id', $ids ),
+			$search->compare( '==', $domain.'.id', $ids ),
 			$search->getConditions()
 		);
 		$search->setConditions( $search->combine( '&&', $expr ) );

Braces +6 added lines, -2 removed lines

@@ -857,9 +857,13 @@
 		$stmt->bind( 10, $siteid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 		$stmt->bind( 11, $date ); //ctime
 
-		try {
+		try
+		{
 			$stmt->execute()->finish();
-		} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates
+		}
+		catch( \Aimeos\MW\DB\Exception $e )
+		{
+; } // Ignore duplicates
 	}