Completed
Push — master ( 52c730...9eba1c )
by Aimeos
08:52
created
lib/mwlib/src/MW/Criteria/MySQL.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,9 +44,9 @@
 block discarded – undo
44 44
 						$len = strlen( $part );
45 45
 
46 46
 						if( $len > 3 ) {
47
-							$str .= ' +' . $part . '*';
47
+							$str .= ' +'.$part.'*';
48 48
 						} else if( $len > 0 ) {
49
-							$str .= ' ' . $part . '*';
49
+							$str .= ' '.$part.'*';
50 50
 						}
51 51
 					}
52 52
 
Please login to merge, or discard this patch.
lib/mwlib/src/MW/Criteria/PgSQL.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
 					$regex = '/(\s|\&|\%|\?|\#|\=|\{|\}|\||\\\\|\~|\[|\]|\`|\^|\/|\-|\+|\>|\<|\(|\)|\*|\:|\"|\!|\§|\$|\'|\;|\.|\,|\@)+/';
39 39
 					$search = trim( preg_replace( $regex, ' ', $params[2] ) );
40 40
 
41
-					$params[2] = implode( ':* & ', explode( ' ', $search ) ) . ':*';
41
+					$params[2] = implode( ':* & ', explode( ' ', $search ) ).':*';
42 42
 				}
43 43
 				break;
44 44
 		}
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Service/Provider/Payment/DirectDebit.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -78,10 +78,10 @@  discard block
 block discarded – undo
78 78
 			$address = $basket->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
79 79
 
80 80
 			if( ( $fn = $address->getFirstname() ) !== '' && ( $ln = $address->getLastname() ) !== '' ) {
81
-				$feconfig['directdebit.accountowner']['default'] = $fn . ' ' . $ln;
81
+				$feconfig['directdebit.accountowner']['default'] = $fn.' '.$ln;
82 82
 			}
83 83
 		}
84
-		catch( \Aimeos\MShop\Order\Exception $e ) { ; } // If address isn't available
84
+		catch( \Aimeos\MShop\Order\Exception $e ) {; } // If address isn't available
85 85
 
86 86
 		return $this->getConfigItems( $feconfig );
87 87
 	}
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 			$len = strlen( $value );
120 120
 			$xstr = ( $len > 3 ? str_repeat( 'X', $len - 3 ) : '' );
121 121
 
122
-			$attrItem->setValue( $xstr . substr( $value, -3 ) );
122
+			$attrItem->setValue( $xstr.substr( $value, -3 ) );
123 123
 			$orderServiceItem->setAttributeItem( $attrItem );
124 124
 		}
125 125
 	}
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,9 @@
 block discarded – undo
81 81
 				$feconfig['directdebit.accountowner']['default'] = $fn . ' ' . $ln;
82 82
 			}
83 83
 		}
84
-		catch( \Aimeos\MShop\Order\Exception $e ) { ; } // If address isn't available
84
+		catch( \Aimeos\MShop\Order\Exception $e )
85
+		{
86
+; } // If address isn't available
85 87
 
86 88
 		return $this->getConfigItems( $feconfig );
87 89
 	}
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Service/Provider/Decorator/Supplier.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -134,7 +134,9 @@
 block discarded – undo
134 134
 				$feconfig['supplier.code']['default'] = array( $value => $address ) + $feconfig['supplier.code']['default'];
135 135
 			}
136 136
 		}
137
-		catch( \Aimeos\MShop\Order\Exception $e ) {} // If service isn't available
137
+		catch( \Aimeos\MShop\Order\Exception $e )
138
+		{
139
+} // If service isn't available
138 140
 
139 141
 		return array_merge( $this->getProvider()->getConfigFE( $basket ), $this->getConfigItems( $feconfig ) );
140 142
 	}
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Service/Provider/Payment/PayPalExpress.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@
 block discarded – undo
99 99
 	 * Returns the configuration attribute definitions of the provider to generate a list of available fields and
100 100
 	 * rules for the value of each field in the administration interface.
101 101
 	 *
102
-	 * @return array List of attribute definitions implementing \Aimeos\MW\Common\Critera\Attribute\Iface
102
+	 * @return \Aimeos\MW\Criteria\Attribute\Iface[] List of attribute definitions implementing \Aimeos\MW\Common\Critera\Attribute\Iface
103 103
 	 */
