aimeos / aimeos-core

lib/mshoplib/setup/default/DemoAddProductData.php

Braces +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
 		{
 			$this->addDemoData();
 			$this->status( 'added' );
-		}
-		else
+		} else
 		{
 			$this->status( 'removed' );
 		}

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 	protected function addDemoData()
 	{
 		$ds = DIRECTORY_SEPARATOR;
-		$path = __DIR__ . $ds . 'data' . $ds . 'demo-product.php';
+		$path = __DIR__.$ds.'data'.$ds.'demo-product.php';
 
 		if( ( $data = include( $path ) ) == false ) {
 			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for product domain', $path ) );

lib/mshoplib/src/MAdmin/Cache/Manager/Standard.php

Braces +10 added lines, -4 removed lines

@@ -201,9 +201,12 @@ 
 			);
 			$dbm = $context->getDatabaseManager();
 
-			try {
+			try
+			{
 				$this->object = \Aimeos\MW\Cache\Factory::createManager( $name, $config, $dbm );
-			} catch( \Exception $e ) {
+			}
+			catch( \Exception $e )
+			{
 				$this->object = \Aimeos\MW\Cache\Factory::createManager( 'DB', $config, $dbm );
 			}
 		}
@@ -265,9 +268,12 @@ 
 	 */
 	public function createItem()
 	{
-		try {
+		try
+		{
 			$values = array( 'siteid' => $this->getContext()->getLocale()->getSiteId() );
-		} catch( \Exception $e ) {
+		}
+		catch( \Exception $e )
+		{
 			$values = array( 'siteid' => null );
 		}
 

lib/mshoplib/src/MShop/Common/Manager/Lists/Base.php

Braces +1 added lines, -2 removed lines

@@ -243,8 +243,7 @@
 				$stmt->bind( 8, $pos, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 
 				$stmt->execute()->finish();
-			}
-			else
+			} else
 			{
 				$sql = $this->getSqlConfig( $cfgPath . 'getposmax' );
 

Spacing +29 added lines, -29 removed lines

@@ -65,7 +65,7 @@ 
 	public function aggregate( \Aimeos\MW\Criteria\Iface $search, $key )
 	{
 		$required = array( trim( $this->prefix, '.' ) );
-		return $this->aggregateBase( $search, $key, $this->getConfigPath() . 'aggregate', $required );
+		return $this->aggregateBase( $search, $key, $this->getConfigPath().'aggregate', $required );
 	}
 
 
@@ -77,7 +77,7 @@ 
 	public function createItem()
 	{
 		$values = array(
-			$this->prefix . 'siteid' => $this->getContext()->getLocale()->getSiteId()
+			$this->prefix.'siteid' => $this->getContext()->getLocale()->getSiteId()
 		);
 		return $this->createItemBase( $values );
 
@@ -119,7 +119,7 @@ 
 			}
 
 			$time = date( 'Y-m-d H:i:s' );
-			$stmt = $this->getCachedStatement( $conn, $this->getConfigPath() . $type );
+			$stmt = $this->getCachedStatement( $conn, $this->getConfigPath().$type );
 
 			$stmt->bind( 1, $item->getParentId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 			$stmt->bind( 2, $item->getTypeId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
@@ -146,7 +146,7 @@ 
 			if( $fetch === true )
 			{
 				if( $id === null ) {
-					$path = $this->getConfigPath() . 'newid';
+					$path = $this->getConfigPath().'newid';
 					$item->setId( $this->newId( $conn, $path ) );
 				} else {
 					$item->setId( $id ); // modified false
@@ -172,7 +172,7 @@ 
 	 */
 	public function deleteItems( array $ids )
 	{
-		$this->deleteItemsBase( $ids, $this->getConfigPath() . 'delete' );
+		$this->deleteItemsBase( $ids, $this->getConfigPath().'delete' );
 	}
 
 
@@ -244,7 +244,7 @@ 
 			{
 				$newpos = $pos;
 
-				$sql = $this->getSqlConfig( $cfgPath . 'move' );
+				$sql = $this->getSqlConfig( $cfgPath.'move' );
 
 				$stmt = $conn->create( $sql );
 				$stmt->bind( 1, +1, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
@@ -260,7 +260,7 @@ 
 			}
 			else
 			{
-				$sql = $this->getSqlConfig( $cfgPath . 'getposmax' );
+				$sql = $this->getSqlConfig( $cfgPath.'getposmax' );
 
 				$stmt = $conn->create( $sql );
 
@@ -278,7 +278,7 @@ 
 				}
 			}
 
-			$sql = $this->getSqlConfig( $cfgPath . 'updatepos' );
+			$sql = $this->getSqlConfig( $cfgPath.'updatepos' );
 
 			$stmt = $conn->create( $sql );
 			$stmt->bind( 1, $newpos, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
@@ -295,7 +295,7 @@ 
 
 			if( $oldpos > 0 )
 			{
-				$sql = $this->getSqlConfig( $cfgPath . 'move' );
+				$sql = $this->getSqlConfig( $cfgPath.'move' );
 
 				$stmt = $conn->create( $sql );
 				$stmt->bind( 1, -1, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
@@ -345,8 +345,8 @@ 
 			}
 
 			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
-			$cfgPathSearch = $this->getConfigPath() . 'search';
-			$cfgPathCount = $this->getConfigPath() . 'count';
+			$cfgPathSearch = $this->getConfigPath().'search';
+			$cfgPathCount = $this->getConfigPath().'count';
 
 			$name = trim( $this->prefix, '.' );
 			$required = array( $name );
@@ -355,12 +355,12 @@ 
 
 			while( ( $row = $results->fetch() ) !== false )
 			{
-				if( ( $row[$this->prefix . 'config'] = json_decode( $row[$this->prefix . 'config'], true ) ) === null ) {
-					$row[$this->prefix . 'config'] = [];
+				if( ( $row[$this->prefix.'config'] = json_decode( $row[$this->prefix.'config'], true ) ) === null ) {
+					$row[$this->prefix.'config'] = [];
 				}
 
-				$map[$row[$this->prefix . 'id']] = $row;
-				$typeIds[$row[$this->prefix . 'typeid']] = null;
+				$map[$row[$this->prefix.'id']] = $row;
+				$typeIds[$row[$this->prefix.'typeid']] = null;
 			}
 
 			$dbm->release( $conn, $dbname );
@@ -375,19 +375,19 @@ 
 		{
 			$typeManager = $this->getObject()->getSubManager( 'type' );
 			$typeSearch = $typeManager->createSearch();
-			$typeSearch->setConditions( $typeSearch->compare( '==', $name . '.type.id', array_keys( $typeIds ) ) );
+			$typeSearch->setConditions( $typeSearch->compare( '==', $name.'.type.id', array_keys( $typeIds ) ) );
 			$typeSearch->setSlice( 0, $search->getSliceSize() );
 			$typeItems = $typeManager->searchItems( $typeSearch );
 
 			foreach( $map as $id => $row )
 			{
-				if( isset( $typeItems[$row[$this->prefix . 'typeid']] ) )
+				if( isset( $typeItems[$row[$this->prefix.'typeid']] ) )
 				{
-					$row[$this->prefix . 'type'] = $typeItems[$row[$this->prefix . 'typeid']]->getCode();
-					$row[$this->prefix . 'typename'] = $typeItems[$row[$this->prefix . 'typeid']]->getName();
+					$row[$this->prefix.'type'] = $typeItems[$row[$this->prefix.'typeid']]->getCode();
+					$row[$this->prefix.'typename'] = $typeItems[$row[$this->prefix.'typeid']]->getName();
 				}
 
-				$items[$row[$this->prefix . 'id']] = $this->createItemBase( $row );
+				$items[$row[$this->prefix.'id']] = $this->createItemBase( $row );
 			}
 		}
 
@@ -426,8 +426,8 @@ 
 			}
 
 			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
-			$cfgPathSearch = $this->getConfigPath() . 'search';
-			$cfgPathCount = $this->getConfigPath() . 'count';
+			$cfgPathSearch = $this->getConfigPath().'search';
+			$cfgPathCount = $this->getConfigPath().'count';
 
 			$name = trim( $this->prefix, '.' );
 			$required = array( $name );
@@ -435,7 +435,7 @@ 
 			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
 
 			while( ( $row = $results->fetch() ) !== false ) {
-				$map[$row[$this->prefix . 'domain']][] = $row[$this->prefix . 'refid'];
+				$map[$row[$this->prefix.'domain']][] = $row[$this->prefix.'refid'];
 			}
 
 			$dbm->release( $conn, $dbname );
@@ -453,7 +453,7 @@ 
 
 			$search = $manager->createSearch( true );
 			$expr = array(
-				$search->compare( '==', str_replace( '/', '.', $domain ) . '.id', $list ),
+				$search->compare( '==', str_replace( '/', '.', $domain ).'.id', $list ),
 				$search->getConditions(),
 			);
 			$search->setConditions( $search->combine( '&&', $expr ) );
@@ -482,13 +482,13 @@ 
 			$expr = [$object->getConditions()];
 
 			$exprTwo = [];
-			$exprTwo[] = $object->compare( '<=', $prefix . '.datestart', $this->date );
-			$exprTwo[] = $object->compare( '==', $prefix . '.datestart', null );
+			$exprTwo[] = $object->compare( '<=', $prefix.'.datestart', $this->date );
+			$exprTwo[] = $object->compare( '==', $prefix.'.datestart', null );
 			$expr[] = $object->combine( '||', $exprTwo );
 
 			$exprTwo = [];
-			$exprTwo[] = $object->compare( '>=', $prefix . '.dateend', $this->date );
-			$exprTwo[] = $object->compare( '==', $prefix . '.dateend', null );
+			$exprTwo[] = $object->compare( '>=', $prefix.'.dateend', $this->date );
+			$exprTwo[] = $object->compare( '==', $prefix.'.dateend', null );
 			$expr[] = $object->combine( '||', $exprTwo );
 
 			$object->setConditions( $object->combine( '&&', $expr ) );
@@ -509,7 +509,7 @@ 
 	 */
 	public function getSubManager( $manager, $name = null )
 	{
-		return $this->getSubManagerBase( 'common', 'lists/' . $manager, $name );
+		return $this->getSubManagerBase( 'common', 'lists/'.$manager, $name );
 	}
 
 

lib/mshoplib/src/MShop/Coupon/Provider/FixedRebate.php

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
 			if( isset( $config['fixedrebate.rebate'][$currency] ) ) {
 				$rebate = $config['fixedrebate.rebate'][$currency];
 			}
-		}
-		else
+		} else
 		{
 			$rebate = $config['fixedrebate.rebate'];
 		}

lib/mshoplib/src/MShop/Plugin/Manager/Standard.php

Spacing +1 added lines, -1 removed lines

@@ -209,7 +209,7 @@
 	{
 		$path = 'mshop/plugin/manager/submanagers';
 
-		return $this->getResourceTypeBase( 'plugin', $path, array( 'type'), $withsub );
+		return $this->getResourceTypeBase( 'plugin', $path, array( 'type' ), $withsub );
 	}
 
 

Braces +1 added lines, -2 removed lines

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

lib/mshoplib/src/MShop/Service/Provider/Decorator/Country.php

Braces +3 added lines, -2 removed lines

@@ -118,10 +118,11 @@
 			) {
 				return false;
 			}
-		}
-		else if( isset( $addresses[$paymentType] ) ) // use billing address if no delivery address is available
+		} else if( isset( $addresses[$paymentType] ) ) {
+			// use billing address if no delivery address is available
 		{
 			$code = strtoupper( $addresses[$paymentType]->getCountryId() );
+		}
 
 			if( $this->checkCountryCode( $code, 'country.delivery-include' ) === false
 				|| $this->checkCountryCode( $code, 'country.delivery-exclude' ) === true

lib/mwlib/src/MW/Criteria/Attribute/Standard.php

Spacing +2 added lines, -2 removed lines

@@ -90,8 +90,8 @@
 
 		foreach( $required as $entry )
 		{
-			if ( !isset($params[$entry]) ) {
-				throw new \Aimeos\MW\Common\Exception( sprintf('Required parameter "%1$s" is missing', $entry) );
+			if( !isset( $params[$entry] ) ) {
+				throw new \Aimeos\MW\Common\Exception( sprintf( 'Required parameter "%1$s" is missing', $entry ) );
 			}
 		}
 

lib/mwlib/src/MW/Criteria/Expression/Base.php

Braces +1 added lines, -2 removed lines

@@ -226,8 +226,7 @@
 
 					$params[] = implode( ',', $list );
 				}
-			}
-			else
+			} else
 			{
 				$params[] = $this->escape( '==', $this->getParamType( $string ), $string );
 			}

Spacing +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
 	 */
 	public static function createFunction( $name, array $params )
 	{
-		return $name . '(' . self::createSignature( $params ) . ')';
+		return $name.'('.self::createSignature( $params ).')';
 	}
 
 
@@ -55,9 +55,9 @@ 
 				case 'double':
 					$list[] = $param; break;
 				case 'array':
-					$list[] = '[' . self::createSignature( $param ) . ']'; break;
+					$list[] = '['.self::createSignature( $param ).']'; break;
 				default:
-					$list[] = '"' . $param . '"';
+					$list[] = '"'.$param.'"';
 			}
 		}
 
@@ -77,7 +77,7 @@ 
 	protected function isFunction( &$name, array &$params )
 	{
 		$len = strlen( $name );
-		if( $len === 0 || $name[$len-1] !== ')' ) { return false; }
+		if( $len === 0 || $name[$len - 1] !== ')' ) { return false; }
 
 		if( ( $pos = strpos( $name, '(' ) ) === false ) {
 			throw new \Aimeos\MW\Common\Exception( 'Missing opening bracket for function syntax' );
@@ -102,7 +102,7 @@ 
 			$params = $this->extractParams( $matches[1] );
 		}
 
-		$name = $namestr . '()';
+		$name = $namestr.'()';
 		return true;
 	}
 
@@ -130,7 +130,7 @@ 
 			$count = count( $params );
 
 			for( $i = 0; $i < $count; $i++ ) {
-				$find[$i] = '$' . ( $i + 1 );
+				$find[$i] = '$'.( $i + 1 );
 			}
 
 			return str_replace( $find, $params, $transname );
@@ -168,7 +168,7 @@ 
 	 */
 	protected function setPlugins( array $plugins )
 	{
-		\Aimeos\MW\Common\Base::checkClassList('\\Aimeos\\MW\\Criteria\\Plugin\\Iface', $plugins);
+		\Aimeos\MW\Common\Base::checkClassList( '\\Aimeos\\MW\\Criteria\\Plugin\\Iface', $plugins );
 
 		$this->plugins = $plugins;
 	}

lib/mwlib/src/MW/Criteria/Expression/Compare/PHP.php

Braces +2 added lines, -4 removed lines

@@ -185,12 +185,10 @@
 			}
 
 			return 'string';
-		}
-		else if( strpos( $item, '.' ) !== false )
+		} else if( strpos( $item, '.' ) !== false )
 		{
 			return 'float';
-		}
-		else if( ctype_digit( $item ) !== false )
+		} else if( ctype_digit( $item ) !== false )
 		{
 			return 'int';
 		}

