aimeos / aimeos-core

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/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/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;
 		}

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

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
 			{
 				$couponProvider = $couponManager->getProvider( $couponItem, $code );
 				$couponProvider->updateCoupon( $order );
-			}
-			else
+			} else
 			{
 				$notAvailable[$code] = 'coupon.gone';
 			}

lib/mshoplib/setup/MShopAddAttributeData.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
 		$this->msg( sprintf( 'Adding default attribute data for site "%1$s"', $site ), 0 );
 
 		$ds = DIRECTORY_SEPARATOR;
-		$path = __DIR__ . $ds . 'default' . $ds . 'data' . $ds . 'attribute.php';
+		$path = __DIR__.$ds.'default'.$ds.'data'.$ds.'attribute.php';
 
 		if( ( $data = include( $path ) ) == false ) {
 			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for default codes', $path ) );
@@ -72,9 +72,9 @@ 
 				$manager->saveItem( $item );
 				$num++;
 			}
-			catch( \Exception $e ) { ; } // if attribute was already available
+			catch( \Exception $e ) {; } // if attribute was already available
 		}
 
-		$this->status( $num > 0 ? $num . '/' . $total : 'OK' );
+		$this->status( $num > 0 ? $num.'/'.$total : 'OK' );
 	}
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -72,7 +72,9 @@
 				$manager->saveItem( $item );
 				$num++;
 			}
-			catch( \Exception $e ) { ; } // if attribute was already available
+			catch( \Exception $e )
+			{
+; } // if attribute was already available
 		}
 
 		$this->status( $num > 0 ? $num . '/' . $total : 'OK' );

lib/mshoplib/setup/MShopAddDataAbstract.php

Spacing +24 added lines, -24 removed lines

@@ -79,7 +79,7 @@ 
 	{
 		$context = $this->getContext();
 		$attrManager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, $domain . '/lists' );
+		$listManager = \Aimeos\MShop\Factory::createManager( $context, $domain.'/lists' );
 
 
 		$item = $attrManager->createItem();
@@ -110,7 +110,7 @@ 
 			}
 
 			$listItem->setId( null );
-			$listItem->setTypeId( $this->getTypeId( $domain . '/lists/type', 'attribute', $entry['list-type'] ) );
+			$listItem->setTypeId( $this->getTypeId( $domain.'/lists/type', 'attribute', $entry['list-type'] ) );
 			$listItem->setDateStart( $entry['list-start'] );
 			$listItem->setDateEnd( $entry['list-end'] );
 			$listItem->setConfig( $entry['list-config'] );
@@ -151,7 +151,7 @@ 
 	{
 		$context = $this->getContext();
 		$mediaManager = \Aimeos\MShop\Factory::createManager( $context, 'media' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, $domain . '/lists' );
+		$listManager = \Aimeos\MShop\Factory::createManager( $context, $domain.'/lists' );
 
 
 		$item = $mediaManager->createItem();
@@ -176,7 +176,7 @@ 
 			$mediaManager->saveItem( $item );
 
 			$listItem->setId( null );
-			$listItem->setTypeId( $this->getTypeId( $domain . '/lists/type', 'media', $entry['list-type'] ) );
+			$listItem->setTypeId( $this->getTypeId( $domain.'/lists/type', 'media', $entry['list-type'] ) );
 			$listItem->setDateStart( $entry['list-start'] );
 			$listItem->setDateEnd( $entry['list-end'] );
 			$listItem->setConfig( $entry['list-config'] );
@@ -217,7 +217,7 @@ 
 	{
 		$context = $this->getContext();
 		$mediaManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, $domain . '/lists' );
+		$listManager = \Aimeos\MShop\Factory::createManager( $context, $domain.'/lists' );
 
 
 		$item = $mediaManager->createItem();
@@ -244,7 +244,7 @@ 
 			$mediaManager->saveItem( $item );
 
 			$listItem->setId( null );
-			$listItem->setTypeId( $this->getTypeId( $domain . '/lists/type', 'price', $entry['list-type'] ) );
+			$listItem->setTypeId( $this->getTypeId( $domain.'/lists/type', 'price', $entry['list-type'] ) );
 			$listItem->setDateStart( $entry['list-start'] );
 			$listItem->setDateEnd( $entry['list-end'] );
 			$listItem->setConfig( $entry['list-config'] );
@@ -285,7 +285,7 @@ 
 	{
 		$context = $this->getContext();
 		$textManager = \Aimeos\MShop\Factory::createManager( $context, 'text' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, $domain . '/lists' );
+		$listManager = \Aimeos\MShop\Factory::createManager( $context, $domain.'/lists' );
 
 
 		$item = $textManager->createItem();
@@ -308,7 +308,7 @@ 
 			$textManager->saveItem( $item );
 
 			$listItem->setId( null );
-			$listItem->setTypeId( $this->getTypeId( $domain . '/lists/type', 'text', $entry['list-type'] ) );
+			$listItem->setTypeId( $this->getTypeId( $domain.'/lists/type', 'text', $entry['list-type'] ) );
 			$listItem->setDateStart( $entry['list-start'] );
 			$listItem->setDateEnd( $entry['list-end'] );
 			$listItem->setConfig( $entry['list-config'] );
@@ -349,7 +349,7 @@ 
 	{
 		$context = $this->getContext();
 		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, $domain . '/lists' );
+		$listManager = \Aimeos\MShop\Factory::createManager( $context, $domain.'/lists' );
 
 
 		$listItem = $listManager->createItem();
@@ -379,7 +379,7 @@ 
 			}
 
 			$listItem->setId( null );
-			$listItem->setTypeId( $this->getTypeId( $domain . '/lists/type', 'product', $entry['list-type'] ) );
+			$listItem->setTypeId( $this->getTypeId( $domain.'/lists/type', 'product', $entry['list-type'] ) );
 			$listItem->setDateStart( $entry['list-start'] );
 			$listItem->setDateEnd( $entry['list-end'] );
 			$listItem->setConfig( $entry['list-config'] );
@@ -475,8 +475,8 @@ 
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', $key . '.domain', $domain ),
-			$search->compare( '==', $key . '.code', $type ),
+			$search->compare( '==', $key.'.domain', $domain ),
+			$search->compare( '==', $key.'.code', $type ),
 		);
 		$search->setConditions( $search->combine( '&&', $expr ) );
 