104 104
 	public function getConfigBE()
105 105
 	{
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -506,7 +506,7 @@  discard block
 block discarded – undo
506 506
 
507 507
 		if( $rvals['ACK'] !== 'Success' )
508 508
 		{
509
-			$msg = 'PayPal Express: method = ' . $method . ', order ID = ' . $orderid . ', response = ' . print_r( $rvals, true );
509
+			$msg = 'PayPal Express: method = '.$method.', order ID = '.$orderid.', response = '.print_r( $rvals, true );
510 510
 			$this->getContext()->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::WARN, 'core/service/payment' );
511 511
 
512 512
 			if( $rvals['ACK'] !== 'SuccessWithWarning' )
@@ -585,7 +585,7 @@  discard block
 block discarded – undo
585 585
 						break;
586 586
 					}
587 587
 
588
-					$str = 'PayPal Express: order ID = ' . $invoice->getId() . ', PENDINGREASON = ' . $response['PENDINGREASON'];
588
+					$str = 'PayPal Express: order ID = '.$invoice->getId().', PENDINGREASON = '.$response['PENDINGREASON'];
589 589
 					$this->getContext()->getLogger()->log( $str, \Aimeos\MW\Logger\Base::INFO, 'core/service/payment' );
590 590
 				}
591 591
 
@@ -619,7 +619,7 @@  discard block
 block discarded – undo
619 619
 				break;
620 620
 
621 621
 			default:
622
-				$str = 'PayPal Express: order ID = ' . $invoice->getId() . ', response = ' . print_r( $response, true );
622
+				$str = 'PayPal Express: order ID = '.$invoice->getId().', response = '.print_r( $response, true );
623 623
 				$this->getContext()->getLogger()->log( $str, \Aimeos\MW\Logger\Base::INFO, 'core/service/payment' );
624 624
 		}
625 625
 	}
@@ -647,14 +647,14 @@  discard block
 block discarded – undo
647 647
 				/* setting up the address details */
648 648
 				$values['NOSHIPPING'] = $this->getConfigValue( array( 'paypalexpress.NoShipping' ), 1 );
649 649
 				$values['ADDROVERRIDE'] = $this->getConfigValue( array( 'paypalexpress.AddrOverride' ), 0 );
650
-				$values['PAYMENTREQUEST_0_SHIPTONAME'] = $orderAddressDelivery->getFirstName() . ' ' . $orderAddressDelivery->getLastName();
651
-				$values['PAYMENTREQUEST_0_SHIPTOSTREET'] = $orderAddressDelivery->getAddress1() . ' ' . $orderAddressDelivery->getAddress2() . ' ' . $orderAddressDelivery->getAddress3();
650
+				$values['PAYMENTREQUEST_0_SHIPTONAME'] = $orderAddressDelivery->getFirstName().' '.$orderAddressDelivery->getLastName();
651
+				$values['PAYMENTREQUEST_0_SHIPTOSTREET'] = $orderAddressDelivery->getAddress1().' '.$orderAddressDelivery->getAddress2().' '.$orderAddressDelivery->getAddress3();
652 652
 				$values['PAYMENTREQUEST_0_SHIPTOCITY'] = $orderAddressDelivery->getCity();
653 653
 				$values['PAYMENTREQUEST_0_SHIPTOSTATE'] = $orderAddressDelivery->getState();
654 654
 				$values['PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE'] = $orderAddressDelivery->getCountryId();
655 655
 				$values['PAYMENTREQUEST_0_SHIPTOZIP'] = $orderAddressDelivery->getPostal();
656 656
 			}
657
-			catch( \Exception $e ) { ; } // If no address is available
657
+			catch( \Exception $e ) {; } // If no address is available
658 658
 		}
659 659
 
660 660
 
@@ -669,10 +669,10 @@  discard block
 block discarded – undo
669 669
 				$deliveryPrice = clone $price;
670 670
 				$deliveryPrices = $this->addPrice( $deliveryPrices, $deliveryPrice->setValue( '0.00' ), $product->getQuantity() );
671 671
 
