Completed
Push — master ( 815faa...197710 )
by Aimeos
07:55
created
lib/mshoplib/src/MShop/Order/Manager/Base/Service/Standard.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -226,8 +226,7 @@
 block discarded – undo
226 226
 
227 227
 					$params[] = implode( ',', $list );
228 228
 				}
229
-			}
230
-			else
229
+			} else
231 230
 			{
232 231
 				$params[] = $this->escape( '==', $this->getParamType( $string ), $string );
233 232
 			}
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 			$stmt->bind( 11, $price->getTaxValue() );
373 373
 			$stmt->bind( 12, $price->getTaxRate() );
374 374
 			$stmt->bind( 13, $price->getTaxFlag(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
375
-			$stmt->bind( 14, $date); // mtime
375
+			$stmt->bind( 14, $date ); // mtime
376 376
 			$stmt->bind( 15, $context->getEditor() );
377 377
 
378 378
 			if( $id !== null ) {
@@ -838,7 +838,7 @@  discard block
 block discarded – undo
838 838
 		 * @see mshop/order/manager/base/service/decorators/global
839 839
 		 */
840 840
 
841
-		return $this->getSubManagerBase( 'order', 'base/service/' . $manager, $name );
841
+		return $this->getSubManagerBase( 'order', 'base/service/'.$manager, $name );
842 842
 	}
843 843
 
844 844
 
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Plugin/Manager/Standard.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -226,8 +226,7 @@
 block discarded – undo
226 226
 
227 227
 					$params[] = implode( ',', $list );
228 228
 				}
229
-			}
230
-			else
229
+			} else
231 230
 			{
232 231
 				$params[] = $this->escape( '==', $this->getParamType( $string ), $string );
233 232
 			}
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 	{
216 216
 		$path = 'mshop/plugin/manager/submanagers';
217 217
 
218
-		return $this->getResourceTypeBase( 'plugin', $path, array( 'type'), $withsub );
218
+		return $this->getResourceTypeBase( 'plugin', $path, array( 'type' ), $withsub );
219 219
 	}
220 220
 
221 221
 
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 		}
303 303
 
304 304
 		$interface = '\\Aimeos\\MShop\\Plugin\\Provider\\Factory\\Iface';
305
-		$classname = '\\Aimeos\\MShop\\Plugin\\Provider\\' . $type . '\\' . $provider;
305
+		$classname = '\\Aimeos\\MShop\\Plugin\\Provider\\'.$type.'\\'.$provider;
306 306
 
307 307
 		if( class_exists( $classname ) === false ) {
308 308
 			throw new \Aimeos\MShop\Plugin\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
 		 * @category Developer
341 341
 		 * @see mshop/plugin/provider/order/decorators
342 342
 		 */
343
-		$decorators = $config->get( 'mshop/plugin/provider/' . $item->getType() . '/decorators', array() );
343
+		$decorators = $config->get( 'mshop/plugin/provider/'.$item->getType().'/decorators', array() );
344 344
 
345 345
 		$provider = $this->addPluginDecorators( $item, $provider, $names );
346 346
 		return $this->addPluginDecorators( $item, $provider, $decorators );
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Price/Manager/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -226,8 +226,7 @@
 block discarded – undo
226 226
 
227 227
 					$params[] = implode( ',', $list );
228 228
 				}
229
-			}
230
-			else
229
+			} else
231 230
 			{
232 231
 				$params[] = $this->escape( '==', $this->getParamType( $string ), $string );
233 232
 			}
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Product/Manager/Standard.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -226,8 +226,7 @@
 block discarded – undo
226 226
 
227 227
 					$params[] = implode( ',', $list );
228 228
 				}
229
-			}
230
-			else
229
+			} else
231 230
 			{
232 231
 				$params[] = $this->escape( '==', $this->getParamType( $string ), $string );
233 232
 			}
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,8 +136,8 @@
 block discarded – undo
136 136
 			'( SELECT COUNT(mproli2."parentid") FROM "mshop_product_list" AS mproli2
