aimeos / aimeos-core

lib/mshoplib/src/MShop/Order/Manager/Base/Base.php

Spacing +4 added lines, -4 removed lines

@@ -97,7 +97,7 @@ 
 		$currency = $locale->getCurrencyId();
 		$language = $locale->getLanguageId();
 		$sitecode = $locale->getSite()->getCode();
-		$key = 'aimeos/basket/content-' . $sitecode . '-' . $language . '-' . $currency . '-' . strval( $type );
+		$key = 'aimeos/basket/content-'.$sitecode.'-'.$language.'-'.$currency.'-'.strval( $type );
 
 		if( ( $serorder = $session->get( $key ) ) === null ) {
 			return $this->getObject()->createItem();
@@ -133,7 +133,7 @@ 
 		$currency = $locale->getCurrencyId();
 		$language = $locale->getLanguageId();
 		$sitecode = $locale->getSite()->getCode();
-		$key = 'aimeos/basket/lock-' . $sitecode . '-' . $language . '-' . $currency . '-' . strval( $type );
+		$key = 'aimeos/basket/lock-'.$sitecode.'-'.$language.'-'.$currency.'-'.strval( $type );
 
 		if( ( $value = $session->get( $key ) ) !== null ) {
 			return (int) $value;
@@ -157,7 +157,7 @@ 
 		$currency = $locale->getCurrencyId();
 		$language = $locale->getLanguageId();
 		$sitecode = $locale->getSite()->getCode();
-		$key = 'aimeos/basket/content-' . $sitecode . '-' . $language . '-' . $currency . '-' . strval( $type );
+		$key = 'aimeos/basket/content-'.$sitecode.'-'.$language.'-'.$currency.'-'.strval( $type );
 
 		$session->set( $key, serialize( clone $order ) );
 	}
@@ -181,7 +181,7 @@ 
 		$currency = $locale->getCurrencyId();
 		$language = $locale->getLanguageId();
 		$sitecode = $locale->getSite()->getCode();
-		$key = 'aimeos/basket/lock-' . $sitecode . '-' . $language . '-' . $currency . '-' . strval( $type );
+		$key = 'aimeos/basket/lock-'.$sitecode.'-'.$language.'-'.$currency.'-'.strval( $type );
 
 		$session->set( $key, strval( $lock ) );
 	}

Braces +2 added lines, -4 removed lines

@@ -385,8 +385,7 @@ 
 				$attributes[$attribute->getParentId()][] = $attribute;
 				$attribute->setParentId( null );
 				$attribute->setId( null );
-			}
-			else
+			} else
 			{
 				$attributes[$attribute->getParentId()][$id] = $attribute;
 			}
@@ -405,8 +404,7 @@ 
 				$map[$item->getBaseId()][$item->getPosition()] = $item;
 
 				$subProducts = [];
-			}
-			else
+			} else
 			{	// in case it's a sub-product
 				$subProducts[$item->getPosition()] = $item;
 			}

lib/mwlib/src/MW/Container/Content/Gzip.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 		$mode = $this->getOption( 'gzip-mode', 'rb' );
 		$level = $this->getOption( 'gzip-level', 5 );
 
