aimeos / aimeos-core

lib/mshoplib/src/MShop/Service/Provider/Payment/PayPalExpress.php

Braces +6 added lines, -2 removed lines

@@ -656,7 +656,9 @@ 
 			$values['PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE'] = $orderAddressDelivery->getCountryId();
 			$values['PAYMENTREQUEST_0_SHIPTOZIP'] = $orderAddressDelivery->getPostal();
 		}
-		catch( \Exception $e ) { ; } // If no address is available
+		catch( \Exception $e )
+		{
+; } // If no address is available
 
 
 		$lastPos = 0;
@@ -696,7 +698,9 @@ 
 			$values['L_SHIPPINGOPTIONNAME0'] = $orderServiceDeliveryItem->getName();
 			$values['L_SHIPPINGOPTIONISDEFAULT0'] = 'true';
 		}
-		catch( \Exception $e ) { ; } // If no delivery service is available
+		catch( \Exception $e )
+		{
+; } // If no delivery service is available
 
 
 		$price = $orderBase->getPrice();

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()
 	{

Spacing +14 added lines, -14 removed lines

@@ -506,7 +506,7 @@ 
 
 		if( $rvals['ACK'] !== 'Success' )
 		{
-			$msg = 'PayPal Express: method = ' . $method . ', order ID = ' . $orderid . ', response = ' . print_r( $rvals, true );
+			$msg = 'PayPal Express: method = '.$method.', order ID = '.$orderid.', response = '.print_r( $rvals, true );
 			$this->getContext()->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::WARN, 'core/service/payment' );
 
 			if( $rvals['ACK'] !== 'SuccessWithWarning' )
@@ -585,7 +585,7 @@ 
 						break;
 					}
 
-					$str = 'PayPal Express: order ID = ' . $invoice->getId() . ', PENDINGREASON = ' . $response['PENDINGREASON'];
+					$str = 'PayPal Express: order ID = '.$invoice->getId().', PENDINGREASON = '.$response['PENDINGREASON'];
 					$this->getContext()->getLogger()->log( $str, \Aimeos\MW\Logger\Base::INFO, 'core/service/payment' );
 				}
 
@@ -619,7 +619,7 @@ 
 				break;
 
 			default:
-				$str = 'PayPal Express: order ID = ' . $invoice->getId() . ', response = ' . print_r( $response, true );
+				$str = 'PayPal Express: order ID = '.$invoice->getId().', response = '.print_r( $response, true );
 				$this->getContext()->getLogger()->log( $str, \Aimeos\MW\Logger\Base::INFO, 'core/service/payment' );
 		}
 	}
@@ -644,14 +644,14 @@ 
 			/* setting up the address details */
 			$values['NOSHIPPING'] = $this->getConfigValue( array( 'paypalexpress.NoShipping' ), 1 );
 			$values['ADDROVERRIDE'] = $this->getConfigValue( array( 'paypalexpress.AddrOverride' ), 0 );
-			$values['PAYMENTREQUEST_0_SHIPTONAME'] = $orderAddressDelivery->getFirstName() . ' ' . $orderAddressDelivery->getLastName();
-			$values['PAYMENTREQUEST_0_SHIPTOSTREET'] = $orderAddressDelivery->getAddress1() . ' ' . $orderAddressDelivery->getAddress2() . ' ' . $orderAddressDelivery->getAddress3();
+			$values['PAYMENTREQUEST_0_SHIPTONAME'] = $orderAddressDelivery->getFirstName().' '.$orderAddressDelivery->getLastName();
+			$values['PAYMENTREQUEST_0_SHIPTOSTREET'] = $orderAddressDelivery->getAddress1().' '.$orderAddressDelivery->getAddress2().' '.$orderAddressDelivery->getAddress3();
 			$values['PAYMENTREQUEST_0_SHIPTOCITY'] = $orderAddressDelivery->getCity();
 			$values['PAYMENTREQUEST_0_SHIPTOSTATE'] = $orderAddressDelivery->getState();
 			$values['PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE'] = $orderAddressDelivery->getCountryId();
 			$values['PAYMENTREQUEST_0_SHIPTOZIP'] = $orderAddressDelivery->getPostal();
 		}
