Completed
Push — master ( f874d3...34d177 )
by Aimeos
08:55
created
lib/mshoplib/setup/unitperf/ProductAddPricePerfData.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@
 block discarded – undo
118 118
 				for( $i = 0; $i < 3; $i++ )
119 119
 				{
120 120
 					$priceItem->setId( null );
121
-					$priceItem->setLabel( $item->getLabel() . ': from ' . ( 1 + $i * 5 ) );
121
+					$priceItem->setLabel( $item->getLabel().': from '.( 1 + $i * 5 ) );
122 122
 					$priceItem->setQuantity( 1 + $i * 5 );
123 123
 					$priceItem->setValue( $price - $i * 10 );
124 124
 					$priceItem->setRebate( $i * 10 );
Please login to merge, or discard this patch.
lib/mshoplib/setup/unitperf/ProductAddMediaPerfData.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -104,8 +104,8 @@  discard block
 block discarded – undo
104 104
 		$downloadItem->setDomain( 'product' );
105 105
 		$downloadItem->setMimeType( 'application/pdf' );
106 106
 		$downloadItem->setLabel( 'PDF download' );
107
-		$downloadItem->setPreview( $prefix . 'unitperf/download-preview.jpg' );
108
-		$downloadItem->setUrl( $prefix . 'unitperf/download.pdf' );
107
+		$downloadItem->setPreview( $prefix.'unitperf/download-preview.jpg' );
108
+		$downloadItem->setUrl( $prefix.'unitperf/download.pdf' );
109 109
 		$downloadItem->setStatus( 1 );
110 110
 
111 111
 		$mediaManager->saveItem( $downloadItem );
@@ -137,9 +137,9 @@  discard block
 block discarded – undo
137 137
 			foreach( $result as $id => $item )
138 138
 			{
139 139
 				$mediaItem->setId( null );
140
-				$mediaItem->setLabel( '1. picture for ' . $item->getLabel() );
141
-				$mediaItem->setPreview( $prefix . 'unitperf/' . ( ( $pos + 0 ) % 4 + 1 ) . '.jpg' );
142
-				$mediaItem->setUrl( $prefix . 'unitperf/' . ( ( $pos + 0 ) % 4 + 1 ) . '-big.jpg' );
140
+				$mediaItem->setLabel( '1. picture for '.$item->getLabel() );
141
+				$mediaItem->setPreview( $prefix.'unitperf/'.( ( $pos + 0 ) % 4 + 1 ).'.jpg' );
142
+				$mediaItem->setUrl( $prefix.'unitperf/'.( ( $pos + 0 ) % 4 + 1 ).'-big.jpg' );
143 143
 				$mediaManager->saveItem( $mediaItem );
144 144
 
145 145
 				$listItem->setId( null );
@@ -150,9 +150,9 @@  discard block
 block discarded – undo
150 150
 
151 151
 
152 152
 				$mediaItem->setId( null );
153
-				$mediaItem->setLabel( '2. picture for ' . $item->getLabel() );
154
-				$mediaItem->setPreview( $prefix . 'unitperf/' . ( ( $pos + 1 ) % 4 + 1 ) . '.jpg' );
155
-				$mediaItem->setUrl( $prefix . 'unitperf/' . ( ( $pos + 1 ) % 4 + 1 ) . '-big.jpg' );
153
+				$mediaItem->setLabel( '2. picture for '.$item->getLabel() );
154
+				$mediaItem->setPreview( $prefix.'unitperf/'.( ( $pos + 1 ) % 4 + 1 ).'.jpg' );
155
+				$mediaItem->setUrl( $prefix.'unitperf/'.( ( $pos + 1 ) % 4 + 1 ).'-big.jpg' );
156 156
 				$mediaManager->saveItem( $mediaItem );
157 157
 
158 158
 				$listItem->setId( null );
@@ -163,9 +163,9 @@  discard block
 block discarded – undo
163 163
 
164 164
 
165 165
 				$mediaItem->setId( null );
166
-				$mediaItem->setLabel( '3. picture for ' . $item->getLabel() );
167
-				$mediaItem->setPreview( $prefix . 'unitperf/' . ( ( $pos + 2 ) % 4 + 1 ) . '.jpg' );
168
-				$mediaItem->setUrl( $prefix . 'unitperf/' . ( ( $pos + 2 ) % 4 + 1 ) . '-big.jpg' );
166
+				$mediaItem->setLabel( '3. picture for '.$item->getLabel() );
167
+				$mediaItem->setPreview( $prefix.'unitperf/'.( ( $pos + 2 ) % 4 + 1 ).'.jpg' );
168
+				$mediaItem->setUrl( $prefix.'unitperf/'.( ( $pos + 2 ) % 4 + 1 ).'-big.jpg' );
169 169
 				$mediaManager->saveItem( $mediaItem );
170 170
 
171 171
 				$listItem->setId( null );
@@ -176,9 +176,9 @@  discard block
 block discarded – undo
176 176
 
177 177
 
178 178
 				$mediaItem->setId( null );
179
-				$mediaItem->setLabel( '4. picture for ' . $item->getLabel() );
180
-				$mediaItem->setPreview( $prefix . 'unitperf/' . ( ( $pos + 3 ) % 4 + 1 ) . '.jpg' );
181
-				$mediaItem->setUrl( $prefix . 'unitperf/' . ( ( $pos + 3 ) % 4 + 1 ) . '-big.jpg' );
179
+				$mediaItem->setLabel( '4. picture for '.$item->getLabel() );
180
+				$mediaItem->setPreview( $prefix.'unitperf/'.( ( $pos + 3 ) % 4 + 1 ).'.jpg' );
181
+				$mediaItem->setUrl( $prefix.'unitperf/'.( ( $pos + 3 ) % 4 + 1 ).'-big.jpg' );
182 182
 				$mediaManager->saveItem( $mediaItem );
183 183
 
184 184
 				$listItem->setId( null );
Please login to merge, or discard this patch.
lib/mshoplib/setup/unitperf/CatalogAddBasePerfData.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -58,8 +58,8 @@  discard block
 block discarded – undo
58 58
 		for( $i = 1; $i <= 5; $i++ )
59 59
 		{
60 60
 			$catalogOneItem = $catalogManager->createItem();
61
-			$catalogOneItem->setCode( 'cat-' . $i );
62
-			$catalogOneItem->setLabel( 'cat-' . $i );
61
+			$catalogOneItem->setCode( 'cat-'.$i );
62
+			$catalogOneItem->setLabel( 'cat-'.$i );
63 63
 			$catalogOneItem->setStatus( 1 );
64 64
 
65 65
 			$catalogManager->insertItem( $catalogOneItem, $catalogRootItem->getId() );
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
 			for( $j = 1; $j <= 10; $j++ )
68 68
 			{
69 69
 				$catalogTwoItem = $catalogManager->createItem();
70
-				$catalogTwoItem->setCode( 'cat-' . $i . ':' . $j );
71
-				$catalogTwoItem->setLabel( 'cat-' . $i . ':' . $j );
70
+				$catalogTwoItem->setCode( 'cat-'.$i.':'.$j );
71
+				$catalogTwoItem->setLabel( 'cat-'.$i.':'.$j );
72 72
 				$catalogTwoItem->setStatus( 1 );
73 73
 
74 74
 				$catalogManager->insertItem( $catalogTwoItem, $catalogOneItem->getId() );
@@ -76,8 +76,8 @@  discard block
 block discarded – undo
76 76
 				for( $k = 1; $k <= 10; $k++ )
77 77
 				{
78 78
 					$catalogThreeItem = $catalogManager->createItem();
79
-					$catalogThreeItem->setCode( 'cat-' . $i . ':' . $j . ':' . $k );
80
-					$catalogThreeItem->setLabel( 'cat-' . $i . ':' . $j . ':' . $k );
79
+					$catalogThreeItem->setCode( 'cat-'.$i.':'.$j.':'.$k );
80
+					$catalogThreeItem->setLabel( 'cat-'.$i.':'.$j.':'.$k );
81 81
 					$catalogThreeItem->setStatus( 1 );
82 82
 
83 83
 					$catalogManager->insertItem( $catalogThreeItem, $catalogTwoItem->getId() );
Please login to merge, or discard this patch.
lib/mshoplib/setup/unitperf/LocaleAddPerfData.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 		if( $this->additional->getConfig()->get( 'setup/site' ) === 'unitperf' )
69 69
 		{
70 70
 			$ds = DIRECTORY_SEPARATOR;
71
-			$filename = __DIR__ . $ds . 'data' . $ds . 'locale.php';
71
+			$filename = __DIR__.$ds.'data'.$ds.'locale.php';
72 72
 
73 73
 			if( ( $testdata = include( $filename ) ) == false ) {
74 74
 				throw new \Aimeos\MW\Setup\Exception( sprintf( 'No data file "%1$s" found', $filename ) );
Please login to merge, or discard this patch.
lib/mshoplib/setup/unitperf/CustomerAddBasePerfData.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
 		$customerItem = $customerManager->createItem();
52 52
 		$customerItem->setCode( 'demo-test' );
53 53
 		$customerItem->setLabel( 'Test demo unitperf user' );
54
-		$customerItem->setPassword( sha1( microtime( true ) . getmypid() . rand() ) );
54
+		$customerItem->setPassword( sha1( microtime( true ).getmypid().rand() ) );
55 55
 		$customerItem->setStatus( 1 );
56 56
 
57 57
 		$addrItem = $customerItem->getPaymentAddress();
Please login to merge, or discard this patch.
lib/mshoplib/setup/MShopAddCodeData.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 		$this->msg( sprintf( 'Adding default code data for site "%1$s"', $site ), 0 ); $this->status( '' );
62 62
 
63 63
 		$ds = DIRECTORY_SEPARATOR;
64
-		$path = __DIR__ . $ds . 'default' . $ds . 'data' . $ds . 'code.php';
64
+		$path = __DIR__.$ds.'default'.$ds.'data'.$ds.'code.php';
65 65
 
66 66
 		if( ( $data = include( $path ) ) == false ) {
67 67
 			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for default codes', $path ) );
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 				} catch( \Exception $e ) {; } // if type was already available
94 94
 			}
95 95
 
96
-			$this->status( $num > 0 ? $num . '/' . $total : 'OK' );
96
+			$this->status( $num > 0 ? $num.'/'.$total : 'OK' );
97 97
 		}
98 98
 	}
99 99
 }
100 100
\ 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
@@ -86,10 +86,14 @@
 block discarded – undo
86 86
 					$type->setStatus( $dataset['status'] );
87 87
 				}
88 88
 
89
-				try {
89
+				try
90
+				{
90 91
 					$domainManager->saveItem( $type );
91 92
 					$num++;
92
-				} catch( \Exception $e ) {; } // if type was already available
93
+				}
94
+				catch( \Exception $e )
95
+				{
96
+; } // if type was already available
93 97
 			}
94 98
 
95 99
 			$this->status( $num > 0 ? $num . '/' . $total : 'OK' );
Please login to merge, or discard this patch.
lib/mshoplib/setup/default/DemoAddCatalogData.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
 		if( $value === '1' )
82 82
 		{
83 83
 			$ds = DIRECTORY_SEPARATOR;
84
-			$path = __DIR__ . $ds . 'data' . $ds . 'demo-catalog.php';
84
+			$path = __DIR__.$ds.'data'.$ds.'demo-catalog.php';
85 85
 
86 86
 			if( ( $data = include( $path ) ) == false ) {
87 87
 				throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for catalog domain', $path ) );
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -66,7 +66,9 @@  discard block
 block discarded – undo
66 66
 			$this->removeItems( $item->getId(), 'catalog/lists', 'catalog', 'text' );
67 67
 			$this->removeListItems( $item->getId(), 'catalog/lists', 'product' );
68 68
 		}
69
-		catch( \Exception $e ) {; } // If no root node was already inserted into the database
69
+		catch( \Exception $e )
70
+		{
71
+; } // If no root node was already inserted into the database
70 72
 
71 73
 
72 74
 		if( $value === '1' )
@@ -103,8 +105,7 @@  discard block
 block discarded – undo
103 105
 			}
104 106
 
105 107
 			$this->status( 'added' );
106
-		}
107
-		else
108
+		} else
108 109
 		{
109 110
 			$this->status( 'removed' );
110 111
 		}