-		if( ( $this->fh = gzopen( $resource, $mode . $level ) ) === false ) {
+		if( ( $this->fh = gzopen( $resource, $mode.$level ) ) === false ) {
 			throw new \Aimeos\MW\Container\Exception( sprintf( 'Unable to open file "%1$s"', $resource ) );
 		}
 

lib/mwlib/tests/MW/Container/Content/GzipTest.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
 
 	public function testNewFile()
 	{
-		$filename = 'tmp' . DIRECTORY_SEPARATOR . 'tempfile.gz';
+		$filename = 'tmp'.DIRECTORY_SEPARATOR.'tempfile.gz';
 		$file = new \Aimeos\MW\Container\Content\Gzip( $filename, 'temp', ['gzip-mode' => 'wb'] );
 		$resource = $file->getResource();
 		$file->close();
@@ -31,7 +31,7 @@ 
 
 	public function testExistingFile()
 	{
-		$filename = __DIR__ . DIRECTORY_SEPARATOR . 'testfile.gz';
+		$filename = __DIR__.DIRECTORY_SEPARATOR.'testfile.gz';
 		$file = new \Aimeos\MW\Container\Content\Gzip( $filename, 'test' );
 
 		$this->assertEquals( true, file_exists( $file->getResource() ) );
@@ -47,7 +47,7 @@ 
 			'gzip-level' => 9,
 		);
 
-		$filename = 'tmp' . DIRECTORY_SEPARATOR . 'tempfile';
+		$filename = 'tmp'.DIRECTORY_SEPARATOR.'tempfile';
 		$file = new \Aimeos\MW\Container\Content\Gzip( $filename, 'temp', $options );
 		$file->add( 'test text' );
 		$file->close();
@@ -56,13 +56,13 @@ 
 		unlink( $file->getResource() );
 
 		$this->assertStringStartsWith( '1f8b080000000000', bin2hex( $actual ) );
-		$this->assertEquals( $filename . '.gz', $file->getResource() );
+		$this->assertEquals( $filename.'.gz', $file->getResource() );
 	}
 
 
 	public function testOverwrite()
 	{
-		$filename = 'tmp' . DIRECTORY_SEPARATOR . 'tempfile.gz';
+		$filename = 'tmp'.DIRECTORY_SEPARATOR.'tempfile.gz';
 		$file = new \Aimeos\MW\Container\Content\Gzip( $filename, 'temp', ['gzip-mode' => 'wb'] );
 		$file->add( 'test text' );
 		$file->close();
@@ -83,7 +83,7 @@ 
 
 	public function testIterator()
 	{
-		$filename = __DIR__ . DIRECTORY_SEPARATOR . 'testfile.gz';
+		$filename = __DIR__.DIRECTORY_SEPARATOR.'testfile.gz';
 		$file = new \Aimeos\MW\Container\Content\Gzip( $filename, 'test' );
 
 		$expected = array( "test data" );

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

Spacing +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 			$service = $basket->getService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY );
 
 			if( ( $value = $service->getAttribute( 'time.hourminute', 'delivery' ) ) == '' ) {
-				$feconfig['time.hourminute']['default'] = date( 'H:i', time() + ($minute + 15 - ($minute % 15)) * 60 );
+				$feconfig['time.hourminute']['default'] = date( 'H:i', time() + ( $minute + 15 - ( $minute % 15 ) ) * 60 );
 			} else {
 				$feconfig['time.hourminute']['default'] = $value;
 			}

Braces +3 added lines, -1 removed lines

@@ -114,7 +114,9 @@
 				$feconfig['time.hourminute']['default'] = $value;
 			}
 		}
-		catch( \Aimeos\MShop\Order\Exception $e ) { echo $e->getMessage(); } // If service isn't available
+		catch( \Aimeos\MShop\Order\Exception $e )
+		{
+echo $e->getMessage(); } // If service isn't available
 
 		return array_merge( $this->getProvider()->getConfigFE( $basket ), $this->getConfigItems( $feconfig ) );
 	}

lib/mshoplib/setup/ProductRenameStockWarehouse.php

Braces +4 added lines, -8 removed lines

@@ -70,8 +70,7 @@ 
 		) {
 			$this->execute( $this->stmts['constraint'], 'db-product' );
 			$this->status( 'done' );
-		}
-		else
+		} else
 		{
 			$this->status( 'OK' );
 		}
@@ -84,8 +83,7 @@ 
 		) {
 			$this->execute( $this->stmts['constraint2'], 'db-product' );
 			$this->status( 'done' );
-		}
-		else
+		} else
 		{
 			$this->status( 'OK' );
 		}
@@ -98,8 +96,7 @@ 
 		) {
 			$this->execute( $this->stmts['typeid'], 'db-product' );
 			$this->status( 'done' );
-		}
-		else
+		} else
 		{
 			$this->status( 'OK' );
 		}
@@ -111,8 +108,7 @@ 
 		{
 			$this->execute( $this->stmts['table'], 'db-product' );
 			$this->status( 'done' );
-		}
-		else
+		} else
 		{
 			$this->status( 'OK' );
 		}

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

Spacing +18 added lines, -18 removed lines

@@ -51,7 +51,7 @@ 
 			return (string) $this->bdata['id'];
 		}
 
-		$key = $this->prefix . 'id';
+		$key = $this->prefix.'id';
 		return ( isset( $this->bdata[$key] ) && $this->bdata[$key] != '' ? (string) $this->bdata[$key] : null );
 	}
 
@@ -64,7 +64,7 @@ 
 	 */
 	public function setId( $id )
 	{
-		$key = $this->prefix . 'id';
+		$key = $this->prefix.'id';
 
 		if( ( $this->bdata[$key] = \Aimeos\MShop\Common\Item\Base::checkId( $this->getId(), $id ) ) === null ) {
 			$this->modified = true;
@@ -88,7 +88,7 @@ 
 			return (int) $this->bdata['siteid'];
 		}
 
-		$key = $this->prefix . 'siteid';
+		$key = $this->prefix.'siteid';
 		return ( isset( $this->bdata[$key] ) ? (int) $this->bdata[$key] : null );
 	}
 