-		catch( \Exception $e ) { ; } // If no address is available
+		catch( \Exception $e ) {; } // If no address is available
 
 
 		$lastPos = 0;
@@ -663,10 +663,10 @@ 
 			$deliveryPrice = clone $price;
 			$deliveryPrices = $this->addPrice( $deliveryPrices, $deliveryPrice->setValue( '0.00' ), $product->getQuantity() );
 
-			$values['L_PAYMENTREQUEST_0_NUMBER' . $lastPos] = $product->getId();
-			$values['L_PAYMENTREQUEST_0_NAME' . $lastPos] = $product->getName();
-			$values['L_PAYMENTREQUEST_0_QTY' . $lastPos] = $product->getQuantity();
-			$values['L_PAYMENTREQUEST_0_AMT' . $lastPos] = $this->getAmount( $price, false );
+			$values['L_PAYMENTREQUEST_0_NUMBER'.$lastPos] = $product->getId();
+			$values['L_PAYMENTREQUEST_0_NAME'.$lastPos] = $product->getName();
+			$values['L_PAYMENTREQUEST_0_QTY'.$lastPos] = $product->getQuantity();
+			$values['L_PAYMENTREQUEST_0_AMT'.$lastPos] = $this->getAmount( $price, false );
 		}
 
 
@@ -674,9 +674,9 @@ 
 		if( ( $paymentCosts = $this->getAmount( $price ) ) > '0.00' )
 		{
 			$lastPos++;
-			$values['L_PAYMENTREQUEST_0_NAME' . $lastPos] = $this->getContext()->getI18n()->dt( 'mshop', 'Payment costs' );
-			$values['L_PAYMENTREQUEST_0_QTY' . $lastPos] = '1';
-			$values['L_PAYMENTREQUEST_0_AMT' . $lastPos] = $paymentCosts;
+			$values['L_PAYMENTREQUEST_0_NAME'.$lastPos] = $this->getContext()->getI18n()->dt( 'mshop', 'Payment costs' );
+			$values['L_PAYMENTREQUEST_0_QTY'.$lastPos] = '1';
+			$values['L_PAYMENTREQUEST_0_AMT'.$lastPos] = $paymentCosts;
 		}
 
 
@@ -695,7 +695,7 @@ 
 			$values['L_SHIPPINGOPTIONNAME0'] = $orderServiceDeliveryItem->getName();
 			$values['L_SHIPPINGOPTIONISDEFAULT0'] = 'true';
 		}
-		catch( \Exception $e ) { ; } // If no delivery service is available
+		catch( \Exception $e ) {; } // If no delivery service is available
 
 
 		$price = $orderBase->getPrice();

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

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 	 * Creates the catalog item objects.
 	 *
 	 * @param array $itemMap Associative list of catalog ID / tree node pairs
-	 * @param array $domains List of domains (e.g. text, media) whose items should be attached to the catalog items
+	 * @param string[] $domains List of domains (e.g. text, media) whose items should be attached to the catalog items
 	 * @param string $prefix Domain prefix
 	 * @param array $local Associative list of IDs as keys and the associative array of items as values
 	 * @return array List of items implementing \Aimeos\MShop\Catalog\Item\Iface

lib/mwlib/src/MW/DB/Statement/Base.php

Spacing +2 added lines, -2 removed lines

@@ -132,9 +132,9 @@
 					&& ( $count += substr_count( $pr, '\'' ) ) % 2 !== 0 )
 				{
 					if( ( $part = next( $parts ) ) === false ) {
-						throw new \Aimeos\MW\DB\Exception( 'Number of apostrophes don\'t match: ' . $sql );
+						throw new \Aimeos\MW\DB\Exception( 'Number of apostrophes don\'t match: '.$sql );
 					}
-					$temp .= '?' . $part;
+					$temp .= '?'.$part;
 				}
 				$result[] = $temp;
 			}

Doc Comments +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
 	 * Reconnects to the database server if not in a transaction
 	 *
 	 * @param \Exception $e Exception to throw if a transaction is running
-	 * @return \Aimeos\MW\DB\Statement\Iface Object for method chaining
+	 * @return Base Object for method chaining
 	 * @throws \Exception If a transaction is running
 	 */
 	protected function reconnect( \Exception $e )