Spacing +8 added lines, -8 removed lines

@@ -62,7 +62,7 @@ 
 	protected function createTerm( $name, $type, $value )
 	{
 		$escaped = $this->escape( $this->getOperator(), $type, $value );
-		return $name . ' ' . self::$operators[$this->getOperator()] . ' ' . $escaped;
+		return $name.' '.self::$operators[$this->getOperator()].' '.$escaped;
 	}
 
 
@@ -77,9 +77,9 @@ 
 		switch( $this->getOperator() )
 		{
 			case '==':
-				return $name . ' === null';
+				return $name.' === null';
 			case '!=':
-				return $name . ' !== null';
+				return $name.' !== null';
 			default:
 				throw new \Aimeos\MW\Common\Exception( sprintf( 'null value not allowed for operator "%1$s"', $this->getOperator() ) );
 		}
@@ -103,7 +103,7 @@ 
 				foreach( (array) $this->getValue() as $value ) {
 					$list[] = $this->createTerm( $name, $type, $value );
 				}
-				return '( ' . implode( ' || ', $list ) . ' )';
+				return '( '.implode( ' || ', $list ).' )';
 
 			case '!=':
 
@@ -111,7 +111,7 @@ 
 				foreach( (array) $this->getValue() as $value ) {
 					$list[] = $this->createTerm( $name, $type, $value );
 				}
-				return '( ' . implode( ' && ', $list ) . ' )';
+				return '( '.implode( ' && ', $list ).' )';
 
 			default:
 				throw new \Aimeos\MW\Common\Exception( sprintf( 'List Term not allowed for operator "%1$s"', $this->getOperator() ) );
@@ -135,10 +135,10 @@ 
 		$string = $this->escape( $this->getOperator(), $type, $val );
 
 		while( ( $val = next( $values ) ) !== false ) {
-			$string .= ',' . $this->escape( $this->getOperator(), $type, $val );
+			$string .= ','.$this->escape( $this->getOperator(), $type, $val );
 		}
 
-		return 'array(' . $string . ')';
+		return 'array('.$string.')';
 	}
 
 
@@ -163,7 +163,7 @@ 
 			case 'float':
 				$value = (double) $value; break;
 			default:
-				$value = '\'' . addcslashes( $value, '\'' ) . '\'';
+				$value = '\''.addcslashes( $value, '\'' ).'\'';
 		}
 
 		return $value;