@@ -509,8 +509,8 @@ 
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', $refdomain . '.domain', $domain ),
-			$search->compare( '=~', $refdomain . '.label', 'Demo' ),
+			$search->compare( '==', $refdomain.'.domain', $domain ),
+			$search->compare( '=~', $refdomain.'.label', 'Demo' ),
 		);
 		$search->setConditions( $search->combine( '&&', $expr ) );
 
@@ -520,9 +520,9 @@ 
 
 		$search = $listManager->createSearch();
 		$expr = array(
-			$search->compare( '==', $key . '.parentid', $parentid ),
-			$search->compare( '==', $key . '.domain', $refdomain ),
-			$search->compare( '==', $key . '.refid', $ids ),
+			$search->compare( '==', $key.'.parentid', $parentid ),
+			$search->compare( '==', $key.'.domain', $refdomain ),
+			$search->compare( '==', $key.'.refid', $ids ),
 		);
 		$search->setConditions( $search->combine( '&&', $expr ) );
 
@@ -550,8 +550,8 @@ 
 
 		$search = $listManager->createSearch();
 		$expr = array(
-			$search->compare( '==', $key . '.parentid', $parentid ),
-			$search->compare( '==', $key . '.domain', $refdomain ),
+			$search->compare( '==', $key.'.parentid', $parentid ),
+			$search->compare( '==', $key.'.domain', $refdomain ),
 		);
 		$search->setConditions( $search->combine( '&&', $expr ) );
 
@@ -568,7 +568,7 @@ 
 
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', $refdomain . '.id', $refIds ) );
+			$search->setConditions( $search->compare( '==', $refdomain.'.id', $refIds ) );
 			$ids = array_keys( $manager->searchItems( $search ) );
 
 			foreach( array_diff( $refIds, $ids ) as $refId ) {
@@ -586,14 +586,14 @@ 
 
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '=~', $refdomain . '.label', 'Demo' ) );
+		$search->setConditions( $search->compare( '=~', $refdomain.'.label', 'Demo' ) );
 		$ids = array_keys( $manager->searchItems( $search ) );
 
 		$search = $listManager->createSearch();
 		$expr = array(
-			$search->compare( '==', $key . '.parentid', $parentid ),
-			$search->compare( '==', $key . '.refid', $ids ),
-			$search->compare( '==', $key . '.domain', $refdomain ),
+			$search->compare( '==', $key.'.parentid', $parentid ),
+			$search->compare( '==', $key.'.refid', $ids ),
+			$search->compare( '==', $key.'.domain', $refdomain ),
 		);
 		$search->setConditions( $search->combine( '&&', $expr ) );
 

Braces +1 added lines, -2 removed lines

@@ -103,8 +103,7 @@
 
 				$attrManager->saveItem( $item );
 				$id = $item->getId();
-			}
-			else
+			} else
 			{
 				$id = $attrItem->getId();
 			}