lib/mshoplib/tests/MShop/Order/Manager/Base/StandardTest.php

Spacing +1 added lines, -1 removed lines

@@ -335,7 +335,7 @@
 
 	public function testSearchItemsDefault()
 	{
-		$search = $this->object->createSearch(  true );
+		$search = $this->object->createSearch( true );
 		$items = $this->object->searchItems( $search );
 
 		$this->assertEquals( 0, count( $items ) );

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

Doc Comments +1 added lines

@@ -200,6 +200,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 type items implementing \Aimeos\MShop\Common\Item\Type\Iface
 	 */
 	public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null )

Spacing +11 added lines, -11 removed lines

@@ -61,7 +61,7 @@ 
 	public function createItem()
 	{
 		$values = array(
-			$this->prefix . 'siteid' => $this->getContext()->getLocale()->getSiteId(),
+			$this->prefix.'siteid' => $this->getContext()->getLocale()->getSiteId(),
 		);
 		return $this->createItemBase( $values );
 	}
@@ -114,7 +114,7 @@ 
 			}
 
 			$time = date( 'Y-m-d H:i:s', time() );
-			$stmt = $conn->create( $this->getSqlConfig( $this->getConfigPath() . $type ) );
+			$stmt = $conn->create( $this->getSqlConfig( $this->getConfigPath().$type ) );
 
 			$stmt->bind( 1, $item->getCode(), \Aimeos\MW\DB\Statement\Base::PARAM_STR );
 			$stmt->bind( 2, $item->getDomain(), \Aimeos\MW\DB\Statement\Base::PARAM_STR );
@@ -135,7 +135,7 @@ 
 			if( $fetch === true )
 			{
 				if( $id === null ) {
-					$item->setId( $this->newId( $conn, $this->getConfigPath() . 'newid' ) );
+					$item->setId( $this->newId( $conn, $this->getConfigPath().'newid' ) );
 				} else {
 					$item->setId( $id ); // modified false
 				}
@@ -158,7 +158,7 @@ 
 	 */
 	public function deleteItems( array $ids )
 	{
-		$this->deleteItemsBase( $ids, $this->getConfigPath() . 'delete' );
+		$this->deleteItemsBase( $ids, $this->getConfigPath().'delete' );
 	}
 
 
@@ -174,8 +174,8 @@ 
 	public function findItem( $code, array $ref = [], $domain = 'product', $type = null )
 	{
 		$find = array(
-			$this->prefix . 'code' => $code,
-			$this->prefix . 'domain' => $domain,
+			$this->prefix.'code' => $code,
+			$this->prefix.'domain' => $domain,
 		);
 		return $this->findItemBase( $find, $ref );
 	}
@@ -191,7 +191,7 @@ 
 	 */
 	public function getItem( $id, array $ref = [], $default = false )
 	{
-		return $this->getItemBase( $this->prefix . 'id', $id, $ref, $default );
+		return $this->getItemBase( $this->prefix.'id', $id, $ref, $default );
 	}
 
 
@@ -220,13 +220,13 @@ 
 			}
 
 			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
-			$cfgPathSearch = $this->getConfigPath() . 'search';
-			$cfgPathCount = $this->getConfigPath() . 'count';
+			$cfgPathSearch = $this->getConfigPath().'search';
+			$cfgPathCount = $this->getConfigPath().'count';
 			$required = array( trim( $this->prefix, '.' ) );
 
 			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
 			while( ( $row = $results->fetch() ) !== false ) {
-				$items[$row[$this->prefix . 'id']] = $this->createItemBase( $row );
+				$items[$row[$this->prefix.'id']] = $this->createItemBase( $row );
 			}
 
 			$dbm->release( $conn, $dbname );
@@ -250,7 +250,7 @@ 
 	 */
 	public function getSubManager( $manager, $name = null )
 	{
-		return $this->getSubManagerBase( 'common', 'type/' . $manager, $name );
+		return $this->getSubManagerBase( 'common', 'type/'.$manager, $name );
 	}
 
 

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

Doc Comments +1 added lines, -1 removed lines

