aimeos / aimeos-core

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
 	}
 
 

lib/mshoplib/setup/TablesCreateMAdmin.php

Spacing +8 added lines, -8 removed lines

@@ -48,10 +48,10 @@ 
 		$ds = DIRECTORY_SEPARATOR;
 
 		$files = array(
-			'db-cache' => 'default' . $ds . 'schema' . $ds . 'cache.php',
-			'db-log' => 'default' . $ds . 'schema' . $ds . 'log.php',
-			'db-job' => 'default' . $ds . 'schema' . $ds . 'job.php',
-			'db-queue' => 'default' . $ds . 'schema' . $ds . 'queue.php',
+			'db-cache' => 'default'.$ds.'schema'.$ds.'cache.php',
+			'db-log' => 'default'.$ds.'schema'.$ds.'log.php',
+			'db-job' => 'default'.$ds.'schema'.$ds.'job.php',
+			'db-queue' => 'default'.$ds.'schema'.$ds.'queue.php',
 		);
 
 		$this->setupSchema( $files, true );
@@ -69,10 +69,10 @@ 
 		$ds = DIRECTORY_SEPARATOR;
 
 		$files = array(
-			'db-cache' => 'default' . $ds . 'schema' . $ds . 'cache.php',
-			'db-log' => 'default' . $ds . 'schema' . $ds . 'log.php',
-			'db-job' => 'default' . $ds . 'schema' . $ds . 'job.php',
-			'db-queue' => 'default' . $ds . 'schema' . $ds . 'queue.php',
+			'db-cache' => 'default'.$ds.'schema'.$ds.'cache.php',
+			'db-log' => 'default'.$ds.'schema'.$ds.'log.php',
+			'db-job' => 'default'.$ds.'schema'.$ds.'job.php',
+			'db-queue' => 'default'.$ds.'schema'.$ds.'queue.php',
 		);
 
 		$this->setupSchema( $files );

lib/mshoplib/setup/unittest/ProductAddStockTestData.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 		$this->additional->setEditor( 'core:unittest' );
 
 		$ds = DIRECTORY_SEPARATOR;