@@ -104,7 +104,7 @@ 
 			return (string) $this->bdata['mtime'];
 		}
 
-		$key = $this->prefix . 'mtime';
+		$key = $this->prefix.'mtime';
 		return ( isset( $this->bdata[$key] ) ? (string) $this->bdata[$key] : null );
 	}
 
@@ -120,7 +120,7 @@ 
 			return (string) $this->bdata['ctime'];
 		}
 
-		$key = $this->prefix . 'ctime';
+		$key = $this->prefix.'ctime';
 		return ( isset( $this->bdata[$key] ) ? (string) $this->bdata[$key] : null );
 	}
 
@@ -136,7 +136,7 @@ 
 			return (string) $this->bdata['editor'];
 		}
 
-		$key = $this->prefix . 'editor';
+		$key = $this->prefix.'editor';
 		return ( isset( $this->bdata[$key] ) ? (string) $this->bdata[$key] : '' );
 	}
 
@@ -172,16 +172,16 @@ 
 	 */
 	public function fromArray( array $list )
 	{
-		if( array_key_exists( $this->prefix . 'id', $list ) )
+		if( array_key_exists( $this->prefix.'id', $list ) )
 		{
-			$this->setId( $list[$this->prefix . 'id'] );
-			unset( $list[$this->prefix . 'id'] );
+			$this->setId( $list[$this->prefix.'id'] );
+			unset( $list[$this->prefix.'id'] );
 		}
 
-		unset( $list[$this->prefix . 'siteid'] );
-		unset( $list[$this->prefix . 'ctime'] );
-		unset( $list[$this->prefix . 'mtime'] );
-		unset( $list[$this->prefix . 'editor'] );
+		unset( $list[$this->prefix.'siteid'] );
+		unset( $list[$this->prefix.'ctime'] );
+		unset( $list[$this->prefix.'mtime'] );
+		unset( $list[$this->prefix.'editor'] );
 
 		return $list;
 	}
@@ -195,14 +195,14 @@ 
 	 */
 	public function toArray( $private = false )
 	{
-		$list = [$this->prefix . 'id' => $this->getId()];
+		$list = [$this->prefix.'id' => $this->getId()];
 
 		if( $private === true )
 		{
-			$list[$this->prefix . 'siteid'] = $this->getSiteId();
-			$list[$this->prefix . 'ctime'] = $this->getTimeCreated();
-			$list[$this->prefix . 'mtime'] = $this->getTimeModified();
-			$list[$this->prefix . 'editor'] = $this->getEditor();
+			$list[$this->prefix.'siteid'] = $this->getSiteId();
+			$list[$this->prefix.'ctime'] = $this->getTimeCreated();
+			$list[$this->prefix.'mtime'] = $this->getTimeModified();
+			$list[$this->prefix.'editor'] = $this->getEditor();
 		}
 
 		return $list;

lib/mshoplib/src/MShop/Plugin/Provider/Decorator/Log.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
 		$level = \Aimeos\MW\Logger\Base::DEBUG;
 		$class = get_class( $this->getProvider() );
 
-		$this->getContext()->getLogger()->log( 'Plugin::register: ' . $class, $level, 'core/plugin' );
+		$this->getContext()->getLogger()->log( 'Plugin::register: '.$class, $level, 'core/plugin' );
 
 		$this->getProvider()->register( $p );
 	}
@@ -50,12 +50,12 @@ 
 		$class = get_class( $this->getProvider() );
 		$payload = ( is_object( $value ) ? get_class( $value ) : ( is_scalar( $value ) ? $value : '' ) );
 
-		$msg = 'Plugin::update:before: ' . $class . ', action: ' . $action . ', value: ' . $payload;
+		$msg = 'Plugin::update:before: '.$class.', action: '.$action.', value: '.$payload;
 		$this->getContext()->getLogger()->log( $msg, $level, 'core/plugin' );
 
 		$result = $this->getProvider()->update( $order, $action, $value );
 
-		$msg = 'Plugin::update:after: ' . $class . ', action: ' . $action . ', value: ' . $payload;
+		$msg = 'Plugin::update:after: '.$class.', action: '.$action.', value: '.$payload;
 		$this->getContext()->getLogger()->log( $msg, $level, 'core/plugin' );
 
 		return $result;

lib/mshoplib/src/MShop/Service/Provider/Delivery/Standard.php

Spacing +5 added lines, -5 removed lines

@@ -83,11 +83,11 @@ 
 		$logger = $this->getContext()->getLogger();
 		$xml = $this->buildXML( $order );
 