672
-				$values['L_PAYMENTREQUEST_0_NUMBER' . $lastPos] = $product->getId();
673
-				$values['L_PAYMENTREQUEST_0_NAME' . $lastPos] = $product->getName();
674
-				$values['L_PAYMENTREQUEST_0_QTY' . $lastPos] = $product->getQuantity();
675
-				$values['L_PAYMENTREQUEST_0_AMT' . $lastPos] = $this->getAmount( $price, false );
672
+				$values['L_PAYMENTREQUEST_0_NUMBER'.$lastPos] = $product->getId();
673
+				$values['L_PAYMENTREQUEST_0_NAME'.$lastPos] = $product->getName();
674
+				$values['L_PAYMENTREQUEST_0_QTY'.$lastPos] = $product->getQuantity();
675
+				$values['L_PAYMENTREQUEST_0_AMT'.$lastPos] = $this->getAmount( $price, false );
676 676
 			}
677 677
 		}
678 678
 
@@ -683,9 +683,9 @@  discard block
 block discarded – undo
683 683
 			if( ( $paymentCosts = $this->getAmount( $price ) ) > '0.00' )
684 684
 			{
685 685
 				$lastPos++;
686
-				$values['L_PAYMENTREQUEST_0_NAME' . $lastPos] = $this->getContext()->getI18n()->dt( 'mshop', 'Payment costs' );
687
-				$values['L_PAYMENTREQUEST_0_QTY' . $lastPos] = '1';
688
-				$values['L_PAYMENTREQUEST_0_AMT' . $lastPos] = $paymentCosts;
686
+				$values['L_PAYMENTREQUEST_0_NAME'.$lastPos] = $this->getContext()->getI18n()->dt( 'mshop', 'Payment costs' );
687
+				$values['L_PAYMENTREQUEST_0_QTY'.$lastPos] = '1';
688
+				$values['L_PAYMENTREQUEST_0_AMT'.$lastPos] = $paymentCosts;
689 689
 			}
690 690
 
691 691
 			try
@@ -703,7 +703,7 @@  discard block
 block discarded – undo
703 703
 				$values['L_SHIPPINGOPTIONNAME0'] = $orderServiceDeliveryItem->getName();
704 704
 				$values['L_SHIPPINGOPTIONISDEFAULT0'] = 'true';
705 705
 			}
706
-			catch( \Exception $e ) { ; } // If no delivery service is available
706
+			catch( \Exception $e ) {; } // If no delivery service is available
707 707
 		}
708 708
 
709 709
 
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -654,7 +654,9 @@  discard block
 block discarded – undo
654 654
 				$values['PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE'] = $orderAddressDelivery->getCountryId();
655 655
 				$values['PAYMENTREQUEST_0_SHIPTOZIP'] = $orderAddressDelivery->getPostal();
656 656
 			}
657
-			catch( \Exception $e ) { ; } // If no address is available
657
+			catch( \Exception $e )
658
+			{
659
+; } // If no address is available
658 660
 		}
659 661
 
660 662
 
@@ -703,7 +705,9 @@  discard block
 block discarded – undo
703 705
 				$values['L_SHIPPINGOPTIONNAME0'] = $orderServiceDeliveryItem->getName();
704 706
 				$values['L_SHIPPINGOPTIONISDEFAULT0'] = 'true';
705 707
 			}
706
-			catch( \Exception $e ) { ; } // If no delivery service is available
708
+			catch( \Exception $e )
709
+			{
710
+; } // If no delivery service is available
707 711
 		}
708 712
 
709 713
 
Please login to merge, or discard this patch.
lib/mshoplib/setup/default/DemoAddSupplierData.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
 		if( $value === '1' )
66 66
 		{
67 67
 			$ds = DIRECTORY_SEPARATOR;
68
-			$path = __DIR__ . $ds . 'data' . $ds . 'demo-supplier.php';
68
+			$path = __DIR__.$ds.'data'.$ds.'demo-supplier.php';
69 69
 
70 70
 			if( ( $data = include( $path ) ) == false ) {
71 71
 				throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for supplier domain', $path ) );
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -75,8 +75,7 @@
 block discarded – undo
75 75
 			$this->saveCustomerItems( $data );
76 76
 
77 77
 			$this->status( 'added' );
78
-		}
79
-		else
78
+		} else
80 79
 		{
81 80
 			$this->status( 'removed' );
82 81
 		}