-		$path = __DIR__ . $ds . 'data' . $ds . 'stock.php';
+		$path = __DIR__.$ds.'data'.$ds.'stock.php';
 
 		if( ( $testdata = include( $path ) ) == false ) {
 			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for stock domain', $path ) );

lib/mshoplib/setup/TablesCreateMShop.php

Spacing +36 added lines, -36 removed lines

@@ -48,27 +48,27 @@ 
 		$ds = DIRECTORY_SEPARATOR;
 
 		$files = array(
-			'db-locale' => 'default' . $ds . 'schema' . $ds . 'locale.php',
-			'db-attribute' => 'default' . $ds . 'schema' . $ds . 'attribute.php',
-			'db-customer' => 'default' . $ds . 'schema' . $ds . 'customer.php',
-			'db-media' => 'default' . $ds . 'schema' . $ds . 'media.php',
-			'db-order' => 'default' . $ds . 'schema' . $ds . 'order.php',
-			'db-plugin' => 'default' . $ds . 'schema' . $ds . 'plugin.php',
-			'db-price' => 'default' . $ds . 'schema' . $ds . 'price.php',
-			'db-product' => 'default' . $ds . 'schema' . $ds . 'product.php',
-			'db-stock' => 'default' . $ds . 'schema' . $ds . 'stock.php',
-			'db-service' => 'default' . $ds . 'schema' . $ds . 'service.php',
-			'db-supplier' => 'default' . $ds . 'schema' . $ds . 'supplier.php',
-			'db-text' => 'default' . $ds . 'schema' . $ds . 'text.php',
-			'db-coupon' => 'default' . $ds . 'schema' . $ds . 'coupon.php',
-			'db-catalog' => 'default' . $ds . 'schema' . $ds . 'catalog.php',
-			'db-tag' => 'default' . $ds . 'schema' . $ds . 'tag.php',
+			'db-locale' => 'default'.$ds.'schema'.$ds.'locale.php',
+			'db-attribute' => 'default'.$ds.'schema'.$ds.'attribute.php',
+			'db-customer' => 'default'.$ds.'schema'.$ds.'customer.php',
+			'db-media' => 'default'.$ds.'schema'.$ds.'media.php',
+			'db-order' => 'default'.$ds.'schema'.$ds.'order.php',
+			'db-plugin' => 'default'.$ds.'schema'.$ds.'plugin.php',
+			'db-price' => 'default'.$ds.'schema'.$ds.'price.php',
+			'db-product' => 'default'.$ds.'schema'.$ds.'product.php',
+			'db-stock' => 'default'.$ds.'schema'.$ds.'stock.php',
+			'db-service' => 'default'.$ds.'schema'.$ds.'service.php',
+			'db-supplier' => 'default'.$ds.'schema'.$ds.'supplier.php',
+			'db-text' => 'default'.$ds.'schema'.$ds.'text.php',
+			'db-coupon' => 'default'.$ds.'schema'.$ds.'coupon.php',
+			'db-catalog' => 'default'.$ds.'schema'.$ds.'catalog.php',
+			'db-tag' => 'default'.$ds.'schema'.$ds.'tag.php',
 		);
 
 		$this->setupSchema( $files, true );
 
 		$files = array(
-			'db-product' => 'default' . $ds . 'schema' . $ds . 'index.php',
+			'db-product' => 'default'.$ds.'schema'.$ds.'index.php',
 		);
 
 		$this->setupSchema( $files, true );
@@ -86,27 +86,27 @@ 
 		$ds = DIRECTORY_SEPARATOR;
 
 		$files = array(
-			'db-locale' => 'default' . $ds . 'schema' . $ds . 'locale.php',
-			'db-attribute' => 'default' . $ds . 'schema' . $ds . 'attribute.php',
-			'db-customer' => 'default' . $ds . 'schema' . $ds . 'customer.php',
-			'db-media' => 'default' . $ds . 'schema' . $ds . 'media.php',
-			'db-order' => 'default' . $ds . 'schema' . $ds . 'order.php',
-			'db-plugin' => 'default' . $ds . 'schema' . $ds . 'plugin.php',
-			'db-price' => 'default' . $ds . 'schema' . $ds . 'price.php',
-			'db-product' => 'default' . $ds . 'schema' . $ds . 'product.php',
-			'db-stock' => 'default' . $ds . 'schema' . $ds . 'stock.php',
-			'db-service' => 'default' . $ds . 'schema' . $ds . 'service.php',
-			'db-supplier' => 'default' . $ds . 'schema' . $ds . 'supplier.php',
-			'db-text' => 'default' . $ds . 'schema' . $ds . 'text.php',
-			'db-coupon' => 'default' . $ds . 'schema' . $ds . 'coupon.php',
-			'db-catalog' => 'default' . $ds . 'schema' . $ds . 'catalog.php',
-			'db-tag' => 'default' . $ds . 'schema' . $ds . 'tag.php',
+			'db-locale' => 'default'.$ds.'schema'.$ds.'locale.php',
+			'db-attribute' => 'default'.$ds.'schema'.$ds.'attribute.php',
+			'db-customer' => 'default'.$ds.'schema'.$ds.'customer.php',
+			'db-media' => 'default'.$ds.'schema'.$ds.'media.php',
+			'db-order' => 'default'.$ds.'schema'.$ds.'order.php',
+			'db-plugin' => 'default'.$ds.'schema'.$ds.'plugin.php',
+			'db-price' => 'default'.$ds.'schema'.$ds.'price.php',
+			'db-product' => 'default'.$ds.'schema'.$ds.'product.php',
+			'db-stock' => 'default'.$ds.'schema'.$ds.'stock.php',
+			'db-service' => 'default'.$ds.'schema'.$ds.'service.php',
+			'db-supplier' => 'default'.$ds.'schema'.$ds.'supplier.php',
+			'db-text' => 'default'.$ds.'schema'.$ds.'text.php',
+			'db-coupon' => 'default'.$ds.'schema'.$ds.'coupon.php',
+			'db-catalog' => 'default'.$ds.'schema'.$ds.'catalog.php',
+			'db-tag' => 'default'.$ds.'schema'.$ds.'tag.php',
 		);
 
 		$this->setupSchema( $files );
 
 		$files = array(
-			'db-product' => 'default' . $ds . 'schema' . $ds . 'index.php',
+			'db-product' => 'default'.$ds.'schema'.$ds.'index.php',
 		);
 
 		$this->setupSchema( $files );
@@ -127,7 +127,7 @@ 
 
 		foreach( $this->getSetupPaths() as $abspath )
 		{
-			$filepath = $abspath . DIRECTORY_SEPARATOR . $relpath;
+			$filepath = $abspath.DIRECTORY_SEPARATOR.$relpath;
 
 			if( !file_exists( $filepath ) ) {
 				continue;
@@ -165,7 +165,7 @@ 
 	{
 		foreach( $files as $rname => $relpath )
 		{
-			$this->msg( 'Using schema from ' . basename( $relpath ), 1 ); $this->status( '' );
+			$this->msg( 'Using schema from '.basename( $relpath ), 1 ); $this->status( '' );
 
 			$dbal = $this->getConnection( $rname )->getRawObject();
 
@@ -223,7 +223,7 @@ 
 	{
 		foreach( $files as $rname => $filepath )
 		{
-			$this->msg( 'Using tables from ' . basename( $filepath ), 1 ); $this->status( '' );
+			$this->msg( 'Using tables from '.basename( $filepath ), 1 ); $this->status( '' );
 
 			if( ( $content = file_get_contents( $filepath ) ) === false ) {
 				throw new \Aimeos\MW\Setup\Exception( sprintf( 'Unable to get content from file "%1$s"', $filepath ) );
@@ -270,7 +270,7 @@ 
 	{
 		foreach( $this->getSetupPaths() as $abspath )
 		{
-			$filepath = $abspath . DIRECTORY_SEPARATOR . $relpath;
+			$filepath = $abspath.DIRECTORY_SEPARATOR.$relpath;
 
 			if( !file_exists( $filepath ) ) {
 				continue;

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

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 
 return array(
 	'table' => array(
-		'mshop_stock_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_stock_type' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_stock_type' );
 
@@ -31,7 +31,7 @@ 
 			return $schema;
 		},
 
-		'mshop_stock' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_stock' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_stock' );
 

Braces +4 added lines, -2 removed lines

@@ -8,7 +8,8 @@ 
 
 return array(
 	'table' => array(
-		'mshop_stock_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_stock_type' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_stock_type' );
 
@@ -31,7 +32,8 @@ 
 			return $schema;
 		},
 
-		'mshop_stock' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_stock' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_stock' );
 

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

Braces +12 added lines, -6 removed lines

@@ -8,7 +8,8 @@ 
 
 return array(
 	'table' => array(
-		'mshop_product_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_product_type' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_product_type' );
 
@@ -31,7 +32,8 @@ 
 			return $schema;
 		},
 
-		'mshop_product' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_product' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_product' );
 
@@ -63,7 +65,8 @@ 
 			return $schema;
 		},
 
-		'mshop_product_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_product_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_product_list_type' );
 
@@ -86,7 +89,8 @@ 
 			return $schema;
 		},
 
-		'mshop_product_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_product_list' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_product_list' );
 
@@ -124,7 +128,8 @@ 
 			return $schema;
 		},
 
-		'mshop_product_property_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_product_property_type' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_product_property_type' );
 
@@ -147,7 +152,8 @@ 
 			return $schema;
 		},
 
-		'mshop_product_property' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_product_property' => function ( \Doctrine\DBAL\Schema\Schema $schema )
+		{
 
 			$table = $schema->createTable( 'mshop_product_property' );
 

Spacing +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 
 return array(
 	'table' => array(
-		'mshop_product_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_product_type' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_product_type' );
 
@@ -31,7 +31,7 @@ 
 			return $schema;
 		},
 
-		'mshop_product' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_product' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_product' );
 
@@ -46,8 +46,8 @@ 
 			$table->addColumn( 'status', 'smallint', [] );
 			$table->addColumn( 'mtime', 'datetime', [] );
 			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
-			$table->addColumn( 'target', 'string', array('length' => 255 ) );
+			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
+			$table->addColumn( 'target', 'string', array( 'length' => 255 ) );
 
 			$table->setPrimaryKey( array( 'id' ), 'pk_mspro_id' );
 			$table->addUniqueIndex( array( 'siteid', 'code' ), 'unq_mspro_siteid_code' );
@@ -64,7 +64,7 @@ 
 			return $schema;
 		},
 
-		'mshop_product_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_product_list_type' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_product_list_type' );
 
@@ -87,7 +87,7 @@ 
 			return $schema;
 		},
 
-		'mshop_product_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_product_list' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_product_list' );
 
@@ -125,7 +125,7 @@ 
 			return $schema;
 		},
 
-		'mshop_product_property_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_product_property_type' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_product_property_type' );
 
@@ -148,7 +148,7 @@ 
 			return $schema;
 		},
 
-		'mshop_product_property' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_product_property' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_product_property' );
 

lib/mshoplib/src/MShop/Plugin/Provider/Order/ProductStock.php

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
 		}
 
 		foreach( $this->getStockItems( $productCodes, $stockTypes ) as $stockItem ) {
-			$stockMap[ $stockItem->getProductCode() ][ $stockItem->getType() ] = $stockItem->getStocklevel();
+			$stockMap[$stockItem->getProductCode()][$stockItem->getType()] = $stockItem->getStocklevel();
 		}
 
 		return $this->checkStockLevels( $order, $stockMap );
@@ -106,10 +106,10 @@ 
 		{
 			$stocklevel = 0;
 
-			if( isset( $stockMap[ $orderProductItem->getProductCode() ] )
-				&& array_key_exists( $orderProductItem->getStockType(), $stockMap[ $orderProductItem->getProductCode() ] )
+			if( isset( $stockMap[$orderProductItem->getProductCode()] )
+				&& array_key_exists( $orderProductItem->getStockType(), $stockMap[$orderProductItem->getProductCode()] )
 			) {
-				$stocklevel = $stockMap[ $orderProductItem->getProductCode() ][ $orderProductItem->getStockType() ];
+				$stocklevel = $stockMap[$orderProductItem->getProductCode()][$orderProductItem->getStockType()];
 			}
 
 			if( $stocklevel === null || $stocklevel >= $orderProductItem->getQuantity() ) {

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

Spacing +4 added lines, -4 removed lines

@@ -552,8 +552,8 @@ 
 
 			while( ( $row = $results->fetch() ) !== false )
 			{
-				$map[ $row['stock.id'] ] = $row;
-				$typeIds[ $row['stock.typeid'] ] = null;
+				$map[$row['stock.id']] = $row;
+				$typeIds[$row['stock.typeid']] = null;
 			}
 
 			$dbm->release( $conn, $dbname );
@@ -576,9 +576,9 @@ 
 
 			foreach( $map as $id => $row )
 			{
-				if( isset( $typeItems[ $row['stock.typeid'] ] ) )
+				if( isset( $typeItems[$row['stock.typeid']] ) )
 				{
-					$row['stock.type'] = $typeItems[ $row['stock.typeid'] ]->getCode();
+					$row['stock.type'] = $typeItems[$row['stock.typeid']]->getCode();
 					$row['stock.typename'] = $typeItems[$row['stock.typeid']]->getName();
 				}
 

Braces +1 added lines, -2 removed lines

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

Doc Comments +1 added lines

@@ -435,6 +435,7 @@
 	 * @param \Aimeos\MW\Criteria\Iface $search Search criteria object
 	 * @param string[] $ref List of domains to fetch list items and referenced items for
 	 * @param integer|null &$total Number of items that are available in total
+	 * @param integer $total
 	 * @return array List of stock items implementing \Aimeos\MShop\Stock\Item\Iface
 	 */
 	public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null )