Completed
Push — master ( 1fc904...dc433d )
by Aimeos
07:56
created
lib/mshoplib/src/MShop/Index/Manager/Catalog/Standard.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 		 * @see mshop/index/manager/catalog/decorators/global
367 367
 		 */
368 368
 
369
-		return $this->getSubManagerBase( 'index', 'catalog/' . $manager, $name );
369
+		return $this->getSubManagerBase( 'index', 'catalog/'.$manager, $name );
370 370
 	}
371 371
 
372 372
 
@@ -485,7 +485,7 @@  discard block
 block discarded – undo
485 485
 
486 486
 					try {
487 487
 						$stmt->execute()->finish();
488
-					} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates
488
+					} catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates
489 489
 				}
490 490
 			}
491 491
 
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -483,9 +483,13 @@
 block discarded – undo
483 483
 					$stmt->bind( 7, $editor );
484 484
 					$stmt->bind( 8, $date ); //ctime
485 485
 
486
-					try {
486
+					try
487
+					{
487 488
 						$stmt->execute()->finish();
488
-					} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates
489
+					}
490
+					catch( \Aimeos\MW\DB\Exception $e )
491
+					{
492
+; } // Ignore duplicates
489 493
 				}
490 494
 			}
491 495
 
Please login to merge, or discard this patch.
lib/mshoplib/setup/unittest/CustomerAddTestData.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		$ds = DIRECTORY_SEPARATOR;
53 53
 		$this->additional->setEditor( 'core:unittest' );
54 54
 
55
-		$this->process( __DIR__ . $ds . 'data' . $ds . 'customer.php' );
55
+		$this->process( __DIR__.$ds.'data'.$ds.'customer.php' );
56 56
 
57 57
 		$this->status( 'done' );
58 58
 
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 
208 208
 			try {
209 209
 				$customerGroupManager->saveItem( $group, false );
210
-			} catch( \Exception $e ) { ; } // ignore duplicates
210
+			} catch( \Exception $e ) {; } // ignore duplicates
211 211
 		}
212 212
 	}
213 213
 }
214 214
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -205,9 +205,13 @@
 block discarded – undo
205 205
 			$group->setCode( $dataset['code'] );
206 206
 			$group->setLabel( $dataset['label'] );
207 207
 
208
-			try {
208
+			try
209
+			{
209 210
 				$customerGroupManager->saveItem( $group, false );
210
-			} catch( \Exception $e ) { ; } // ignore duplicates
211
+			}
212
+			catch( \Exception $e )
213
+			{
214
+; } // ignore duplicates
211 215
 		}
212 216
 	}
213 217
 }
214 218
\ No newline at end of file
Please login to merge, or discard this patch.
lib/mshoplib/setup/TablesCreatePlatform.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -46,13 +46,13 @@
 block discarded – undo
46 46
 
47 47
 		$ds = DIRECTORY_SEPARATOR;
48 48
 
49
-		$this->setupPlatform( 'db-index', 'mysql', realpath( __DIR__ ) . $ds . 'default' . $ds . 'schema' . $ds . 'index-mysql.sql' );
50
-		$this->setupPlatform( 'db-order', 'mysql', realpath( __DIR__ ) . $ds . 'default' . $ds . 'schema' . $ds . 'order-mysql.sql' );
51
-		$this->setupPlatform( 'db-text', 'mysql', realpath( __DIR__ ) . $ds . 'default' . $ds . 'schema' . $ds . 'text-mysql.sql' );
49
+		$this->setupPlatform( 'db-index', 'mysql', realpath( __DIR__ ).$ds.'default'.$ds.'schema'.$ds.'index-mysql.sql' );
50
+		$this->setupPlatform( 'db-order', 'mysql', realpath( __DIR__ ).$ds.'default'.$ds.'schema'.$ds.'order-mysql.sql' );
51
+		$this->setupPlatform( 'db-text', 'mysql', realpath( __DIR__ ).$ds.'default'.$ds.'schema'.$ds.'text-mysql.sql' );
52 52
 