Please login to merge, or discard this patch.
lib/mshoplib/setup/default/MShopAddLocaleDataDefault.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
 		if( $this->additional->getConfig()->get( 'setup/site', 'default' ) === 'default' )
68 68
 		{
69 69
 			$ds = DIRECTORY_SEPARATOR;
70
-			$filename = __DIR__ . $ds . 'data' . $ds . 'locale.php';
70
+			$filename = __DIR__.$ds.'data'.$ds.'locale.php';
71 71
 
72 72
 			if( ( $data = include( $filename ) ) == false ) {
73 73
 				throw new \Aimeos\MW\Setup\Exception( sprintf( 'No data file "%1$s" found', $filename ) );
Please login to merge, or discard this patch.
lib/mshoplib/setup/default/DemoAddServiceData.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@
 block discarded – undo
82 82
 		if( $value === '1' )
83 83
 		{
84 84
 			$ds = DIRECTORY_SEPARATOR;
85
-			$path = __DIR__ . $ds . 'data' . $ds . 'demo-service.php';
85
+			$path = __DIR__.$ds.'data'.$ds.'demo-service.php';
86 86
 
87 87
 			if( ( $data = include( $path ) ) == false ) {
88 88
 				throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for service domain', $path ) );
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -89,8 +89,7 @@
 block discarded – undo
89 89
 			}
90 90
 
91 91
 			$this->status( 'added' );
92
-		}
93
-		else
92
+		} else
94 93
 		{
95 94
 			$this->status( 'removed' );
96 95
 		}
Please login to merge, or discard this patch.