Please login to merge, or discard this patch.
lib/mshoplib/setup/unitperf/ServiceAddBasePerfData.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -80,11 +80,11 @@  discard block
 block discarded – undo
80 80
 
81 81
 		for( $i = 0; $i < 100; $i++ )
82 82
 		{
83
-			$code = 'perf-pay-' . str_pad( $i, 3, '0', STR_PAD_LEFT );
83
+			$code = 'perf-pay-'.str_pad( $i, 3, '0', STR_PAD_LEFT );
84 84
 
85 85
 			$item->setId( null );
86 86
 			$item->setCode( $code );
87
-			$item->setLabel( 'Payment service ' . $code );
87
+			$item->setLabel( 'Payment service '.$code );
88 88
 			$item->setPosition( $i );
89 89
 
90 90
 			$manager->saveItem( $item, false );
@@ -114,11 +114,11 @@  discard block
 block discarded – undo
114 114
 
115 115
 		for( $i = 0; $i < 100; $i++ )
116 116
 		{
117
-			$code = 'perf-ship-' . str_pad( $i, 3, '0', STR_PAD_LEFT );
117
+			$code = 'perf-ship-'.str_pad( $i, 3, '0', STR_PAD_LEFT );
118 118
 
119 119
 			$item->setId( null );
120 120
 			$item->setCode( $code );
121
-			$item->setLabel( 'Delivery service ' . $code );
121
+			$item->setLabel( 'Delivery service '.$code );
122 122
 			$item->setPosition( $i );
123 123
 
124 124
 			$manager->saveItem( $item, false );
Please login to merge, or discard this patch.
lib/mshoplib/tests/MShop/Coupon/Provider/Decorator/CategoryTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 		$this->couponItem = \Aimeos\MShop\Coupon\Manager\Factory::createManager( $this->context )->createItem();
25 25
 
26 26
 		$provider = new \Aimeos\MShop\Coupon\Provider\Example( $this->context, $this->couponItem, 'abcd' );
27
-		$this->object = new \Aimeos\MShop\Coupon\Provider\Decorator\Category( $provider, $this->context, $this->couponItem, 'abcd');
27
+		$this->object = new \Aimeos\MShop\Coupon\Provider\Decorator\Category( $provider, $this->context, $this->couponItem, 'abcd' );
28 28
 		$this->object->setObject( $this->object );
29 29
 
30 30
 		$priceManager = \Aimeos\MShop\Factory::createManager( $this->context, 'price' );
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Customer/Manager/Base.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 		$search->setSlice( 0, 0x7fffffff );
124 124
 
125 125
 		foreach( $manager->searchItems( $search ) as $listid => $listItem ) {
126
-			$listMap[ $listItem->getRefId() ] = $listid;
126
+			$listMap[$listItem->getRefId()] = $listid;
127 127
 		}
128 128
 
129 129
 
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 			$listItem->setTypeId( $typeId );
139 139
 			$listItem->setStatus( 1 );
140 140
 
141
-			$pos = count( $listMap ) ;
141
+			$pos = count( $listMap );
142 142
 
143 143
 			foreach( $item->getGroups() as $gid )
144 144
 			{
@@ -253,12 +253,12 @@  discard block
 block discarded – undo
253 253
 
254 254
 		if( ctype_alnum( $name ) === false )
255 255
 		{
256
-			$classname = is_string( $name ) ? '\\Aimeos\\MShop\\Common\\Item\\Helper\\Password\\' . $name : '<not a string>';
256
+			$classname = is_string( $name ) ? '\\Aimeos\\MShop\\Common\\Item\\Helper\\Password\\'.$name : '<not a string>';
257 257
 			throw new \Aimeos\MShop\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
258 258
 		}
259 259
 
260 260
 		$iface = '\\Aimeos\\MShop\\Common\\Item\\Helper\\Password\\Iface';
261
-		$classname = '\\Aimeos\\MShop\\Common\\Item\\Helper\\Password\\' . $name;
261
+		$classname = '\\Aimeos\\MShop\\Common\\Item\\Helper\\Password\\'.$name;
262 262
 
263 263
 		if( class_exists( $classname ) === false ) {
264 264
 			throw new \Aimeos\MShop\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
Please login to merge, or discard this patch.