137 137
 				WHERE mpro."id" = mproli2."parentid" AND :site
138 138
 					AND mproli2."domain" = $1 AND mproli2."refid" IN ( $3 ) AND mproli2."typeid" = $2
139
-					AND ( mproli2."start" IS NULL OR mproli2."start" <= \'' . $date . '\' )
140
-					AND ( mproli2."end" IS NULL OR mproli2."end" >= \'' . $date . '\' ) )';
139
+					AND ( mproli2."start" IS NULL OR mproli2."start" <= \'' . $date.'\' )
140
+					AND ( mproli2."end" IS NULL OR mproli2."end" >= \'' . $date.'\' ) )';
141 141
 
142 142
 		$sites = $context->getLocale()->getSitePath();
143 143
 		$this->replaceSiteMarker( $this->searchConfig['product.contains'], 'mproli2."siteid"', $sites, ':site' );
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Service/Provider/Delivery/Standard.php 2 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -65,15 +65,13 @@
 block discarded – undo
65 65
 				{
66 66
 					$options[$name] = (array) $options[$name];
67 67
 					$options[$name][] = substr( $option, $pos + 1 );
68
-				}
69
-				else
68
+				} else
70 69
 				{
71 70
 					$options[$name] = substr( $option, $pos + 1 );
72 71
 				}
73 72
 
74 73
 				unset( $params[$key] );
75
-			}
76
-			else
74
+			} else
77 75
 			{
78 76
 				printf( "Invalid option \"%1\$s\"\n", $option );
79 77
 				usage();
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -82,11 +82,11 @@  discard block
 block discarded – undo
82 82
 		$logger = $this->getContext()->getLogger();
83 83
 		$xml = $this->buildXML( $order );
84 84
 
85
-		$logger->log( __METHOD__ . ": XML request =\n" . $xml, \Aimeos\MW\Logger\Base::INFO );
85
+		$logger->log( __METHOD__.": XML request =\n".$xml, \Aimeos\MW\Logger\Base::INFO );
86 86
 
87 87
 		$response = $this->sendRequest( $xml );
88 88
 
89
-		$logger->log( __METHOD__ . ": XML response =\n" . trim( $response ), \Aimeos\MW\Logger\Base::INFO );
89
+		$logger->log( __METHOD__.": XML response =\n".trim( $response ), \Aimeos\MW\Logger\Base::INFO );
90 90
 
91 91
 		$this->checkResponse( $response, $order->getId() );
92 92
 
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 			{
165 165
 				$context->getLogger()->log( 'Using user name and password for authentication', \Aimeos\MW\Logger\Base::NOTICE );
166 166
 				curl_setopt( $curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY );
167
-				curl_setopt( $curl, CURLOPT_USERPWD, $config['default.username'] . ':' . $config['default.password'] );
167
+				curl_setopt( $curl, CURLOPT_USERPWD, $config['default.username'].':'.$config['default.password'] );
168 168
 			}
169 169
 
170 170
 			$urlinfo = parse_url( $config['default.url'] );
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 	 */
221 221
 	protected function checkResponse( $response, $invoiceid )
222 222
 	{
223
-		$responseXSD = __DIR__ . DIRECTORY_SEPARATOR . 'xsd' . DIRECTORY_SEPARATOR . 'order-response_v1.xsd';
223
+		$responseXSD = __DIR__.DIRECTORY_SEPARATOR.'xsd'.DIRECTORY_SEPARATOR.'order-response_v1.xsd';
224 224
 
225 225
 		$dom = new \DOMDocument( '1.0', 'UTF-8' );
226 226
 		$dom->preserveWhiteSpace = false;
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 			throw new \Aimeos\MShop\Service\Exception( sprintf( $msg, $e->getMessage() ), 0, $e );
299 299
 		}
300 300
 
301
-		$requestXSD = __DIR__ . DIRECTORY_SEPARATOR . 'xsd' . DIRECTORY_SEPARATOR . 'order-request_v1.xsd';
301
+		$requestXSD = __DIR__.DIRECTORY_SEPARATOR.'xsd'.DIRECTORY_SEPARATOR.'order-request_v1.xsd';
302 302
 
303 303
 		if( $dom->schemaValidate( $requestXSD ) !== true )
304 304
 		{
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Supplier/Manager/Standard.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -226,8 +226,7 @@
 block discarded – undo
226 226
 
227 227
 					$params[] = implode( ',', $list );
228 228
 				}
229
-			}
230
-			else
229
+			} else
231 230
 			{
232 231
 				$params[] = $this->escape( '==', $this->getParamType( $string ), $string );
233 232
 			}
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -163,8 +163,8 @@  discard block
 block discarded – undo