-		$logger->log( __METHOD__ . ": XML request =\n" . $xml, $level, 'core/service/delivery' );
+		$logger->log( __METHOD__.": XML request =\n".$xml, $level, 'core/service/delivery' );
 
 		$response = $this->sendRequest( $xml );
 
-		$logger->log( __METHOD__ . ": XML response =\n" . trim( $response ), $level, 'core/service/delivery' );
+		$logger->log( __METHOD__.": XML response =\n".trim( $response ), $level, 'core/service/delivery' );
 
 		$this->checkResponse( $response, $order->getId() );
 
@@ -167,7 +167,7 @@ 
 				$context->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::NOTICE, 'core/service/delivery' );
 
 				curl_setopt( $curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY );
-				curl_setopt( $curl, CURLOPT_USERPWD, $config['default.username'] . ':' . $config['default.password'] );
+				curl_setopt( $curl, CURLOPT_USERPWD, $config['default.username'].':'.$config['default.password'] );
 			}
 
 			$urlinfo = parse_url( $config['default.url'] );
@@ -230,7 +230,7 @@ 
 	 */
 	protected function checkResponse( $response, $invoiceid )
 	{
-		$responseXSD = __DIR__ . DIRECTORY_SEPARATOR . 'xsd' . DIRECTORY_SEPARATOR . 'order-response_v1.xsd';
+		$responseXSD = __DIR__.DIRECTORY_SEPARATOR.'xsd'.DIRECTORY_SEPARATOR.'order-response_v1.xsd';
 
 		$dom = new \DOMDocument( '1.0', 'UTF-8' );
 		$dom->preserveWhiteSpace = false;
@@ -313,7 +313,7 @@ 
 			throw new \Aimeos\MShop\Service\Exception( sprintf( $msg, $e->getMessage() ), 0, $e );
 		}
 
-		$requestXSD = __DIR__ . DIRECTORY_SEPARATOR . 'xsd' . DIRECTORY_SEPARATOR . 'order-request_v1.xsd';
+		$requestXSD = __DIR__.DIRECTORY_SEPARATOR.'xsd'.DIRECTORY_SEPARATOR.'order-request_v1.xsd';
 
 		if( $dom->schemaValidate( $requestXSD ) !== true )
 		{

Braces +2 added lines, -4 removed lines

@@ -180,8 +180,7 @@ 
 
 					curl_setopt( $curl, CURLOPT_SSL_VERIFYPEER, false );
 					curl_setopt( $curl, CURLOPT_SSL_VERIFYHOST, true );
-				}
-				else
+				} else
 				{
 					$msg = 'Using strict SSL options';
 					$context->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::NOTICE, 'core/service/delivery' );
@@ -189,8 +188,7 @@ 
 					curl_setopt( $curl, CURLOPT_SSL_VERIFYPEER, true );
 					curl_setopt( $curl, CURLOPT_SSL_VERIFYHOST, 2 ); // check CN and match host name
 				}
-			}
-			else
+			} else
 			{
 				$msg = 'Using no SSL encryption';
 				$context->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::NOTICE, 'core/service/delivery' );

Doc Comments +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
 	 * Returns the configuration attribute definitions of the provider to generate a list of available fields and
 	 * rules for the value of each field in the administration interface.
 	 *
-	 * @return array List of attribute definitions implementing \Aimeos\MW\Common\Critera\Attribute\Iface
+	 * @return \Aimeos\MW\Criteria\Attribute\Iface[] List of attribute definitions implementing \Aimeos\MW\Common\Critera\Attribute\Iface
 	 */
 	public function getConfigBE()
 	{

lib/mshoplib/src/MShop/Order/Item/Base/Base.php

Braces +4 added lines, -8 removed lines

@@ -171,8 +171,7 @@ 
 			$quantity = $item->getQuantity();
 			$item = $this->products[$pos];
 			$item->setQuantity( $item->getQuantity() + $quantity );
-		}
-		else if( $position !== null )
+		} else if( $position !== null )
 		{
 			if( isset( $this->products[$position] ) )
 			{
@@ -189,13 +188,11 @@ 
 
 				$products[$position] = $item;
 				$this->products = $products;
-			}
-			else
+			} else
 			{
 				$this->products[$position] = $item;
 			}
-		}
-		else
+		} else
 		{
 			$this->products[] = $item;
 		}
@@ -225,8 +222,7 @@ 
 		{
 			$this->products[$pos] = $item;
 			$this->setModified();
-		}
-		else
+		} else
 		{
 			$this->products[$pos] = $item;
 		}