@@ -180,7 +180,7 @@
 	 * Processes the order
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Iface $order Order invoice object to process
-	 * @param array $params Request parameter if available
+	 * @param string[] $params Request parameter if available
 	 * @return \Aimeos\MShop\Common\Item\Helper\Form\Standard|null Form object or null
 	 */
 	public function process( \Aimeos\MShop\Order\Item\Iface $order, array $params = [] )

controller/common/tests/TestHelperCntl.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
 	{
 		if( !isset( self::$aimeos ) )
 		{
-			require_once dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'Bootstrap.php';
+			require_once dirname( dirname( dirname( __DIR__ ) ) ).DIRECTORY_SEPARATOR.'Bootstrap.php';
 
 			self::$aimeos = new \Aimeos\Bootstrap( [], false );
 		}
@@ -70,8 +70,8 @@ 
 
 
 		$paths = $aimeos->getConfigPaths();
-		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
-		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
+		$paths[] = __DIR__.DIRECTORY_SEPARATOR.'config';
+		$file = __DIR__.DIRECTORY_SEPARATOR.'confdoc.ser';
 
 		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
 		$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf );

controller/jobs/src/Controller/Jobs/Common/Factory/Base.php

Spacing +6 added lines, -6 removed lines

@@ -56,11 +56,11 @@ 
 		{
 			if( ctype_alnum( $name ) === false )
 			{
-				$classname = is_string( $name ) ? $classprefix . $name : '<not a string>';
+				$classname = is_string( $name ) ? $classprefix.$name : '<not a string>';
 				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
 			}
 
-			$classname = $classprefix . $name;
+			$classname = $classprefix.$name;
 
 			if( class_exists( $classname ) === false ) {
 				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
@@ -119,7 +119,7 @@ 
 		 * @category Developer
 		 */
 		$decorators = $config->get( 'controller/jobs/common/decorators/default', [] );
-		$excludes = $config->get( 'controller/jobs/' . $domain . '/decorators/excludes', [] );
+		$excludes = $config->get( 'controller/jobs/'.$domain.'/decorators/excludes', [] );
 
 		foreach( $decorators as $key => $name )
 		{
@@ -132,11 +132,11 @@ 
 		$controller = self::addDecorators( $context, $aimeos, $controller, $decorators, $classprefix );
 
 		$classprefix = '\\Aimeos\\Controller\\Jobs\\Common\\Decorator\\';
-		$decorators = $config->get( 'controller/jobs/' . $domain . '/decorators/global', [] );
+		$decorators = $config->get( 'controller/jobs/'.$domain.'/decorators/global', [] );
 		$controller = self::addDecorators( $context, $aimeos, $controller, $decorators, $classprefix );
 
-		$classprefix = '\\Aimeos\\Controller\\Jobs\\' . ucfirst( $localClass ) . '\\Decorator\\';
-		$decorators = $config->get( 'controller/jobs/' . $domain . '/decorators/local', [] );
+		$classprefix = '\\Aimeos\\Controller\\Jobs\\'.ucfirst( $localClass ).'\\Decorator\\';
+		$decorators = $config->get( 'controller/jobs/'.$domain.'/decorators/local', [] );
 		$controller = self::addDecorators( $context, $aimeos, $controller, $decorators, $classprefix );
 
 		return $controller;

controller/jobs/tests/TestHelperJobs.php

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
 	{
 		if( !isset( self::$aimeos ) )
 		{
-			require_once dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'Bootstrap.php';
+			require_once dirname( dirname( dirname( __DIR__ ) ) ).DIRECTORY_SEPARATOR.'Bootstrap.php';
 
 			self::$aimeos = new \Aimeos\Bootstrap( [], false );
 		}
@@ -81,8 +81,8 @@ 
 
 
 		$paths = $aimeos->getConfigPaths();
-		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
-		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
+		$paths[] = __DIR__.DIRECTORY_SEPARATOR.'config';
+		$file = __DIR__.DIRECTORY_SEPARATOR.'confdoc.ser';
 
 		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
 		$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf );
@@ -90,7 +90,7 @@ 
 		$ctx->setConfig( $conf );
 
 
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
+		$logger = new \Aimeos\MW\Logger\File( $site.'.log', \Aimeos\MW\Logger\Base::DEBUG );
 		$ctx->setLogger( $logger );