163 163
 	 */
164 164
 	public function createItem()
165 165
 	{
166
-		$values = array('supplier.siteid' => $this->getContext()->getLocale()->getSiteId());
167
-		return $this->createItemBase($values);
166
+		$values = array( 'supplier.siteid' => $this->getContext()->getLocale()->getSiteId() );
167
+		return $this->createItemBase( $values );
168 168
 	}
169 169
 
170 170
 
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
 			 * @see mshop/supplier/manager/standard/delete
492 492
 			 * @see mshop/supplier/manager/standard/search
493 493
 			 */
494
-			$cfgPathCount =  'mshop/supplier/manager/standard/count';
494
+			$cfgPathCount = 'mshop/supplier/manager/standard/count';
495 495
 
496 496
 			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
497 497
 			while( ( $row = $results->fetch() ) !== false ) {
@@ -530,10 +530,10 @@  discard block
 block discarded – undo
530 530
 	 * @param boolean $default
531 531
 	 * @return \Aimeos\MW\Criteria\Iface
532 532
 	 */
533
-	public function createSearch($default = false)
533
+	public function createSearch( $default = false )
534 534
 	{
535
-		if ($default) {
536
-			return $this->createSearchBase('supplier');
535
+		if( $default ) {
536
+			return $this->createSearchBase( 'supplier' );
537 537
 		}
538 538
 
539 539
 		return parent::createSearch();
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Tag/Manager/Standard.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -226,8 +226,7 @@
 block discarded – undo
226 226
 
227 227
 					$params[] = implode( ',', $list );
228 228
 				}
229
-			}
230
-			else
229
+			} else
231 230
 			{
232 231
 				$params[] = $this->escape( '==', $this->getParamType( $string ), $string );
233 232
 			}
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -686,7 +686,7 @@
 block discarded – undo
686 686
 		 * @see mshop/tag/manager/decorators/global
687 687
 		 */
688 688
 
689
-		return $this->getSubManagerBase( 'tag', '' . $manager, $name );
689
+		return $this->getSubManagerBase( 'tag', ''.$manager, $name );
690 690
 	}
691 691
 
692 692
 
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Text/Manager/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -226,8 +226,7 @@
 block discarded – undo
226 226
 
227 227
 					$params[] = implode( ',', $list );
228 228
 				}
229
-			}
230
-			else
229
+			} else
231 230
 			{
232 231
 				$params[] = $this->escape( '==', $this->getParamType( $string ), $string );
233 232
 			}
Please login to merge, or discard this patch.
lib/mshoplib/tests/MShop/Service/Provider/Decorator/BaseTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,8 +19,8 @@
 block discarded – undo
19 19
 
20 20
 		$servManager = \Aimeos\MShop\Service\Manager\Factory::createManager( $this->context );
21 21
 		$search = $servManager->createSearch();
22
-		$search->setConditions($search->compare('==', 'service.provider', 'Standard'));
23
-		$result = $servManager->searchItems($search, array('price'));
22
+		$search->setConditions( $search->compare( '==', 'service.provider', 'Standard' ) );
23
+		$result = $servManager->searchItems( $search, array( 'price' ) );
24 24
 
25 25
 		if( ( $item = reset( $result ) ) === false ) {
26 26
 			throw new \Exception( 'No order base item found' );
Please login to merge, or discard this patch.