53
-		$this->setupPlatform( 'db-index', 'pgsql', realpath( __DIR__ ) . $ds . 'default' . $ds . 'schema' . $ds . 'index-pgsql.sql' );
54
-		$this->setupPlatform( 'db-order', 'pgsql', realpath( __DIR__ ) . $ds . 'default' . $ds . 'schema' . $ds . 'order-pgsql.sql' );
55
-		$this->setupPlatform( 'db-text', 'pgsql', realpath( __DIR__ ) . $ds . 'default' . $ds . 'schema' . $ds . 'text-pgsql.sql' );
53
+		$this->setupPlatform( 'db-index', 'pgsql', realpath( __DIR__ ).$ds.'default'.$ds.'schema'.$ds.'index-pgsql.sql' );
54
+		$this->setupPlatform( 'db-order', 'pgsql', realpath( __DIR__ ).$ds.'default'.$ds.'schema'.$ds.'order-pgsql.sql' );
55
+		$this->setupPlatform( 'db-text', 'pgsql', realpath( __DIR__ ).$ds.'default'.$ds.'schema'.$ds.'text-pgsql.sql' );
56 56
 	}
57 57
 
58 58
 
Please login to merge, or discard this patch.
lib/mshoplib/setup/MShopAddTypeData.php 2 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -100,10 +100,14 @@
 block discarded – undo
100 100
 				$type->setLabel( $dataset['label'] );
101 101
 				$type->setStatus( $dataset['status'] );
102 102
 
103
-				try {
103
+				try
104
+				{
104 105
 					$domainManager->saveItem( $type );
105 106
 					$num++;
106
-				} catch( \Exception $e ) { ; } // if type was already available
107
+				}
108
+				catch( \Exception $e )
109
+				{
110
+; } // if type was already available
107 111
 			}
108 112
 
109 113
 			$this->status( $num > 0 ? $num . '/' . $total : 'OK' );
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 
67 67
 
68 68
 		$ds = DIRECTORY_SEPARATOR;
69
-		$filename = __DIR__ . $ds . 'default' . $ds . 'data' . $ds . 'type.php';
69
+		$filename = __DIR__.$ds.'default'.$ds.'data'.$ds.'type.php';
70 70
 
71 71
 		if( ( $testdata = include( $filename ) ) == false ) {
72 72
 			throw new \Aimeos\MShop\Exception( sprintf( 'No type file found in "%1$s"', $filename ) );
@@ -103,10 +103,10 @@  discard block
 block discarded – undo
103 103
 				try {
104 104
 					$domainManager->saveItem( $type );
105 105
 					$num++;
106
-				} catch( \Exception $e ) { ; } // if type was already available
106
+				} catch( \Exception $e ) {; } // if type was already available
107 107
 			}
108 108
 
109
-			$this->status( $num > 0 ? $num . '/' . $total : 'OK' );
109
+			$this->status( $num > 0 ? $num.'/'.$total : 'OK' );
110 110
 		}
111 111
 
112 112
 		$this->additional->setEditor( $editor );
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
147 147
 			if( !isset( $this->domainManagers[$domainname] ) )
148 148
 			{
149 149
 				$iface = '\\Aimeos\\MShop\\Common\\Manager\\Iface';
150
-				$factory = '\\Aimeos\\MShop\\' . ucwords( $domainname ) . '\\Manager\\Factory';
151
-				$manager = call_user_func_array( $factory . '::createManager', array( $this->additional ) );
150
+				$factory = '\\Aimeos\\MShop\\'.ucwords( $domainname ).'\\Manager\\Factory';
151
+				$manager = call_user_func_array( $factory.'::createManager', array( $this->additional ) );
152 152
 
153 153
 				if( !( $manager instanceof $iface ) ) {
154 154
 					throw new \RuntimeException( sprintf( 'No factory "%1$s" found', $factory ) );
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 
161 161
 			foreach( $parts as $part )
162 162
 			{
163
-				$tmpname = $domainname . '/' . $part;
163
+				$tmpname = $domainname.'/'.$part;
164 164
 
165 165
 				if( !isset( $this->domainManagers[$tmpname] ) ) {
166 166
 					$this->domainManagers[$tmpname] = $this->domainManagers[$domainname]->getSubManager( $part );
Please login to merge, or discard this patch.
lib/mwlib/tests/MW/View/Helper/Access/StandardTest.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -14,7 +14,9 @@  discard block
 block discarded – undo
14 14
 	public function testTransformSingleOK()
15 15
 	{
16 16
 		$view = new \Aimeos\MW\View\Standard();
17
-		$fcn = function() { return array( 'editor' ); };
17
+		$fcn = function()
18
+		{
19
+return array( 'editor' ); };
18 20
 
19 21
 		$object = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
20 22
 		$this->assertTrue( $object->transform( 'editor' ) );
@@ -24,7 +26,9 @@  discard block
 block discarded – undo
24 26
 	public function testTransformSingleFailure()
25 27
 	{
26 28
 		$view = new \Aimeos\MW\View\Standard();
27
-		$fcn = function() { return array( 'editor' ); };
29
+		$fcn = function()
30
+		{
31
+return array( 'editor' ); };
28 32
 
29 33
 		$object = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
30 34
 		$this->assertFalse( $object->transform( 'admin' ) );
@@ -34,7 +38,9 @@  discard block
 block discarded – undo
34 38
 	public function testTransformMultipleOK()
35 39
 	{
36 40
 		$view = new \Aimeos\MW\View\Standard();
37
-		$fcn = function() { return array( 'admin', 'editor' ); };
41
+		$fcn = function()
42
+		{
43
+return array( 'admin', 'editor' ); };
38 44
 
39 45
 		$object = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
40 46
 		$this->assertTrue( $object->transform( array( 'editor' ) ) );
@@ -44,7 +50,9 @@  discard block
 block discarded – undo
44 50
 	public function testTransformMultipleFailure()
45 51
 	{
46 52
 		$view = new \Aimeos\MW\View\Standard();
47
-		$fcn = function() { return array( 'admin', 'editor' ); };
53
+		$fcn = function()
54
+		{
55
+return array( 'admin', 'editor' ); };
48 56
 
49 57
 		$object = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
50 58
 		$this->assertFalse( $object->transform( array( 'test', 'example' ) ) );
Please login to merge, or discard this patch.
lib/mshoplib/setup/OrderAddTimes.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -161,7 +161,7 @@
 block discarded – undo
161 161
 
162 162
 				$stmt->bind( 1, $date );
163 163
 				$stmt->bind( 2, substr( $date, 0, 7 ) );
164
-				$stmt->bind( 3, date_create_from_format( 'Y-m-d', $date )->format( 'Y-W' )  );
164
+				$stmt->bind( 3, date_create_from_format( 'Y-m-d', $date )->format( 'Y-W' ) );
165 165
 				$stmt->bind( 4, substr( $time, 0, 2 ) );
166 166
 				$stmt->bind( 5, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
167 167
 
Please login to merge, or discard this patch.
lib/mwlib/src/MW/Template/Iface.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	/**
35 35
 	 * Removes the content between the marker.
36 36
 	 *
37
-	 * @param array|string $name Marker name or list thereof
37
+	 * @param string $name Marker name or list thereof
38 38
 	 * @return \Aimeos\MW\Template\Iface Own Instance for method chaining
39 39
 	 */
40 40
 	public function disable( $name );
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
 	/**
62 62
 	 * Replaces a string or a list of strings.
63 63
 	 *
64
-	 * @param string|array $old String or list of strings to remove
65
-	 * @param string|array $new String or list of strings to insert instead
64
+	 * @param string $old String or list of strings to remove
65
+	 * @param string $new String or list of strings to insert instead
66 66
 	 * @return \Aimeos\MW\Template\Iface Own Instance for method chaining
67 67
 	 */
68 68
 	public function replace( $old, $new );
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Product/Manager/Property/Standard.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -563,13 +563,13 @@  discard block
 block discarded – undo
563 563
 			 * @see mshop/product/manager/property/standard/delete/ansi
564 564
 			 * @see mshop/product/manager/property/standard/search/ansi
565 565
 			 */
566
-			$cfgPathCount =  'mshop/product/manager/property/standard/count';
566
+			$cfgPathCount = 'mshop/product/manager/property/standard/count';
567 567
 
568 568
 			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
569 569
 			while( ( $row = $results->fetch() ) !== false )
570 570
 			{
571
-				$map[ $row['product.property.id'] ] = $row;
572
-				$typeIds[ $row['product.property.typeid'] ] = null;
571
+				$map[$row['product.property.id']] = $row;
572
+				$typeIds[$row['product.property.typeid']] = null;
573 573
 			}
574 574
 
575 575
 			$dbm->release( $conn, $dbname );
@@ -590,9 +590,9 @@  discard block
 block discarded – undo
590 590
 
591 591
 			foreach( $map as $id => $row )
592 592
 			{
593
-				if( isset( $typeItems[ $row['product.property.typeid'] ] ) )
593
+				if( isset( $typeItems[$row['product.property.typeid']] ) )
594 594
 				{
595
-					$row['product.property.type'] = $typeItems[ $row['product.property.typeid'] ]->getCode();
595
+					$row['product.property.type'] = $typeItems[$row['product.property.typeid']]->getCode();
596 596
 					$row['product.property.typename'] = $typeItems[$row['product.property.typeid']]->getName();
597 597
 				}
598 598
 
@@ -723,7 +723,7 @@  discard block
 block discarded – undo
723 723
 		 * @see mshop/product/manager/property/decorators/global
724 724
 		 */
725 725
 
726
-		return $this->getSubManagerBase( 'product', 'property/' . $manager, $name );
726
+		return $this->getSubManagerBase( 'product', 'property/'.$manager, $name );
727 727
 	}
728 728
 
729 729
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -222,8 +222,7 @@
 block discarded – undo
222 222
 				 * @see mshop/product/manager/property/standard/count/ansi
223 223
 				 */
224 224
 				$path = 'mshop/product/manager/property/standard/insert';
225
-			}
226
-			else
225
+			} else
227 226
 			{
228 227
 				/** mshop/product/manager/property/standard/update/mysql
229 228
 				 * Updates an existing product property record in the database
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Index/Manager/Text/Standard.php 2 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -909,9 +909,13 @@
 block discarded – undo
909 909
 		$stmt->bind( 10, $editor );
910 910
 		$stmt->bind( 11, $date ); //ctime
911 911
 
912
-		try {
912
+		try
913
+		{
913 914
 			$stmt->execute()->finish();
914
-		} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates
915
+		}
916
+		catch( \Aimeos\MW\DB\Exception $e )
917
+		{
918
+; } // Ignore duplicates
915 919
 	}
916 920
 
917 921
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
 		 * @see mshop/index/manager/text/decorators/global
369 369
 		 */
370 370
 
371
-		return $this->getSubManagerBase( 'index', 'text/' . $manager, $name );
371
+		return $this->getSubManagerBase( 'index', 'text/'.$manager, $name );
372 372
 	}
373 373
 
374 374
 
@@ -857,7 +857,7 @@  discard block
 block discarded – undo
857 857
 
858 858
 		try {
859 859
 			$stmt->execute()->finish();
860
-		} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates
860
+		} catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates
861 861
 	}
862 862
 
863 863
 
@@ -874,7 +874,7 @@  discard block
 block discarded – undo
874 874
 
875 875
 		$search = $manager->createSearch( true );
876 876
 		$expr = array(
877
-			$search->compare( '==', $domain . '.id', $ids ),
877
+			$search->compare( '==', $domain.'.id', $ids ),
878 878
 			$search->getConditions()
879 879
 		);
880 880
 		$search->setConditions( $search->combine( '&&', $expr ) );
Please login to merge, or discard this patch.