Completed
Push — master ( 6e8b10...d2a4bf )
by Aimeos
04:17
created
admin/jqadm/src/Admin/JQAdm/Catalog/Standard.php 2 patches
Braces   +13 added lines, -26 removed lines patch added patch discarded remove patch
@@ -122,14 +122,12 @@  discard block
 block discarded – undo
122 122
 				$view->tabindex = ++$idx + 1;
123 123
 				$view->itemBody .= $client->copy();
124 124
 			}
125
-		}
126
-		catch( \Aimeos\MShop\Exception $e )
125
+		} catch( \Aimeos\MShop\Exception $e )
127 126
 		{
128 127
 			$error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
129 128
 			$view->errors = $view->get( 'errors', [] ) + $error;
130 129
 			$this->logException( $e );
131
-		}
132
-		catch( \Exception $e )
130
+		} catch( \Exception $e )
133 131
 		{
134 132
 			$error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
135 133
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -173,14 +171,12 @@  discard block
 block discarded – undo
173 171
 				$view->tabindex = ++$idx + 1;
174 172
 				$view->itemBody .= $client->create();
175 173
 			}
176
-		}
177
-		catch( \Aimeos\MShop\Exception $e )
174
+		} catch( \Aimeos\MShop\Exception $e )
178 175
 		{
179 176
 			$error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
180 177
 			$view->errors = $view->get( 'errors', [] ) + $error;
181 178
 			$this->logException( $e );
182
-		}
183
-		catch( \Exception $e )
179
+		} catch( \Exception $e )
184 180
 		{
185 181
 			$error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
186 182
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -221,14 +217,12 @@  discard block
 block discarded – undo
221 217
 
222 218
 			$this->nextAction( $view, 'search', 'catalog', null, 'delete' );
223 219
 			return;
224
-		}
225
-		catch( \Aimeos\MShop\Exception $e )
220
+		} catch( \Aimeos\MShop\Exception $e )
226 221
 		{
227 222
 			$error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
228 223
 			$view->errors = $view->get( 'errors', [] ) + $error;
229 224
 			$this->logException( $e );
230
-		}
231
-		catch( \Exception $e )
225
+		} catch( \Exception $e )
232 226
 		{
233 227
 			$error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
234 228
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -270,14 +264,12 @@  discard block
 block discarded – undo
270 264
 				$view->tabindex = ++$idx + 1;
271 265
 				$view->itemBody .= $client->get();
272 266
 			}
273
-		}
274
-		catch( \Aimeos\MShop\Exception $e )
267
+		} catch( \Aimeos\MShop\Exception $e )
275 268
 		{
276 269
 			$error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
277 270
 			$view->errors = $view->get( 'errors', [] ) + $error;
278 271
 			$this->logException( $e );
279
-		}
280
-		catch( \Exception $e )
272
+		} catch( \Exception $e )
281 273
 		{
282 274
 			$error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
283 275
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -314,18 +306,15 @@  discard block
 block discarded – undo
314 306
 
315 307
 			$this->nextAction( $view, $view->param( 'next' ), 'catalog', $view->item->getId(), 'save' );
316 308
 			return;
317
-		}
318
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
309
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
319 310
 		{
320 311
 			// fall through to create
321
-		}
322
-		catch( \Aimeos\MShop\Exception $e )
312
+		} catch( \Aimeos\MShop\Exception $e )
323 313
 		{
324 314
 			$error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
325 315
 			$view->errors = $view->get( 'errors', [] ) + $error;
326 316
 			$this->logException( $e );
327
-		}
328
-		catch( \Exception $e )
317
+		} catch( \Exception $e )
329 318
 		{
330 319
 			$error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
331 320
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -353,14 +342,12 @@  discard block
 block discarded – undo
353 342
 			$view->item = \Aimeos\MShop\Factory::createManager( $context, 'catalog' )->createItem();
354 343
 			$view->itemRootId = $this->getRootId();
355 344
 			$view->itemBody = '';
356
-		}
357
-		catch( \Aimeos\MShop\Exception $e )
345
+		} catch( \Aimeos\MShop\Exception $e )
358 346
 		{
359 347
 			$error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
360 348
 			$view->errors = $view->get( 'errors', [] ) + $error;
361 349
 			$this->logException( $e );
362
-		}
363
-		catch( \Exception $e )
350
+		} catch( \Exception $e )
364 351
 		{
365 352
 			$error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
366 353
 			$view->errors = $view->get( 'errors', [] ) + $error;
Please login to merge, or discard this patch.
Spacing   +111 added lines, -111 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 namespace Aimeos\Admin\JQAdm\Catalog;
12 12
 
13
-sprintf( 'catalog' ); // for translation
13
+sprintf('catalog'); // for translation
14 14
 
15 15
 
16 16
 /**
@@ -35,38 +35,38 @@  discard block
 block discarded – undo
35 35
 
36 36
 		try
37 37
 		{
38
-			if( ( $id = $view->param( 'id' ) ) === null ) {
39
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
38
+			if (($id = $view->param('id')) === null) {
39
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
40 40
 			}
41 41
 
42
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'catalog' );
43
-			$view->item = $manager->getItem( $id, $this->getDomains() );
42
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'catalog');
43
+			$view->item = $manager->getItem($id, $this->getDomains());
44 44
 
45
-			$view->itemData = $this->toArray( $view->item, true );
45
+			$view->itemData = $this->toArray($view->item, true);
46 46
 			$view->itemSubparts = $this->getSubClientNames();
47 47
 			$view->itemRootId = $this->getRootId();
48 48
 			$view->itemBody = '';
49 49
 
50
-			foreach( $this->getSubClients() as $idx => $client )
50
+			foreach ($this->getSubClients() as $idx => $client)
51 51
 			{
52 52
 				$view->tabindex = ++$idx + 1;
53 53
 				$view->itemBody .= $client->copy();
54 54
 			}
55 55
 		}
56
-		catch( \Aimeos\MShop\Exception $e )
56
+		catch (\Aimeos\MShop\Exception $e)
57 57
 		{
58
-			$error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
59
-			$view->errors = $view->get( 'errors', [] ) + $error;
60
-			$this->logException( $e );
58
+			$error = array('catalog-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
59
+			$view->errors = $view->get('errors', []) + $error;
60
+			$this->logException($e);
61 61
 		}
62
-		catch( \Exception $e )
62
+		catch (\Exception $e)
63 63
 		{
64
-			$error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
65
-			$view->errors = $view->get( 'errors', [] ) + $error;
66
-			$this->logException( $e );
64
+			$error = array('catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
65
+			$view->errors = $view->get('errors', []) + $error;
66
+			$this->logException($e);
67 67
 		}
68 68
 
69
-		return $this->render( $view );
69
+		return $this->render($view);
70 70
 	}
71 71
 
72 72
 
@@ -82,40 +82,40 @@  discard block
 block discarded – undo
82 82
 
83 83
 		try
84 84
 		{
85
-			$data = $view->param( 'item', [] );
85
+			$data = $view->param('item', []);
86 86
 
87
-			if( !isset( $view->item ) ) {
88
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'catalog' )->createItem();
87
+			if (!isset($view->item)) {
88
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'catalog')->createItem();
89 89
 			}
90 90
 
91 91
 			$data['catalog.siteid'] = $view->item->getSiteId();
92
-			$data['catalog.parentid'] = $view->item->getParentId() ?: $view->param( 'item/catalog.parentid' );
92
+			$data['catalog.parentid'] = $view->item->getParentId() ?: $view->param('item/catalog.parentid');
93 93
 
94 94
 			$view->itemSubparts = $this->getSubClientNames();
95 95
 			$view->itemRootId = $this->getRootId();
96 96
 			$view->itemData = $data;
97 97
 			$view->itemBody = '';
98 98
 
99
-			foreach( $this->getSubClients() as $idx => $client )
99
+			foreach ($this->getSubClients() as $idx => $client)
100 100
 			{
101 101
 				$view->tabindex = ++$idx + 1;
102 102
 				$view->itemBody .= $client->create();
103 103
 			}
104 104
 		}
105
-		catch( \Aimeos\MShop\Exception $e )
105
+		catch (\Aimeos\MShop\Exception $e)
106 106
 		{
107
-			$error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
108
-			$view->errors = $view->get( 'errors', [] ) + $error;
109
-			$this->logException( $e );
107
+			$error = array('catalog-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
108
+			$view->errors = $view->get('errors', []) + $error;
109
+			$this->logException($e);
110 110
 		}
111
-		catch( \Exception $e )
111
+		catch (\Exception $e)
112 112
 		{
113
-			$error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
114
-			$view->errors = $view->get( 'errors', [] ) + $error;
115
-			$this->logException( $e );
113
+			$error = array('catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
114
+			$view->errors = $view->get('errors', []) + $error;
115
+			$this->logException($e);
116 116
 		}
117 117
 
118
-		return $this->render( $view );
118
+		return $this->render($view);
119 119
 	}
120 120
 
121 121
 
@@ -129,39 +129,39 @@  discard block
 block discarded – undo
129 129
 		$view = $this->getView();
130 130
 		$context = $this->getContext();
131 131
 
132
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'catalog' );
132
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'catalog');
133 133
 		$manager->begin();
134 134
 
135 135
 		try
136 136
 		{
137
-			if( ( $id = $view->param( 'id' ) ) === null ) {
138
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
137
+			if (($id = $view->param('id')) === null) {
138
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
139 139
 			}
140 140
 
141
-			$view->item = $manager->getItem( $id, $this->getDomains() );
141
+			$view->item = $manager->getItem($id, $this->getDomains());
142 142
 
143
-			foreach( $this->getSubClients() as $client ) {
143
+			foreach ($this->getSubClients() as $client) {
144 144
 				$client->delete();
145 145
 			}
146 146
 
147
-			$manager->saveItem( $view->item );
148
-			$manager->deleteItem( $id );
147
+			$manager->saveItem($view->item);
148
+			$manager->deleteItem($id);
149 149
 			$manager->commit();
150 150
 
151
-			$this->nextAction( $view, 'search', 'catalog', null, 'delete' );
151
+			$this->nextAction($view, 'search', 'catalog', null, 'delete');
152 152
 			return;
153 153
 		}
154
-		catch( \Aimeos\MShop\Exception $e )
154
+		catch (\Aimeos\MShop\Exception $e)
155 155
 		{
156
-			$error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
157
-			$view->errors = $view->get( 'errors', [] ) + $error;
158
-			$this->logException( $e );
156
+			$error = array('catalog-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
157
+			$view->errors = $view->get('errors', []) + $error;
158
+			$this->logException($e);
159 159
 		}
160
-		catch( \Exception $e )
160
+		catch (\Exception $e)
161 161
 		{
162
-			$error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
163
-			$view->errors = $view->get( 'errors', [] ) + $error;
164
-			$this->logException( $e );
162
+			$error = array('catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
163
+			$view->errors = $view->get('errors', []) + $error;
164
+			$this->logException($e);
165 165
 		}
166 166
 
167 167
 		$manager->rollback();
@@ -182,38 +182,38 @@  discard block
 block discarded – undo
182 182
 
183 183
 		try
184 184
 		{
185
-			if( ( $id = $view->param( 'id' ) ) === null ) {
186
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
185
+			if (($id = $view->param('id')) === null) {
186
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
187 187
 			}
188 188
 
189
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'catalog' );
189
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'catalog');
190 190
 
191
-			$view->item = $manager->getItem( $id, $this->getDomains() );
191
+			$view->item = $manager->getItem($id, $this->getDomains());
192 192
 			$view->itemSubparts = $this->getSubClientNames();
193
-			$view->itemData = $this->toArray( $view->item );
193
+			$view->itemData = $this->toArray($view->item);
194 194
 			$view->itemRootId = $this->getRootId();
195 195
 			$view->itemBody = '';
196 196
 
197
-			foreach( $this->getSubClients() as $idx => $client )
197
+			foreach ($this->getSubClients() as $idx => $client)
198 198
 			{
199 199
 				$view->tabindex = ++$idx + 1;
200 200
 				$view->itemBody .= $client->get();
201 201
 			}
202 202
 		}
203
-		catch( \Aimeos\MShop\Exception $e )
203
+		catch (\Aimeos\MShop\Exception $e)
204 204
 		{
205
-			$error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
206
-			$view->errors = $view->get( 'errors', [] ) + $error;
207
-			$this->logException( $e );
205
+			$error = array('catalog-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
206
+			$view->errors = $view->get('errors', []) + $error;
207
+			$this->logException($e);
208 208
 		}
209
-		catch( \Exception $e )
209
+		catch (\Exception $e)
210 210
 		{
211
-			$error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
212
-			$view->errors = $view->get( 'errors', [] ) + $error;
213
-			$this->logException( $e );
211
+			$error = array('catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
212
+			$view->errors = $view->get('errors', []) + $error;
213
+			$this->logException($e);
214 214
 		}
215 215
 
216
-		return $this->render( $view );
216
+		return $this->render($view);
217 217
 	}
218 218
 
219 219
 
@@ -227,40 +227,40 @@  discard block
 block discarded – undo
227 227
 		$view = $this->getView();
228 228
 		$context = $this->getContext();
229 229
 
230
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'catalog' );
230
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'catalog');
231 231
 		$manager->begin();
232 232
 
233 233
 		try
234 234
 		{
235
-			$item = $this->fromArray( $view->param( 'item', [] ) );
236
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
235
+			$item = $this->fromArray($view->param('item', []));
236
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
237 237
 			$view->itemBody = '';
238 238
 
239
-			foreach( $this->getSubClients() as $client ) {
239
+			foreach ($this->getSubClients() as $client) {
240 240
 				$view->itemBody .= $client->save();
241 241
 			}
242 242
 
243
-			$manager->saveItem( clone $view->item );
243
+			$manager->saveItem(clone $view->item);
244 244
 			$manager->commit();
245 245
 
246
-			$this->nextAction( $view, $view->param( 'next' ), 'catalog', $view->item->getId(), 'save' );
246
+			$this->nextAction($view, $view->param('next'), 'catalog', $view->item->getId(), 'save');
247 247
 			return;
248 248
 		}
249
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
249
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
250 250
 		{
251 251
 			// fall through to create
252 252
 		}
253
-		catch( \Aimeos\MShop\Exception $e )
253
+		catch (\Aimeos\MShop\Exception $e)
254 254
 		{
255
-			$error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
256
-			$view->errors = $view->get( 'errors', [] ) + $error;
257
-			$this->logException( $e );
255
+			$error = array('catalog-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
256
+			$view->errors = $view->get('errors', []) + $error;
257
+			$this->logException($e);
258 258
 		}
259
-		catch( \Exception $e )
259
+		catch (\Exception $e)
260 260
 		{
261
-			$error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
262
-			$view->errors = $view->get( 'errors', [] ) + $error;
263
-			$this->logException( $e );
261
+			$error = array('catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
262
+			$view->errors = $view->get('errors', []) + $error;
263
+			$this->logException($e);
264 264
 		}
265 265
 
266 266
 		$manager->rollback();
@@ -281,24 +281,24 @@  discard block
 block discarded – undo
281 281
 
282 282
 		try
283 283
 		{
284
-			$view->item = \Aimeos\MShop\Factory::createManager( $context, 'catalog' )->createItem();
284
+			$view->item = \Aimeos\MShop\Factory::createManager($context, 'catalog')->createItem();
285 285
 			$view->itemRootId = $this->getRootId();
286 286
 			$view->itemBody = '';
287 287
 		}
288
-		catch( \Aimeos\MShop\Exception $e )
288
+		catch (\Aimeos\MShop\Exception $e)
289 289
 		{
290
-			$error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
291
-			$view->errors = $view->get( 'errors', [] ) + $error;
292
-			$this->logException( $e );
290
+			$error = array('catalog-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
291
+			$view->errors = $view->get('errors', []) + $error;
292
+			$this->logException($e);
293 293
 		}
294
-		catch( \Exception $e )
294
+		catch (\Exception $e)
295 295
 		{
296
-			$error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
297
-			$view->errors = $view->get( 'errors', [] ) + $error;
298
-			$this->logException( $e );
296
+			$error = array('catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
297
+			$view->errors = $view->get('errors', []) + $error;
298
+			$this->logException($e);
299 299
 		}
300 300
 
301
-		return $this->render( $view );
301
+		return $this->render($view);
302 302
 	}
303 303
 
304 304
 
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
 	 * @param string|null $name Name of the sub-client (Default if null)
310 310
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
311 311
 	 */
312
-	public function getSubClient( $type, $name = null )
312
+	public function getSubClient($type, $name = null)
313 313
 	{
314 314
 		/** admin/jqadm/catalog/decorators/excludes
315 315
 		 * Excludes decorators added by the "common" option from the catalog JQAdm client
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
 		 * @see admin/jqadm/catalog/decorators/excludes
385 385
 		 * @see admin/jqadm/catalog/decorators/global
386 386
 		 */
387
-		return $this->createSubClient( 'catalog/' . $type, $name );
387
+		return $this->createSubClient('catalog/' . $type, $name);
388 388
 	}
389 389
 
390 390
 
@@ -406,9 +406,9 @@  discard block
 block discarded – undo
406 406
 		 * @since 2016.01
407 407
 		 * @category Developer
408 408
 		 */
409
-		$domains = array( 'media', 'text' );
409
+		$domains = array('media', 'text');
410 410
 
411
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/catalog/domains', $domains );
411
+		return $this->getContext()->getConfig()->get('admin/jqadm/catalog/domains', $domains);
412 412
 	}
413 413
 
414 414
 
@@ -419,11 +419,11 @@  discard block
 block discarded – undo
419 419
 	 */
420 420
 	protected function getRootId()
421 421
 	{
422
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' );
422
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog');
423 423
 
424 424
 		try {
425
-			return $manager->getTree( null, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )->getId();
426
-		} catch( \Exception $e ) {
425
+			return $manager->getTree(null, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)->getId();
426
+		} catch (\Exception $e) {
427 427
 			return null;
428 428
 		}
429 429
 	}
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 		 * @since 2016.01
470 470
 		 * @category Developer
471 471
 		 */
472
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/catalog/standard/subparts', [] );
472
+		return $this->getContext()->getConfig()->get('admin/jqadm/catalog/standard/subparts', []);
473 473
 	}
474 474
 
475 475
 
@@ -479,33 +479,33 @@  discard block
 block discarded – undo
479 479
 	 * @param string[] Data array
480 480
 	 * @return \Aimeos\MShop\Catalog\Item\Iface New catalog item object
481 481
 	 */
482
-	protected function fromArray( array $data )
482
+	protected function fromArray(array $data)
483 483
 	{
484 484
 		$conf = [];
485 485
 
486
-		if( isset( $data['config']['key'] ) )
486
+		if (isset($data['config']['key']))
487 487
 		{
488
-			foreach( (array) $data['config']['key'] as $idx => $key )
488
+			foreach ((array) $data['config']['key'] as $idx => $key)
489 489
 			{
490
-				if( trim( $key ) !== '' && isset( $data['config']['val'][$idx] ) ) {
490
+				if (trim($key) !== '' && isset($data['config']['val'][$idx])) {
491 491
 					$conf[$key] = $data['config']['val'][$idx];
492 492
 				}
493 493
 			}
494 494
 		}
495 495
 
496
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' );
496
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog');
497 497
 
498
-		if( isset( $data['catalog.id'] ) && $data['catalog.id'] != '' ) {
499
-			$item = $manager->getItem( $data['catalog.id'], $this->getDomains() );
498
+		if (isset($data['catalog.id']) && $data['catalog.id'] != '') {
499
+			$item = $manager->getItem($data['catalog.id'], $this->getDomains());
500 500
 		} else {
501 501
 			$item = $manager->createItem();
502 502
 		}
503 503
 
504
-		$item->fromArray( $data );
505
-		$item->setConfig( $conf );
504
+		$item->fromArray($data);
505
+		$item->setConfig($conf);
506 506
 
507
-		if( $item->getId() == null ) {
508
-			return $manager->insertItem( $item, $data['catalog.parentid'] ?: null );
507
+		if ($item->getId() == null) {
508
+			return $manager->insertItem($item, $data['catalog.parentid'] ?: null);
509 509
 		}
510 510
 
511 511
 		return $item;
@@ -518,19 +518,19 @@  discard block
 block discarded – undo
518 518
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item object
519 519
 	 * @return string[] Multi-dimensional associative list of item data
520 520
 	 */
521
-	protected function toArray( \Aimeos\MShop\Catalog\Item\Iface $item, $copy = false )
521
+	protected function toArray(\Aimeos\MShop\Catalog\Item\Iface $item, $copy = false)
522 522
 	{
523
-		$data = $item->toArray( true );
523
+		$data = $item->toArray(true);
524 524
 		$data['config'] = [];
525 525
 
526
-		if( $copy === true )
526
+		if ($copy === true)
527 527
 		{
528 528
 			$data['catalog.id'] = '';
529 529
 			$data['catalog.siteid'] = $item->getSiteId();
530 530
 			$data['catalog.code'] = $data['catalog.code'] . '_copy';
531 531
 		}
532 532
 
533
-		foreach( $item->getConfig() as $key => $value )
533
+		foreach ($item->getConfig() as $key => $value)
534 534
 		{
535 535
 			$data['config']['key'][] = $key;
536 536
 			$data['config']['val'][] = $value;
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
546 546
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
547 547
 	 * @return string HTML output
548 548
 	 */
549
-	protected function render( \Aimeos\MW\View\Iface $view )
549
+	protected function render(\Aimeos\MW\View\Iface $view)
550 550
 	{
551 551
 		/** admin/jqadm/catalog/template-item
552 552
 		 * Relative path to the HTML body template for the catalog item.
@@ -570,6 +570,6 @@  discard block
 block discarded – undo
570 570
 		$tplconf = 'admin/jqadm/catalog/template-item';
571 571
 		$default = 'catalog/item-standard';
572 572
 
573
-		return $view->render( $view->config( $tplconf, $default ) );
573
+		return $view->render($view->config($tplconf, $default));
574 574
 	}
575 575
 }
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Type/Text/Lists/Standard.php 2 patches
Braces   +13 added lines, -26 removed lines patch added patch discarded remove patch
@@ -88,14 +88,12 @@  discard block
 block discarded – undo
88 88
 				$view->tabindex = ++$idx + 1;
89 89
 				$view->itemBody .= $client->copy();
90 90
 			}
91
-		}
92
-		catch( \Aimeos\MShop\Exception $e )
91
+		} catch( \Aimeos\MShop\Exception $e )
93 92
 		{
94 93
 			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
95 94
 			$view->errors = $view->get( 'errors', [] ) + $error;
96 95
 			$this->logException( $e );
97
-		}
98
-		catch( \Exception $e )
96
+		} catch( \Exception $e )
99 97
 		{
100 98
 			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
101 99
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -137,14 +135,12 @@  discard block
 block discarded – undo
137 135
 				$view->tabindex = ++$idx + 1;
138 136
 				$view->itemBody .= $client->create();
139 137
 			}
140
-		}
141
-		catch( \Aimeos\MShop\Exception $e )
138
+		} catch( \Aimeos\MShop\Exception $e )
142 139
 		{
143 140
 			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
144 141
 			$view->errors = $view->get( 'errors', [] ) + $error;
145 142
 			$this->logException( $e );
146
-		}
147
-		catch( \Exception $e )
143
+		} catch( \Exception $e )
148 144
 		{
149 145
 			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
150 146
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -185,14 +181,12 @@  discard block
 block discarded – undo
185 181
 
186 182
 			$this->nextAction( $view, 'search', 'type/text/lists', null, 'delete' );
187 183
 			return;
188
-		}
189
-		catch( \Aimeos\MShop\Exception $e )
184
+		} catch( \Aimeos\MShop\Exception $e )
190 185
 		{
191 186
 			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
192 187
 			$view->errors = $view->get( 'errors', [] ) + $error;
193 188
 			$this->logException( $e );
194
-		}
195
-		catch( \Exception $e )
189
+		} catch( \Exception $e )
196 190
 		{
197 191
 			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
198 192
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -233,14 +227,12 @@  discard block
 block discarded – undo
233 227
 				$view->tabindex = ++$idx + 1;
234 228
 				$view->itemBody .= $client->get();
235 229
 			}
236
-		}
237
-		catch( \Aimeos\MShop\Exception $e )
230
+		} catch( \Aimeos\MShop\Exception $e )
238 231
 		{
239 232
 			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
240 233
 			$view->errors = $view->get( 'errors', [] ) + $error;
241 234
 			$this->logException( $e );
242
-		}
243
-		catch( \Exception $e )
235
+		} catch( \Exception $e )
244 236
 		{
245 237
 			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
246 238
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -277,18 +269,15 @@  discard block
 block discarded – undo
277 269
 
278 270
 			$this->nextAction( $view, $view->param( 'next' ), 'type/text/lists', $view->item->getId(), 'save' );
279 271
 			return;
280
-		}
281
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
272
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
282 273
 		{
283 274
 			// fall through to create
284
-		}
285
-		catch( \Aimeos\MShop\Exception $e )
275
+		} catch( \Aimeos\MShop\Exception $e )
286 276
 		{
287 277
 			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
288 278
 			$view->errors = $view->get( 'errors', [] ) + $error;
289 279
 			$this->logException( $e );
290
-		}
291
-		catch( \Exception $e )
280
+		} catch( \Exception $e )
292 281
 		{
293 282
 			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
294 283
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -327,14 +316,12 @@  discard block
 block discarded – undo
327 316
 			foreach( $this->getSubClients() as $client ) {
328 317
 				$view->itemBody .= $client->search();
329 318
 			}
330
-		}
331
-		catch( \Aimeos\MShop\Exception $e )
319
+		} catch( \Aimeos\MShop\Exception $e )
332 320
 		{
333 321
 			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
334 322
 			$view->errors = $view->get( 'errors', [] ) + $error;
335 323
 			$this->logException( $e );
336
-		}
337
-		catch( \Exception $e )
324
+		} catch( \Exception $e )
338 325
 		{
339 326
 			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
340 327
 			$view->errors = $view->get( 'errors', [] ) + $error;
Please login to merge, or discard this patch.
Spacing   +102 added lines, -102 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 namespace Aimeos\Admin\JQAdm\Type\Text\Lists;
12 12
 
13
-sprintf( 'type/text/lists' ); // for translation
13
+sprintf('type/text/lists'); // for translation
14 14
 
15 15
 
16 16
 /**
@@ -35,37 +35,37 @@  discard block
 block discarded – undo
35 35
 
36 36
 		try
37 37
 		{
38
-			if( ( $id = $view->param( 'id' ) ) === null ) {
39
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
38
+			if (($id = $view->param('id')) === null) {
39
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
40 40
 			}
41 41
 
42
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'text/lists/type' );
43
-			$view->item = $manager->getItem( $id );
42
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'text/lists/type');
43
+			$view->item = $manager->getItem($id);
44 44
 
45
-			$view->itemData = $this->toArray( $view->item, true );
45
+			$view->itemData = $this->toArray($view->item, true);
46 46
 			$view->itemSubparts = $this->getSubClientNames();
47 47
 			$view->itemBody = '';
48 48
 
49
-			foreach( $this->getSubClients() as $idx => $client )
49
+			foreach ($this->getSubClients() as $idx => $client)
50 50
 			{
51 51
 				$view->tabindex = ++$idx + 1;
52 52
 				$view->itemBody .= $client->copy();
53 53
 			}
54 54
 		}
55
-		catch( \Aimeos\MShop\Exception $e )
55
+		catch (\Aimeos\MShop\Exception $e)
56 56
 		{
57
-			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
58
-			$view->errors = $view->get( 'errors', [] ) + $error;
59
-			$this->logException( $e );
57
+			$error = array('type-text-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
58
+			$view->errors = $view->get('errors', []) + $error;
59
+			$this->logException($e);
60 60
 		}
61
-		catch( \Exception $e )
61
+		catch (\Exception $e)
62 62
 		{
63
-			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
64
-			$view->errors = $view->get( 'errors', [] ) + $error;
65
-			$this->logException( $e );
63
+			$error = array('type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
64
+			$view->errors = $view->get('errors', []) + $error;
65
+			$this->logException($e);
66 66
 		}
67 67
 
68
-		return $this->render( $view );
68
+		return $this->render($view);
69 69
 	}
70 70
 
71 71
 
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
 
82 82
 		try
83 83
 		{
84
-			$data = $view->param( 'item', [] );
84
+			$data = $view->param('item', []);
85 85
 
86
-			if( !isset( $view->item ) ) {
87
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'text/lists/type' )->createItem();
86
+			if (!isset($view->item)) {
87
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'text/lists/type')->createItem();
88 88
 			}
89 89
 
90 90
 			$data['text.lists.type.siteid'] = $view->item->getSiteId();
@@ -93,26 +93,26 @@  discard block
 block discarded – undo
93 93
 			$view->itemData = $data;
94 94
 			$view->itemBody = '';
95 95
 
96
-			foreach( $this->getSubClients() as $idx => $client )
96
+			foreach ($this->getSubClients() as $idx => $client)
97 97
 			{
98 98
 				$view->tabindex = ++$idx + 1;
99 99
 				$view->itemBody .= $client->create();
100 100
 			}
101 101
 		}
102
-		catch( \Aimeos\MShop\Exception $e )
102
+		catch (\Aimeos\MShop\Exception $e)
103 103
 		{
104
-			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
105
-			$view->errors = $view->get( 'errors', [] ) + $error;
106
-			$this->logException( $e );
104
+			$error = array('type-text-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
105
+			$view->errors = $view->get('errors', []) + $error;
106
+			$this->logException($e);
107 107
 		}
108
-		catch( \Exception $e )
108
+		catch (\Exception $e)
109 109
 		{
110
-			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
111
-			$view->errors = $view->get( 'errors', [] ) + $error;
112
-			$this->logException( $e );
110
+			$error = array('type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
111
+			$view->errors = $view->get('errors', []) + $error;
112
+			$this->logException($e);
113 113
 		}
114 114
 
115
-		return $this->render( $view );
115
+		return $this->render($view);
116 116
 	}
117 117
 
118 118
 
@@ -126,38 +126,38 @@  discard block
 block discarded – undo
126 126
 		$view = $this->getView();
127 127
 		$context = $this->getContext();
128 128
 
129
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'text/lists/type' );
129
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'text/lists/type');
130 130
 		$manager->begin();
131 131
 
132 132
 		try
133 133
 		{
134
-			if( ( $id = $view->param( 'id' ) ) === null ) {
135
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
134
+			if (($id = $view->param('id')) === null) {
135
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
136 136
 			}
137 137
 
138
-			$view->item = $manager->getItem( $id );
138
+			$view->item = $manager->getItem($id);
139 139
 
140
-			foreach( $this->getSubClients() as $client ) {
140
+			foreach ($this->getSubClients() as $client) {
141 141
 				$client->delete();
142 142
 			}
143 143
 
144
-			$manager->deleteItem( $id );
144
+			$manager->deleteItem($id);
145 145
 			$manager->commit();
146 146
 
147
-			$this->nextAction( $view, 'search', 'type/text/lists', null, 'delete' );
147
+			$this->nextAction($view, 'search', 'type/text/lists', null, 'delete');
148 148
 			return;
149 149
 		}
150
-		catch( \Aimeos\MShop\Exception $e )
150
+		catch (\Aimeos\MShop\Exception $e)
151 151
 		{
152
-			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
153
-			$view->errors = $view->get( 'errors', [] ) + $error;
154
-			$this->logException( $e );
152
+			$error = array('type-text-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
153
+			$view->errors = $view->get('errors', []) + $error;
154
+			$this->logException($e);
155 155
 		}
156
-		catch( \Exception $e )
156
+		catch (\Exception $e)
157 157
 		{
158
-			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
159
-			$view->errors = $view->get( 'errors', [] ) + $error;
160
-			$this->logException( $e );
158
+			$error = array('type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
159
+			$view->errors = $view->get('errors', []) + $error;
160
+			$this->logException($e);
161 161
 		}
162 162
 
163 163
 		$manager->rollback();
@@ -178,37 +178,37 @@  discard block
 block discarded – undo
178 178
 
179 179
 		try
180 180
 		{
181
-			if( ( $id = $view->param( 'id' ) ) === null ) {
182
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
181
+			if (($id = $view->param('id')) === null) {
182
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
183 183
 			}
184 184
 
185
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'text/lists/type' );
185
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'text/lists/type');
186 186
 
187
-			$view->item = $manager->getItem( $id );
187
+			$view->item = $manager->getItem($id);
188 188
 			$view->itemSubparts = $this->getSubClientNames();
189
-			$view->itemData = $this->toArray( $view->item );
189
+			$view->itemData = $this->toArray($view->item);
190 190
 			$view->itemBody = '';
191 191
 
192
-			foreach( $this->getSubClients() as $idx => $client )
192
+			foreach ($this->getSubClients() as $idx => $client)
193 193
 			{
194 194
 				$view->tabindex = ++$idx + 1;
195 195
 				$view->itemBody .= $client->get();
196 196
 			}
197 197
 		}
198
-		catch( \Aimeos\MShop\Exception $e )
198
+		catch (\Aimeos\MShop\Exception $e)
199 199
 		{
200
-			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
201
-			$view->errors = $view->get( 'errors', [] ) + $error;
202
-			$this->logException( $e );
200
+			$error = array('type-text-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
201
+			$view->errors = $view->get('errors', []) + $error;
202
+			$this->logException($e);
203 203
 		}
204
-		catch( \Exception $e )
204
+		catch (\Exception $e)
205 205
 		{
206
-			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
207
-			$view->errors = $view->get( 'errors', [] ) + $error;
208
-			$this->logException( $e );
206
+			$error = array('type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
207
+			$view->errors = $view->get('errors', []) + $error;
208
+			$this->logException($e);
209 209
 		}
210 210
 
211
-		return $this->render( $view );
211
+		return $this->render($view);
212 212
 	}
213 213
 
214 214
 
@@ -222,40 +222,40 @@  discard block
 block discarded – undo
222 222
 		$view = $this->getView();
223 223
 		$context = $this->getContext();
224 224
 
225
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'text/lists/type' );
225
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'text/lists/type');
226 226
 		$manager->begin();
227 227
 
228 228
 		try
229 229
 		{
230
-			$item = $this->fromArray( $view->param( 'item', [] ) );
231
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
230
+			$item = $this->fromArray($view->param('item', []));
231
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
232 232
 			$view->itemBody = '';
233 233
 
234
-			foreach( $this->getSubClients() as $client ) {
234
+			foreach ($this->getSubClients() as $client) {
235 235
 				$view->itemBody .= $client->save();
236 236
 			}
237 237
 
238
-			$manager->saveItem( clone $view->item );
238
+			$manager->saveItem(clone $view->item);
239 239
 			$manager->commit();
240 240
 
241
-			$this->nextAction( $view, $view->param( 'next' ), 'type/text/lists', $view->item->getId(), 'save' );
241
+			$this->nextAction($view, $view->param('next'), 'type/text/lists', $view->item->getId(), 'save');
242 242
 			return;
243 243
 		}
244
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
244
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
245 245
 		{
246 246
 			// fall through to create
247 247
 		}
248
-		catch( \Aimeos\MShop\Exception $e )
248
+		catch (\Aimeos\MShop\Exception $e)
249 249
 		{
250
-			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
251
-			$view->errors = $view->get( 'errors', [] ) + $error;
252
-			$this->logException( $e );
250
+			$error = array('type-text-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
251
+			$view->errors = $view->get('errors', []) + $error;
252
+			$this->logException($e);
253 253
 		}
254
-		catch( \Exception $e )
254
+		catch (\Exception $e)
255 255
 		{
256
-			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
257
-			$view->errors = $view->get( 'errors', [] ) + $error;
258
-			$this->logException( $e );
256
+			$error = array('type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
257
+			$view->errors = $view->get('errors', []) + $error;
258
+			$this->logException($e);
259 259
 		}
260 260
 
261 261
 		$manager->rollback();
@@ -277,31 +277,31 @@  discard block
 block discarded – undo
277 277
 		try
278 278
 		{
279 279
 			$total = 0;
280
-			$params = $this->storeSearchParams( $view->param(), 'type/text/lists' );
281
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'text/lists/type' );
282
-			$search = $this->initCriteria( $manager->createSearch(), $params );
280
+			$params = $this->storeSearchParams($view->param(), 'type/text/lists');
281
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'text/lists/type');
282
+			$search = $this->initCriteria($manager->createSearch(), $params);
283 283
 
284
-			$view->items = $manager->searchItems( $search, [], $total );
285
-			$view->filterAttributes = $manager->getSearchAttributes( true );
284
+			$view->items = $manager->searchItems($search, [], $total);
285
+			$view->filterAttributes = $manager->getSearchAttributes(true);
286 286
 			$view->filterOperators = $search->getOperators();
287 287
 			$view->total = $total;
288 288
 			$view->itemBody = '';
289 289
 
290
-			foreach( $this->getSubClients() as $client ) {
290
+			foreach ($this->getSubClients() as $client) {
291 291
 				$view->itemBody .= $client->search();
292 292
 			}
293 293
 		}
294
-		catch( \Aimeos\MShop\Exception $e )
294
+		catch (\Aimeos\MShop\Exception $e)
295 295
 		{
296
-			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
297
-			$view->errors = $view->get( 'errors', [] ) + $error;
298
-			$this->logException( $e );
296
+			$error = array('type-text-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
297
+			$view->errors = $view->get('errors', []) + $error;
298
+			$this->logException($e);
299 299
 		}
300
-		catch( \Exception $e )
300
+		catch (\Exception $e)
301 301
 		{
302
-			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
303
-			$view->errors = $view->get( 'errors', [] ) + $error;
304
-			$this->logException( $e );
302
+			$error = array('type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
303
+			$view->errors = $view->get('errors', []) + $error;
304
+			$this->logException($e);
305 305
 		}
306 306
 
307 307
 		/** admin/jqadm/type/text/lists/template-list
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 		$tplconf = 'admin/jqadm/type/text/lists/template-list';
327 327
 		$default = 'type/text/lists/list-standard';
328 328
 
329
-		return $view->render( $view->config( $tplconf, $default ) );
329
+		return $view->render($view->config($tplconf, $default));
330 330
 	}
331 331
 
332 332
 
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 	 * @param string|null $name Name of the sub-client (Default if null)
338 338
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
339 339
 	 */
340
-	public function getSubClient( $liststype, $name = null )
340
+	public function getSubClient($liststype, $name = null)
341 341
 	{
342 342
 		/** admin/jqadm/type/text/lists/decorators/excludes
343 343
 		 * Excludes decorators added by the "common" option from the list type JQAdm client
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 		 * @see admin/jqadm/type/text/lists/decorators/excludes
413 413
 		 * @see admin/jqadm/type/text/lists/decorators/global
414 414
 		 */
415
-		return $this->createSubClient( 'type/text/lists' . $liststype, $name );
415
+		return $this->createSubClient('type/text/lists' . $liststype, $name);
416 416
 	}
417 417
 
418 418
 
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
 		 * @since 2017.10
457 457
 		 * @category Developer
458 458
 		 */
459
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/type/text/lists/standard/subparts', [] );
459
+		return $this->getContext()->getConfig()->get('admin/jqadm/type/text/lists/standard/subparts', []);
460 460
 	}
461 461
 
462 462
 
@@ -467,17 +467,17 @@  discard block
 block discarded – undo
467 467
 	 * @param string[] Data array
468 468
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface New list type item object
469 469
 	 */
470
-	protected function fromArray( array $data )
470
+	protected function fromArray(array $data)
471 471
 	{
472
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'text/lists/type' );
472
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'text/lists/type');
473 473
 
474
-		if( isset( $data['text.lists.type.id'] ) && $data['text.lists.type.id'] != '' ) {
475
-			$item = $manager->getItem( $data['text.lists.type.id'] );
474
+		if (isset($data['text.lists.type.id']) && $data['text.lists.type.id'] != '') {
475
+			$item = $manager->getItem($data['text.lists.type.id']);
476 476
 		} else {
477 477
 			$item = $manager->createItem();
478 478
 		}
479 479
 
480
-		$item->fromArray( $data );
480
+		$item->fromArray($data);
481 481
 
482 482
 		return $item;
483 483
 	}
@@ -489,11 +489,11 @@  discard block
 block discarded – undo
489 489
 	 * @param \Aimeos\MShop\Common\Item\Type\Iface $item Type item object
490 490
 	 * @return string[] Multi-dimensional associative list of item data
491 491
 	 */
492
-	protected function toArray( \Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false )
492
+	protected function toArray(\Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false)
493 493
 	{
494
-		$data = $item->toArray( true );
494
+		$data = $item->toArray(true);
495 495
 
496
-		if( $copy === true )
496
+		if ($copy === true)
497 497
 		{
498 498
 			$data['text.lists.type.code'] = $data['text.lists.type.code'] . '_copy';
499 499
 			$data['text.lists.type.id'] = '';
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
510 510
 	 * @return string HTML output
511 511
 	 */
512
-	protected function render( \Aimeos\MW\View\Iface $view )
512
+	protected function render(\Aimeos\MW\View\Iface $view)
513 513
 	{
514 514
 		/** admin/jqadm/type/text/lists/template-item
515 515
 		 * Relative path to the HTML body template for the list type item.
@@ -533,6 +533,6 @@  discard block
 block discarded – undo
533 533
 		$tplconf = 'admin/jqadm/type/text/lists/template-item';
534 534
 		$default = 'type/text/lists/item-standard';
535 535
 
536
-		return $view->render( $view->config( $tplconf, $default ) );
536
+		return $view->render($view->config($tplconf, $default));
537 537
 	}
538 538
 }
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Type/Text/Standard.php 2 patches
Braces   +13 added lines, -26 removed lines patch added patch discarded remove patch
@@ -88,14 +88,12 @@  discard block
 block discarded – undo
88 88
 				$view->tabindex = ++$idx + 1;
89 89
 				$view->itemBody .= $client->copy();
90 90
 			}
91
-		}
92
-		catch( \Aimeos\MShop\Exception $e )
91
+		} catch( \Aimeos\MShop\Exception $e )
93 92
 		{
94 93
 			$error = array( 'type-text-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
95 94
 			$view->errors = $view->get( 'errors', [] ) + $error;
96 95
 			$this->logException( $e );
97
-		}
98
-		catch( \Exception $e )
96
+		} catch( \Exception $e )
99 97
 		{
100 98
 			$error = array( 'type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
101 99
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -137,14 +135,12 @@  discard block
 block discarded – undo
137 135
 				$view->tabindex = ++$idx + 1;
138 136
 				$view->itemBody .= $client->create();
139 137
 			}
140
-		}
141
-		catch( \Aimeos\MShop\Exception $e )
138
+		} catch( \Aimeos\MShop\Exception $e )
142 139
 		{
143 140
 			$error = array( 'type-text-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
144 141
 			$view->errors = $view->get( 'errors', [] ) + $error;
145 142
 			$this->logException( $e );
146
-		}
147
-		catch( \Exception $e )
143
+		} catch( \Exception $e )
148 144
 		{
149 145
 			$error = array( 'type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
150 146
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -185,14 +181,12 @@  discard block
 block discarded – undo
185 181
 
186 182
 			$this->nextAction( $view, 'search', 'type/text', null, 'delete' );
187 183
 			return;
188
-		}
189
-		catch( \Aimeos\MShop\Exception $e )
184
+		} catch( \Aimeos\MShop\Exception $e )
190 185
 		{
191 186
 			$error = array( 'type-text-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
192 187
 			$view->errors = $view->get( 'errors', [] ) + $error;
193 188
 			$this->logException( $e );
194
-		}
195
-		catch( \Exception $e )
189
+		} catch( \Exception $e )
196 190
 		{
197 191
 			$error = array( 'type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
198 192
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -233,14 +227,12 @@  discard block
 block discarded – undo
233 227
 				$view->tabindex = ++$idx + 1;
234 228
 				$view->itemBody .= $client->get();
235 229
 			}
236
-		}
237
-		catch( \Aimeos\MShop\Exception $e )
230
+		} catch( \Aimeos\MShop\Exception $e )
238 231
 		{
239 232
 			$error = array( 'type-text-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
240 233
 			$view->errors = $view->get( 'errors', [] ) + $error;
241 234
 			$this->logException( $e );
242
-		}
243
-		catch( \Exception $e )
235
+		} catch( \Exception $e )
244 236
 		{
245 237
 			$error = array( 'type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
246 238
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -277,18 +269,15 @@  discard block
 block discarded – undo
277 269
 
278 270
 			$this->nextAction( $view, $view->param( 'next' ), 'type/text', $view->item->getId(), 'save' );
279 271
 			return;
280
-		}
281
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
272
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
282 273
 		{
283 274
 			// fall through to create
284
-		}
285
-		catch( \Aimeos\MShop\Exception $e )
275
+		} catch( \Aimeos\MShop\Exception $e )
286 276
 		{
287 277
 			$error = array( 'type-text-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
288 278
 			$view->errors = $view->get( 'errors', [] ) + $error;
289 279
 			$this->logException( $e );
290
-		}
291
-		catch( \Exception $e )
280
+		} catch( \Exception $e )
292 281
 		{
293 282
 			$error = array( 'type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
294 283
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -327,13 +316,11 @@  discard block
 block discarded – undo
327 316
 			foreach( $this->getSubClients() as $client ) {
328 317
 				$view->itemBody .= $client->search();
329 318
 			}
330
-		}
331
-		catch( \Aimeos\MShop\Exception $e )
319
+		} catch( \Aimeos\MShop\Exception $e )
332 320
 		{
333 321
 			$error = array( 'type-text-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
334 322
 			$view->errors = $view->get( 'errors', [] ) + $error;
335
-		}
336
-		catch( \Exception $e )
323
+		} catch( \Exception $e )
337 324
 		{
338 325
 			$error = array( 'type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
339 326
 			$view->errors = $view->get( 'errors', [] ) + $error;
Please login to merge, or discard this patch.
Spacing   +100 added lines, -100 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 namespace Aimeos\Admin\JQAdm\Type\Text;
12 12
 
13
-sprintf( 'type/text' ); // for translation
13
+sprintf('type/text'); // for translation
14 14
 
15 15
 
16 16
 /**
@@ -35,37 +35,37 @@  discard block
 block discarded – undo
35 35
 
36 36
 		try
37 37
 		{
38
-			if( ( $id = $view->param( 'id' ) ) === null ) {
39
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
38
+			if (($id = $view->param('id')) === null) {
39
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
40 40
 			}
41 41
 
42
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'text/type' );
43
-			$view->item = $manager->getItem( $id );
42
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'text/type');
43
+			$view->item = $manager->getItem($id);
44 44
 
45
-			$view->itemData = $this->toArray( $view->item, true );
45
+			$view->itemData = $this->toArray($view->item, true);
46 46
 			$view->itemSubparts = $this->getSubClientNames();
47 47
 			$view->itemBody = '';
48 48
 
49
-			foreach( $this->getSubClients() as $idx => $client )
49
+			foreach ($this->getSubClients() as $idx => $client)
50 50
 			{
51 51
 				$view->tabindex = ++$idx + 1;
52 52
 				$view->itemBody .= $client->copy();
53 53
 			}
54 54
 		}
55
-		catch( \Aimeos\MShop\Exception $e )
55
+		catch (\Aimeos\MShop\Exception $e)
56 56
 		{
57
-			$error = array( 'type-text-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
58
-			$view->errors = $view->get( 'errors', [] ) + $error;
59
-			$this->logException( $e );
57
+			$error = array('type-text-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
58
+			$view->errors = $view->get('errors', []) + $error;
59
+			$this->logException($e);
60 60
 		}
61
-		catch( \Exception $e )
61
+		catch (\Exception $e)
62 62
 		{
63
-			$error = array( 'type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
64
-			$view->errors = $view->get( 'errors', [] ) + $error;
65
-			$this->logException( $e );
63
+			$error = array('type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
64
+			$view->errors = $view->get('errors', []) + $error;
65
+			$this->logException($e);
66 66
 		}
67 67
 
68
-		return $this->render( $view );
68
+		return $this->render($view);
69 69
 	}
70 70
 
71 71
 
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
 
82 82
 		try
83 83
 		{
84
-			$data = $view->param( 'item', [] );
84
+			$data = $view->param('item', []);
85 85
 
86
-			if( !isset( $view->item ) ) {
87
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'text/type' )->createItem();
86
+			if (!isset($view->item)) {
87
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'text/type')->createItem();
88 88
 			}
89 89
 
90 90
 			$data['text.type.siteid'] = $view->item->getSiteId();
@@ -93,26 +93,26 @@  discard block
 block discarded – undo
93 93
 			$view->itemData = $data;
94 94
 			$view->itemBody = '';
95 95
 
96
-			foreach( $this->getSubClients() as $idx => $client )
96
+			foreach ($this->getSubClients() as $idx => $client)
97 97
 			{
98 98
 				$view->tabindex = ++$idx + 1;
99 99
 				$view->itemBody .= $client->create();
100 100
 			}
101 101
 		}
102
-		catch( \Aimeos\MShop\Exception $e )
102
+		catch (\Aimeos\MShop\Exception $e)
103 103
 		{
104
-			$error = array( 'type-text-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
105
-			$view->errors = $view->get( 'errors', [] ) + $error;
106
-			$this->logException( $e );
104
+			$error = array('type-text-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
105
+			$view->errors = $view->get('errors', []) + $error;
106
+			$this->logException($e);
107 107
 		}
108
-		catch( \Exception $e )
108
+		catch (\Exception $e)
109 109
 		{
110
-			$error = array( 'type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
111
-			$view->errors = $view->get( 'errors', [] ) + $error;
112
-			$this->logException( $e );
110
+			$error = array('type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
111
+			$view->errors = $view->get('errors', []) + $error;
112
+			$this->logException($e);
113 113
 		}
114 114
 
115
-		return $this->render( $view );
115
+		return $this->render($view);
116 116
 	}
117 117
 
118 118
 
@@ -126,38 +126,38 @@  discard block
 block discarded – undo
126 126
 		$view = $this->getView();
127 127
 		$context = $this->getContext();
128 128
 
129
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'text/type' );
129
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'text/type');
130 130
 		$manager->begin();
131 131
 
132 132
 		try
133 133
 		{
134
-			if( ( $id = $view->param( 'id' ) ) === null ) {
135
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
134
+			if (($id = $view->param('id')) === null) {
135
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
136 136
 			}
137 137
 
138
-			$view->item = $manager->getItem( $id );
138
+			$view->item = $manager->getItem($id);
139 139
 
140
-			foreach( $this->getSubClients() as $client ) {
140
+			foreach ($this->getSubClients() as $client) {
141 141
 				$client->delete();
142 142
 			}
143 143
 
144
-			$manager->deleteItem( $id );
144
+			$manager->deleteItem($id);
145 145
 			$manager->commit();
146 146
 
147
-			$this->nextAction( $view, 'search', 'type/text', null, 'delete' );
147
+			$this->nextAction($view, 'search', 'type/text', null, 'delete');
148 148
 			return;
149 149
 		}
150
-		catch( \Aimeos\MShop\Exception $e )
150
+		catch (\Aimeos\MShop\Exception $e)
151 151
 		{
152
-			$error = array( 'type-text-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
153
-			$view->errors = $view->get( 'errors', [] ) + $error;
154
-			$this->logException( $e );
152
+			$error = array('type-text-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
153
+			$view->errors = $view->get('errors', []) + $error;
154
+			$this->logException($e);
155 155
 		}
156
-		catch( \Exception $e )
156
+		catch (\Exception $e)
157 157
 		{
158
-			$error = array( 'type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
159
-			$view->errors = $view->get( 'errors', [] ) + $error;
160
-			$this->logException( $e );
158
+			$error = array('type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
159
+			$view->errors = $view->get('errors', []) + $error;
160
+			$this->logException($e);
161 161
 		}
162 162
 
163 163
 		$manager->rollback();
@@ -178,37 +178,37 @@  discard block
 block discarded – undo
178 178
 
179 179
 		try
180 180
 		{
181
-			if( ( $id = $view->param( 'id' ) ) === null ) {
182
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
181
+			if (($id = $view->param('id')) === null) {
182
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
183 183
 			}
184 184
 
185
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'text/type' );
185
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'text/type');
186 186
 
187
-			$view->item = $manager->getItem( $id );
187
+			$view->item = $manager->getItem($id);
188 188
 			$view->itemSubparts = $this->getSubClientNames();
189
-			$view->itemData = $this->toArray( $view->item );
189
+			$view->itemData = $this->toArray($view->item);
190 190
 			$view->itemBody = '';
191 191
 
192
-			foreach( $this->getSubClients() as $idx => $client )
192
+			foreach ($this->getSubClients() as $idx => $client)
193 193
 			{
194 194
 				$view->tabindex = ++$idx + 1;
195 195
 				$view->itemBody .= $client->get();
196 196
 			}
197 197
 		}
198
-		catch( \Aimeos\MShop\Exception $e )
198
+		catch (\Aimeos\MShop\Exception $e)
199 199
 		{
200
-			$error = array( 'type-text-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
201
-			$view->errors = $view->get( 'errors', [] ) + $error;
202
-			$this->logException( $e );
200
+			$error = array('type-text-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
201
+			$view->errors = $view->get('errors', []) + $error;
202
+			$this->logException($e);
203 203
 		}
204
-		catch( \Exception $e )
204
+		catch (\Exception $e)
205 205
 		{
206
-			$error = array( 'type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
207
-			$view->errors = $view->get( 'errors', [] ) + $error;
208
-			$this->logException( $e );
206
+			$error = array('type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
207
+			$view->errors = $view->get('errors', []) + $error;
208
+			$this->logException($e);
209 209
 		}
210 210
 
211
-		return $this->render( $view );
211
+		return $this->render($view);
212 212
 	}
213 213
 
214 214
 
@@ -222,40 +222,40 @@  discard block
 block discarded – undo
222 222
 		$view = $this->getView();
223 223
 		$context = $this->getContext();
224 224
 
225
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'text/type' );
225
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'text/type');
226 226
 		$manager->begin();
227 227
 
228 228
 		try
229 229
 		{
230
-			$item = $this->fromArray( $view->param( 'item', [] ) );
231
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
230
+			$item = $this->fromArray($view->param('item', []));
231
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
232 232
 			$view->itemBody = '';
233 233
 
234
-			foreach( $this->getSubClients() as $client ) {
234
+			foreach ($this->getSubClients() as $client) {
235 235
 				$view->itemBody .= $client->save();
236 236
 			}
237 237
 
238
-			$manager->saveItem( clone $view->item );
238
+			$manager->saveItem(clone $view->item);
239 239
 			$manager->commit();
240 240
 
241
-			$this->nextAction( $view, $view->param( 'next' ), 'type/text', $view->item->getId(), 'save' );
241
+			$this->nextAction($view, $view->param('next'), 'type/text', $view->item->getId(), 'save');
242 242
 			return;
243 243
 		}
244
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
244
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
245 245
 		{
246 246
 			// fall through to create
247 247
 		}
248
-		catch( \Aimeos\MShop\Exception $e )
248
+		catch (\Aimeos\MShop\Exception $e)
249 249
 		{
250
-			$error = array( 'type-text-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
251
-			$view->errors = $view->get( 'errors', [] ) + $error;
252
-			$this->logException( $e );
250
+			$error = array('type-text-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
251
+			$view->errors = $view->get('errors', []) + $error;
252
+			$this->logException($e);
253 253
 		}
254
-		catch( \Exception $e )
254
+		catch (\Exception $e)
255 255
 		{
256
-			$error = array( 'type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
257
-			$view->errors = $view->get( 'errors', [] ) + $error;
258
-			$this->logException( $e );
256
+			$error = array('type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
257
+			$view->errors = $view->get('errors', []) + $error;
258
+			$this->logException($e);
259 259
 		}
260 260
 
261 261
 		$manager->rollback();
@@ -277,29 +277,29 @@  discard block
 block discarded – undo
277 277
 		try
278 278
 		{
279 279
 			$total = 0;
280
-			$params = $this->storeSearchParams( $view->param(), 'type/text' );
281
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'text/type' );
282
-			$search = $this->initCriteria( $manager->createSearch(), $params );
280
+			$params = $this->storeSearchParams($view->param(), 'type/text');
281
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'text/type');
282
+			$search = $this->initCriteria($manager->createSearch(), $params);
283 283
 
284
-			$view->items = $manager->searchItems( $search, [], $total );
285
-			$view->filterAttributes = $manager->getSearchAttributes( true );
284
+			$view->items = $manager->searchItems($search, [], $total);
285
+			$view->filterAttributes = $manager->getSearchAttributes(true);
286 286
 			$view->filterOperators = $search->getOperators();
287 287
 			$view->total = $total;
288 288
 			$view->itemBody = '';
289 289
 
290
-			foreach( $this->getSubClients() as $client ) {
290
+			foreach ($this->getSubClients() as $client) {
291 291
 				$view->itemBody .= $client->search();
292 292
 			}
293 293
 		}
294
-		catch( \Aimeos\MShop\Exception $e )
294
+		catch (\Aimeos\MShop\Exception $e)
295 295
 		{
296
-			$error = array( 'type-text-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
297
-			$view->errors = $view->get( 'errors', [] ) + $error;
296
+			$error = array('type-text-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
297
+			$view->errors = $view->get('errors', []) + $error;
298 298
 		}
299
-		catch( \Exception $e )
299
+		catch (\Exception $e)
300 300
 		{
301
-			$error = array( 'type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
302
-			$view->errors = $view->get( 'errors', [] ) + $error;
301
+			$error = array('type-text-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
302
+			$view->errors = $view->get('errors', []) + $error;
303 303
 		}
304 304
 
305 305
 		/** admin/jqadm/type/text/template-list
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 		$tplconf = 'admin/jqadm/type/text/template-list';
325 325
 		$default = 'type/text/list-standard';
326 326
 
327
-		return $view->render( $view->config( $tplconf, $default ) );
327
+		return $view->render($view->config($tplconf, $default));
328 328
 	}
329 329
 
330 330
 
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
 	 * @param string|null $name Name of the sub-client (Default if null)
336 336
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
337 337
 	 */
338
-	public function getSubClient( $type, $name = null )
338
+	public function getSubClient($type, $name = null)
339 339
 	{
340 340
 		/** admin/jqadm/type/text/decorators/excludes
341 341
 		 * Excludes decorators added by the "common" option from the type JQAdm client
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
 		 * @see admin/jqadm/type/text/decorators/excludes
411 411
 		 * @see admin/jqadm/type/text/decorators/global
412 412
 		 */
413
-		return $this->createSubClient( 'type/text' . $type, $name );
413
+		return $this->createSubClient('type/text' . $type, $name);
414 414
 	}
415 415
 
416 416
 
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
454 454
 		 * @since 2017.10
455 455
 		 * @category Developer
456 456
 		 */
457
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/type/text/standard/subparts', [] );
457
+		return $this->getContext()->getConfig()->get('admin/jqadm/type/text/standard/subparts', []);
458 458
 	}
459 459
 
460 460
 
@@ -465,17 +465,17 @@  discard block
 block discarded – undo
465 465
 	 * @param string[] Data array
466 466
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface New type item object
467 467
 	 */
468
-	protected function fromArray( array $data )
468
+	protected function fromArray(array $data)
469 469
 	{
470
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'text/type' );
470
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'text/type');
471 471
 
472
-		if( isset( $data['text.type.id'] ) && $data['text.type.id'] != '' ) {
473
-			$item = $manager->getItem( $data['text.type.id'] );
472
+		if (isset($data['text.type.id']) && $data['text.type.id'] != '') {
473
+			$item = $manager->getItem($data['text.type.id']);
474 474
 		} else {
475 475
 			$item = $manager->createItem();
476 476
 		}
477 477
 
478
-		$item->fromArray( $data );
478
+		$item->fromArray($data);
479 479
 
480 480
 		return $item;
481 481
 	}
@@ -487,11 +487,11 @@  discard block
 block discarded – undo
487 487
 	 * @param \Aimeos\MShop\Common\Item\Type\Iface $item Type item object
488 488
 	 * @return string[] Multi-dimensional associative list of item data
489 489
 	 */
490
-	protected function toArray( \Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false )
490
+	protected function toArray(\Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false)
491 491
 	{
492
-		$data = $item->toArray( true );
492
+		$data = $item->toArray(true);
493 493
 
494
-		if( $copy === true )
494
+		if ($copy === true)
495 495
 		{
496 496
 			$data['text.type.code'] = $data['text.type.code'] . '_copy';
497 497
 			$data['text.type.id'] = '';
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
508 508
 	 * @return string HTML output
509 509
 	 */
510
-	protected function render( \Aimeos\MW\View\Iface $view )
510
+	protected function render(\Aimeos\MW\View\Iface $view)
511 511
 	{
512 512
 		/** admin/jqadm/type/text/template-item
513 513
 		 * Relative path to the HTML body template for the type item.
@@ -531,6 +531,6 @@  discard block
 block discarded – undo
531 531
 		$tplconf = 'admin/jqadm/type/text/template-item';
532 532
 		$default = 'type/text/item-standard';
533 533
 
534
-		return $view->render( $view->config( $tplconf, $default ) );
534
+		return $view->render($view->config($tplconf, $default));
535 535
 	}
536 536
 }
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Type/Plugin/Standard.php 2 patches
Braces   +13 added lines, -26 removed lines patch added patch discarded remove patch
@@ -88,14 +88,12 @@  discard block
 block discarded – undo
88 88
 				$view->tabindex = ++$idx + 1;
89 89
 				$view->itemBody .= $client->copy();
90 90
 			}
91
-		}
92
-		catch( \Aimeos\MShop\Exception $e )
91
+		} catch( \Aimeos\MShop\Exception $e )
93 92
 		{
94 93
 			$error = array( 'type-plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
95 94
 			$view->errors = $view->get( 'errors', [] ) + $error;
96 95
 			$this->logException( $e );
97
-		}
98
-		catch( \Exception $e )
96
+		} catch( \Exception $e )
99 97
 		{
100 98
 			$error = array( 'type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
101 99
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -137,14 +135,12 @@  discard block
 block discarded – undo
137 135
 				$view->tabindex = ++$idx + 1;
138 136
 				$view->itemBody .= $client->create();
139 137
 			}
140
-		}
141
-		catch( \Aimeos\MShop\Exception $e )
138
+		} catch( \Aimeos\MShop\Exception $e )
142 139
 		{
143 140
 			$error = array( 'type-plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
144 141
 			$view->errors = $view->get( 'errors', [] ) + $error;
145 142
 			$this->logException( $e );
146
-		}
147
-		catch( \Exception $e )
143
+		} catch( \Exception $e )
148 144
 		{
149 145
 			$error = array( 'type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
150 146
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -185,14 +181,12 @@  discard block
 block discarded – undo
185 181
 
186 182
 			$this->nextAction( $view, 'search', 'type/plugin', null, 'delete' );
187 183
 			return;
188
-		}
189
-		catch( \Aimeos\MShop\Exception $e )
184
+		} catch( \Aimeos\MShop\Exception $e )
190 185
 		{
191 186
 			$error = array( 'type-plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
192 187
 			$view->errors = $view->get( 'errors', [] ) + $error;
193 188
 			$this->logException( $e );
194
-		}
195
-		catch( \Exception $e )
189
+		} catch( \Exception $e )
196 190
 		{
197 191
 			$error = array( 'type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
198 192
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -233,14 +227,12 @@  discard block
 block discarded – undo
233 227
 				$view->tabindex = ++$idx + 1;
234 228
 				$view->itemBody .= $client->get();
235 229
 			}
236
-		}
237
-		catch( \Aimeos\MShop\Exception $e )
230
+		} catch( \Aimeos\MShop\Exception $e )
238 231
 		{
239 232
 			$error = array( 'type-plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
240 233
 			$view->errors = $view->get( 'errors', [] ) + $error;
241 234
 			$this->logException( $e );
242
-		}
243
-		catch( \Exception $e )
235
+		} catch( \Exception $e )
244 236
 		{
245 237
 			$error = array( 'type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
246 238
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -277,18 +269,15 @@  discard block
 block discarded – undo
277 269
 
278 270
 			$this->nextAction( $view, $view->param( 'next' ), 'type/plugin', $view->item->getId(), 'save' );
279 271
 			return;
280
-		}
281
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
272
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
282 273
 		{
283 274
 			// fall through to create
284
-		}
285
-		catch( \Aimeos\MShop\Exception $e )
275
+		} catch( \Aimeos\MShop\Exception $e )
286 276
 		{
287 277
 			$error = array( 'type-plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
288 278
 			$view->errors = $view->get( 'errors', [] ) + $error;
289 279
 			$this->logException( $e );
290
-		}
291
-		catch( \Exception $e )
280
+		} catch( \Exception $e )
292 281
 		{
293 282
 			$error = array( 'type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
294 283
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -327,14 +316,12 @@  discard block
 block discarded – undo
327 316
 			foreach( $this->getSubClients() as $client ) {
328 317
 				$view->itemBody .= $client->search();
329 318
 			}
330
-		}
331
-		catch( \Aimeos\MShop\Exception $e )
319
+		} catch( \Aimeos\MShop\Exception $e )
332 320
 		{
333 321
 			$error = array( 'type-plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
334 322
 			$view->errors = $view->get( 'errors', [] ) + $error;
335 323
 			$this->logException( $e );
336
-		}
337
-		catch( \Exception $e )
324
+		} catch( \Exception $e )
338 325
 		{
339 326
 			$error = array( 'type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
340 327
 			$view->errors = $view->get( 'errors', [] ) + $error;
Please login to merge, or discard this patch.
Spacing   +102 added lines, -102 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 namespace Aimeos\Admin\JQAdm\Type\Plugin;
12 12
 
13
-sprintf( 'type/plugin' ); // for translation
13
+sprintf('type/plugin'); // for translation
14 14
 
15 15
 
16 16
 /**
@@ -35,37 +35,37 @@  discard block
 block discarded – undo
35 35
 
36 36
 		try
37 37
 		{
38
-			if( ( $id = $view->param( 'id' ) ) === null ) {
39
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
38
+			if (($id = $view->param('id')) === null) {
39
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
40 40
 			}
41 41
 
42
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'plugin/type' );
43
-			$view->item = $manager->getItem( $id );
42
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'plugin/type');
43
+			$view->item = $manager->getItem($id);
44 44
 
45
-			$view->itemData = $this->toArray( $view->item, true );
45
+			$view->itemData = $this->toArray($view->item, true);
46 46
 			$view->itemSubparts = $this->getSubClientNames();
47 47
 			$view->itemBody = '';
48 48
 
49
-			foreach( $this->getSubClients() as $idx => $client )
49
+			foreach ($this->getSubClients() as $idx => $client)
50 50
 			{
51 51
 				$view->tabindex = ++$idx + 1;
52 52
 				$view->itemBody .= $client->copy();
53 53
 			}
54 54
 		}
55
-		catch( \Aimeos\MShop\Exception $e )
55
+		catch (\Aimeos\MShop\Exception $e)
56 56
 		{
57
-			$error = array( 'type-plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
58
-			$view->errors = $view->get( 'errors', [] ) + $error;
59
-			$this->logException( $e );
57
+			$error = array('type-plugin-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
58
+			$view->errors = $view->get('errors', []) + $error;
59
+			$this->logException($e);
60 60
 		}
61
-		catch( \Exception $e )
61
+		catch (\Exception $e)
62 62
 		{
63
-			$error = array( 'type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
64
-			$view->errors = $view->get( 'errors', [] ) + $error;
65
-			$this->logException( $e );
63
+			$error = array('type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
64
+			$view->errors = $view->get('errors', []) + $error;
65
+			$this->logException($e);
66 66
 		}
67 67
 
68
-		return $this->render( $view );
68
+		return $this->render($view);
69 69
 	}
70 70
 
71 71
 
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
 
82 82
 		try
83 83
 		{
84
-			$data = $view->param( 'item', [] );
84
+			$data = $view->param('item', []);
85 85
 
86
-			if( !isset( $view->item ) ) {
87
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'plugin/type' )->createItem();
86
+			if (!isset($view->item)) {
87
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'plugin/type')->createItem();
88 88
 			}
89 89
 
90 90
 			$data['plugin.type.siteid'] = $view->item->getSiteId();
@@ -93,26 +93,26 @@  discard block
 block discarded – undo
93 93
 			$view->itemData = $data;
94 94
 			$view->itemBody = '';
95 95
 
96
-			foreach( $this->getSubClients() as $idx => $client )
96
+			foreach ($this->getSubClients() as $idx => $client)
97 97
 			{
98 98
 				$view->tabindex = ++$idx + 1;
99 99
 				$view->itemBody .= $client->create();
100 100
 			}
101 101
 		}
102
-		catch( \Aimeos\MShop\Exception $e )
102
+		catch (\Aimeos\MShop\Exception $e)
103 103
 		{
104
-			$error = array( 'type-plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
105
-			$view->errors = $view->get( 'errors', [] ) + $error;
106
-			$this->logException( $e );
104
+			$error = array('type-plugin-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
105
+			$view->errors = $view->get('errors', []) + $error;
106
+			$this->logException($e);
107 107
 		}
108
-		catch( \Exception $e )
108
+		catch (\Exception $e)
109 109
 		{
110
-			$error = array( 'type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
111
-			$view->errors = $view->get( 'errors', [] ) + $error;
112
-			$this->logException( $e );
110
+			$error = array('type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
111
+			$view->errors = $view->get('errors', []) + $error;
112
+			$this->logException($e);
113 113
 		}
114 114
 
115
-		return $this->render( $view );
115
+		return $this->render($view);
116 116
 	}
117 117
 
118 118
 
@@ -126,38 +126,38 @@  discard block
 block discarded – undo
126 126
 		$view = $this->getView();
127 127
 		$context = $this->getContext();
128 128
 
129
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'plugin/type' );
129
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'plugin/type');
130 130
 		$manager->begin();
131 131
 
132 132
 		try
133 133
 		{
134
-			if( ( $id = $view->param( 'id' ) ) === null ) {
135
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
134
+			if (($id = $view->param('id')) === null) {
135
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
136 136
 			}
137 137
 
138
-			$view->item = $manager->getItem( $id );
138
+			$view->item = $manager->getItem($id);
139 139
 
140
-			foreach( $this->getSubClients() as $client ) {
140
+			foreach ($this->getSubClients() as $client) {
141 141
 				$client->delete();
142 142
 			}
143 143
 
144
-			$manager->deleteItem( $id );
144
+			$manager->deleteItem($id);
145 145
 			$manager->commit();
146 146
 
147
-			$this->nextAction( $view, 'search', 'type/plugin', null, 'delete' );
147
+			$this->nextAction($view, 'search', 'type/plugin', null, 'delete');
148 148
 			return;
149 149
 		}
150
-		catch( \Aimeos\MShop\Exception $e )
150
+		catch (\Aimeos\MShop\Exception $e)
151 151
 		{
152
-			$error = array( 'type-plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
153
-			$view->errors = $view->get( 'errors', [] ) + $error;
154
-			$this->logException( $e );
152
+			$error = array('type-plugin-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
153
+			$view->errors = $view->get('errors', []) + $error;
154
+			$this->logException($e);
155 155
 		}
156
-		catch( \Exception $e )
156
+		catch (\Exception $e)
157 157
 		{
158
-			$error = array( 'type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
159
-			$view->errors = $view->get( 'errors', [] ) + $error;
160
-			$this->logException( $e );
158
+			$error = array('type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
159
+			$view->errors = $view->get('errors', []) + $error;
160
+			$this->logException($e);
161 161
 		}
162 162
 
163 163
 		$manager->rollback();
@@ -178,37 +178,37 @@  discard block
 block discarded – undo
178 178
 
179 179
 		try
180 180
 		{
181
-			if( ( $id = $view->param( 'id' ) ) === null ) {
182
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
181
+			if (($id = $view->param('id')) === null) {
182
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
183 183
 			}
184 184
 
185
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'plugin/type' );
185
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'plugin/type');
186 186
 
187
-			$view->item = $manager->getItem( $id );
187
+			$view->item = $manager->getItem($id);
188 188
 			$view->itemSubparts = $this->getSubClientNames();
189
-			$view->itemData = $this->toArray( $view->item );
189
+			$view->itemData = $this->toArray($view->item);
190 190
 			$view->itemBody = '';
191 191
 
192
-			foreach( $this->getSubClients() as $idx => $client )
192
+			foreach ($this->getSubClients() as $idx => $client)
193 193
 			{
194 194
 				$view->tabindex = ++$idx + 1;
195 195
 				$view->itemBody .= $client->get();
196 196
 			}
197 197
 		}
198
-		catch( \Aimeos\MShop\Exception $e )
198
+		catch (\Aimeos\MShop\Exception $e)
199 199
 		{
200
-			$error = array( 'type-plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
201
-			$view->errors = $view->get( 'errors', [] ) + $error;
202
-			$this->logException( $e );
200
+			$error = array('type-plugin-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
201
+			$view->errors = $view->get('errors', []) + $error;
202
+			$this->logException($e);
203 203
 		}
204
-		catch( \Exception $e )
204
+		catch (\Exception $e)
205 205
 		{
206
-			$error = array( 'type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
207
-			$view->errors = $view->get( 'errors', [] ) + $error;
208
-			$this->logException( $e );
206
+			$error = array('type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
207
+			$view->errors = $view->get('errors', []) + $error;
208
+			$this->logException($e);
209 209
 		}
210 210
 
211
-		return $this->render( $view );
211
+		return $this->render($view);
212 212
 	}
213 213
 
214 214
 
@@ -222,40 +222,40 @@  discard block
 block discarded – undo
222 222
 		$view = $this->getView();
223 223
 		$context = $this->getContext();
224 224
 
225
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'plugin/type' );
225
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'plugin/type');
226 226
 		$manager->begin();
227 227
 
228 228
 		try
229 229
 		{
230
-			$item = $this->fromArray( $view->param( 'item', [] ) );
231
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
230
+			$item = $this->fromArray($view->param('item', []));
231
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
232 232
 			$view->itemBody = '';
233 233
 
234
-			foreach( $this->getSubClients() as $client ) {
234
+			foreach ($this->getSubClients() as $client) {
235 235
 				$view->itemBody .= $client->save();
236 236
 			}
237 237
 
238
-			$manager->saveItem( clone $view->item );
238
+			$manager->saveItem(clone $view->item);
239 239
 			$manager->commit();
240 240
 
241
-			$this->nextAction( $view, $view->param( 'next' ), 'type/plugin', $view->item->getId(), 'save' );
241
+			$this->nextAction($view, $view->param('next'), 'type/plugin', $view->item->getId(), 'save');
242 242
 			return;
243 243
 		}
244
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
244
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
245 245
 		{
246 246
 			// fall through to create
247 247
 		}
248
-		catch( \Aimeos\MShop\Exception $e )
248
+		catch (\Aimeos\MShop\Exception $e)
249 249
 		{
250
-			$error = array( 'type-plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
251
-			$view->errors = $view->get( 'errors', [] ) + $error;
252
-			$this->logException( $e );
250
+			$error = array('type-plugin-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
251
+			$view->errors = $view->get('errors', []) + $error;
252
+			$this->logException($e);
253 253
 		}
254
-		catch( \Exception $e )
254
+		catch (\Exception $e)
255 255
 		{
256
-			$error = array( 'type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
257
-			$view->errors = $view->get( 'errors', [] ) + $error;
258
-			$this->logException( $e );
256
+			$error = array('type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
257
+			$view->errors = $view->get('errors', []) + $error;
258
+			$this->logException($e);
259 259
 		}
260 260
 
261 261
 		$manager->rollback();
@@ -277,31 +277,31 @@  discard block
 block discarded – undo
277 277
 		try
278 278
 		{
279 279
 			$total = 0;
280
-			$params = $this->storeSearchParams( $view->param(), 'type/plugin' );
281
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'plugin/type' );
282
-			$search = $this->initCriteria( $manager->createSearch(), $params );
280
+			$params = $this->storeSearchParams($view->param(), 'type/plugin');
281
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'plugin/type');
282
+			$search = $this->initCriteria($manager->createSearch(), $params);
283 283
 
284
-			$view->items = $manager->searchItems( $search, [], $total );
285
-			$view->filterAttributes = $manager->getSearchAttributes( true );
284
+			$view->items = $manager->searchItems($search, [], $total);
285
+			$view->filterAttributes = $manager->getSearchAttributes(true);
286 286
 			$view->filterOperators = $search->getOperators();
287 287
 			$view->total = $total;
288 288
 			$view->itemBody = '';
289 289
 
290
-			foreach( $this->getSubClients() as $client ) {
290
+			foreach ($this->getSubClients() as $client) {
291 291
 				$view->itemBody .= $client->search();
292 292
 			}
293 293
 		}
294
-		catch( \Aimeos\MShop\Exception $e )
294
+		catch (\Aimeos\MShop\Exception $e)
295 295
 		{
296
-			$error = array( 'type-plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
297
-			$view->errors = $view->get( 'errors', [] ) + $error;
298
-			$this->logException( $e );
296
+			$error = array('type-plugin-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
297
+			$view->errors = $view->get('errors', []) + $error;
298
+			$this->logException($e);
299 299
 		}
300
-		catch( \Exception $e )
300
+		catch (\Exception $e)
301 301
 		{
302
-			$error = array( 'type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
303
-			$view->errors = $view->get( 'errors', [] ) + $error;
304
-			$this->logException( $e );
302
+			$error = array('type-plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
303
+			$view->errors = $view->get('errors', []) + $error;
304
+			$this->logException($e);
305 305
 		}
306 306
 
307 307
 		/** admin/jqadm/type/plugin/template-list
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 		$tplconf = 'admin/jqadm/type/plugin/template-list';
327 327
 		$default = 'type/plugin/list-standard';
328 328
 
329
-		return $view->render( $view->config( $tplconf, $default ) );
329
+		return $view->render($view->config($tplconf, $default));
330 330
 	}
331 331
 
332 332
 
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 	 * @param string|null $name Name of the sub-client (Default if null)
338 338
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
339 339
 	 */
340
-	public function getSubClient( $type, $name = null )
340
+	public function getSubClient($type, $name = null)
341 341
 	{
342 342
 		/** admin/jqadm/type/plugin/decorators/excludes
343 343
 		 * Excludes decorators added by the "common" option from the type JQAdm client
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 		 * @see admin/jqadm/type/plugin/decorators/excludes
413 413
 		 * @see admin/jqadm/type/plugin/decorators/global
414 414
 		 */
415
-		return $this->createSubClient( 'type/plugin' . $type, $name );
415
+		return $this->createSubClient('type/plugin' . $type, $name);
416 416
 	}
417 417
 
418 418
 
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
 		 * @since 2017.10
457 457
 		 * @category Developer
458 458
 		 */
459
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/type/plugin/standard/subparts', [] );
459
+		return $this->getContext()->getConfig()->get('admin/jqadm/type/plugin/standard/subparts', []);
460 460
 	}
461 461
 
462 462
 
@@ -467,17 +467,17 @@  discard block
 block discarded – undo
467 467
 	 * @param string[] Data array
468 468
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface New type item object
469 469
 	 */
470
-	protected function fromArray( array $data )
470
+	protected function fromArray(array $data)
471 471
 	{
472
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'plugin/type' );
472
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'plugin/type');
473 473
 
474
-		if( isset( $data['plugin.type.id'] ) && $data['plugin.type.id'] != '' ) {
475
-			$item = $manager->getItem( $data['plugin.type.id'] );
474
+		if (isset($data['plugin.type.id']) && $data['plugin.type.id'] != '') {
475
+			$item = $manager->getItem($data['plugin.type.id']);
476 476
 		} else {
477 477
 			$item = $manager->createItem();
478 478
 		}
479 479
 
480
-		$item->fromArray( $data );
480
+		$item->fromArray($data);
481 481
 
482 482
 		return $item;
483 483
 	}
@@ -489,11 +489,11 @@  discard block
 block discarded – undo
489 489
 	 * @param \Aimeos\MShop\Common\Item\Type\Iface $item Type item object
490 490
 	 * @return string[] Multi-dimensional associative list of item data
491 491
 	 */
492
-	protected function toArray( \Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false )
492
+	protected function toArray(\Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false)
493 493
 	{
494
-		$data = $item->toArray( true );
494
+		$data = $item->toArray(true);
495 495
 
496
-		if( $copy === true )
496
+		if ($copy === true)
497 497
 		{
498 498
 			$data['plugin.type.code'] = $data['plugin.type.code'] . '_copy';
499 499
 			$data['plugin.type.id'] = '';
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
510 510
 	 * @return string HTML output
511 511
 	 */
512
-	protected function render( \Aimeos\MW\View\Iface $view )
512
+	protected function render(\Aimeos\MW\View\Iface $view)
513 513
 	{
514 514
 		/** admin/jqadm/type/plugin/template-item
515 515
 		 * Relative path to the HTML body template for the type item.
@@ -533,6 +533,6 @@  discard block
 block discarded – undo
533 533
 		$tplconf = 'admin/jqadm/type/plugin/template-item';
534 534
 		$default = 'type/plugin/item-standard';
535 535
 
536
-		return $view->render( $view->config( $tplconf, $default ) );
536
+		return $view->render($view->config($tplconf, $default));
537 537
 	}
538 538
 }
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Type/Service/Lists/Standard.php 2 patches
Braces   +13 added lines, -26 removed lines patch added patch discarded remove patch
@@ -88,14 +88,12 @@  discard block
 block discarded – undo
88 88
 				$view->tabindex = ++$idx + 1;
89 89
 				$view->itemBody .= $client->copy();
90 90
 			}
91
-		}
92
-		catch( \Aimeos\MShop\Exception $e )
91
+		} catch( \Aimeos\MShop\Exception $e )
93 92
 		{
94 93
 			$error = array( 'type-service-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
95 94
 			$view->errors = $view->get( 'errors', [] ) + $error;
96 95
 			$this->logException( $e );
97
-		}
98
-		catch( \Exception $e )
96
+		} catch( \Exception $e )
99 97
 		{
100 98
 			$error = array( 'type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
101 99
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -137,14 +135,12 @@  discard block
 block discarded – undo
137 135
 				$view->tabindex = ++$idx + 1;
138 136
 				$view->itemBody .= $client->create();
139 137
 			}
140
-		}
141
-		catch( \Aimeos\MShop\Exception $e )
138
+		} catch( \Aimeos\MShop\Exception $e )
142 139
 		{
143 140
 			$error = array( 'type-service-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
144 141
 			$view->errors = $view->get( 'errors', [] ) + $error;
145 142
 			$this->logException( $e );
146
-		}
147
-		catch( \Exception $e )
143
+		} catch( \Exception $e )
148 144
 		{
149 145
 			$error = array( 'type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
150 146
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -185,14 +181,12 @@  discard block
 block discarded – undo
185 181
 
186 182
 			$this->nextAction( $view, 'search', 'type/service/lists', null, 'delete' );
187 183
 			return;
188
-		}
189
-		catch( \Aimeos\MShop\Exception $e )
184
+		} catch( \Aimeos\MShop\Exception $e )
190 185
 		{
191 186
 			$error = array( 'type-service-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
192 187
 			$view->errors = $view->get( 'errors', [] ) + $error;
193 188
 			$this->logException( $e );
194
-		}
195
-		catch( \Exception $e )
189
+		} catch( \Exception $e )
196 190
 		{
197 191
 			$error = array( 'type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
198 192
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -233,14 +227,12 @@  discard block
 block discarded – undo
233 227
 				$view->tabindex = ++$idx + 1;
234 228
 				$view->itemBody .= $client->get();
235 229
 			}
236
-		}
237
-		catch( \Aimeos\MShop\Exception $e )
230
+		} catch( \Aimeos\MShop\Exception $e )
238 231
 		{
239 232
 			$error = array( 'type-service-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
240 233
 			$view->errors = $view->get( 'errors', [] ) + $error;
241 234
 			$this->logException( $e );
242
-		}
243
-		catch( \Exception $e )
235
+		} catch( \Exception $e )
244 236
 		{
245 237
 			$error = array( 'type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
246 238
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -277,18 +269,15 @@  discard block
 block discarded – undo
277 269
 
278 270
 			$this->nextAction( $view, $view->param( 'next' ), 'type/service/lists', $view->item->getId(), 'save' );
279 271
 			return;
280
-		}
281
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
272
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
282 273
 		{
283 274
 			// fall through to create
284
-		}
285
-		catch( \Aimeos\MShop\Exception $e )
275
+		} catch( \Aimeos\MShop\Exception $e )
286 276
 		{
287 277
 			$error = array( 'type-service-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
288 278
 			$view->errors = $view->get( 'errors', [] ) + $error;
289 279
 			$this->logException( $e );
290
-		}
291
-		catch( \Exception $e )
280
+		} catch( \Exception $e )
292 281
 		{
293 282
 			$error = array( 'type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
294 283
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -327,14 +316,12 @@  discard block
 block discarded – undo
327 316
 			foreach( $this->getSubClients() as $client ) {
328 317
 				$view->itemBody .= $client->search();
329 318
 			}
330
-		}
331
-		catch( \Aimeos\MShop\Exception $e )
319
+		} catch( \Aimeos\MShop\Exception $e )
332 320
 		{
333 321
 			$error = array( 'type-service-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
334 322
 			$view->errors = $view->get( 'errors', [] ) + $error;
335 323
 			$this->logException( $e );
336
-		}
337
-		catch( \Exception $e )
324
+		} catch( \Exception $e )
338 325
 		{
339 326
 			$error = array( 'type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
340 327
 			$view->errors = $view->get( 'errors', [] ) + $error;
Please login to merge, or discard this patch.
Spacing   +102 added lines, -102 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 namespace Aimeos\Admin\JQAdm\Type\Service\Lists;
12 12
 
13
-sprintf( 'type/service/lists' ); // for translation
13
+sprintf('type/service/lists'); // for translation
14 14
 
15 15
 
16 16
 /**
@@ -35,37 +35,37 @@  discard block
 block discarded – undo
35 35
 
36 36
 		try
37 37
 		{
38
-			if( ( $id = $view->param( 'id' ) ) === null ) {
39
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
38
+			if (($id = $view->param('id')) === null) {
39
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
40 40
 			}
41 41
 
42
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'service/lists/type' );
43
-			$view->item = $manager->getItem( $id );
42
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'service/lists/type');
43
+			$view->item = $manager->getItem($id);
44 44
 
45
-			$view->itemData = $this->toArray( $view->item, true );
45
+			$view->itemData = $this->toArray($view->item, true);
46 46
 			$view->itemSubparts = $this->getSubClientNames();
47 47
 			$view->itemBody = '';
48 48
 
49
-			foreach( $this->getSubClients() as $idx => $client )
49
+			foreach ($this->getSubClients() as $idx => $client)
50 50
 			{
51 51
 				$view->tabindex = ++$idx + 1;
52 52
 				$view->itemBody .= $client->copy();
53 53
 			}
54 54
 		}
55
-		catch( \Aimeos\MShop\Exception $e )
55
+		catch (\Aimeos\MShop\Exception $e)
56 56
 		{
57
-			$error = array( 'type-service-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
58
-			$view->errors = $view->get( 'errors', [] ) + $error;
59
-			$this->logException( $e );
57
+			$error = array('type-service-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
58
+			$view->errors = $view->get('errors', []) + $error;
59
+			$this->logException($e);
60 60
 		}
61
-		catch( \Exception $e )
61
+		catch (\Exception $e)
62 62
 		{
63
-			$error = array( 'type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
64
-			$view->errors = $view->get( 'errors', [] ) + $error;
65
-			$this->logException( $e );
63
+			$error = array('type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
64
+			$view->errors = $view->get('errors', []) + $error;
65
+			$this->logException($e);
66 66
 		}
67 67
 
68
-		return $this->render( $view );
68
+		return $this->render($view);
69 69
 	}
70 70
 
71 71
 
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
 
82 82
 		try
83 83
 		{
84
-			$data = $view->param( 'item', [] );
84
+			$data = $view->param('item', []);
85 85
 
86
-			if( !isset( $view->item ) ) {
87
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'service/lists/type' )->createItem();
86
+			if (!isset($view->item)) {
87
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'service/lists/type')->createItem();
88 88
 			}
89 89
 
90 90
 			$data['service.lists.type.siteid'] = $view->item->getSiteId();
@@ -93,26 +93,26 @@  discard block
 block discarded – undo
93 93
 			$view->itemData = $data;
94 94
 			$view->itemBody = '';
95 95
 
96
-			foreach( $this->getSubClients() as $idx => $client )
96
+			foreach ($this->getSubClients() as $idx => $client)
97 97
 			{
98 98
 				$view->tabindex = ++$idx + 1;
99 99
 				$view->itemBody .= $client->create();
100 100
 			}
101 101
 		}
102
-		catch( \Aimeos\MShop\Exception $e )
102
+		catch (\Aimeos\MShop\Exception $e)
103 103
 		{
104
-			$error = array( 'type-service-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
105
-			$view->errors = $view->get( 'errors', [] ) + $error;
106
-			$this->logException( $e );
104
+			$error = array('type-service-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
105
+			$view->errors = $view->get('errors', []) + $error;
106
+			$this->logException($e);
107 107
 		}
108
-		catch( \Exception $e )
108
+		catch (\Exception $e)
109 109
 		{
110
-			$error = array( 'type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
111
-			$view->errors = $view->get( 'errors', [] ) + $error;
112
-			$this->logException( $e );
110
+			$error = array('type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
111
+			$view->errors = $view->get('errors', []) + $error;
112
+			$this->logException($e);
113 113
 		}
114 114
 
115
-		return $this->render( $view );
115
+		return $this->render($view);
116 116
 	}
117 117
 
118 118
 
@@ -126,38 +126,38 @@  discard block
 block discarded – undo
126 126
 		$view = $this->getView();
127 127
 		$context = $this->getContext();
128 128
 
129
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'service/lists/type' );
129
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'service/lists/type');
130 130
 		$manager->begin();
131 131
 
132 132
 		try
133 133
 		{
134
-			if( ( $id = $view->param( 'id' ) ) === null ) {
135
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
134
+			if (($id = $view->param('id')) === null) {
135
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
136 136
 			}
137 137
 
138
-			$view->item = $manager->getItem( $id );
138
+			$view->item = $manager->getItem($id);
139 139
 
140
-			foreach( $this->getSubClients() as $client ) {
140
+			foreach ($this->getSubClients() as $client) {
141 141
 				$client->delete();
142 142
 			}
143 143
 
144
-			$manager->deleteItem( $id );
144
+			$manager->deleteItem($id);
145 145
 			$manager->commit();
146 146
 
147
-			$this->nextAction( $view, 'search', 'type/service/lists', null, 'delete' );
147
+			$this->nextAction($view, 'search', 'type/service/lists', null, 'delete');
148 148
 			return;
149 149
 		}
150
-		catch( \Aimeos\MShop\Exception $e )
150
+		catch (\Aimeos\MShop\Exception $e)
151 151
 		{
152
-			$error = array( 'type-service-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
153
-			$view->errors = $view->get( 'errors', [] ) + $error;
154
-			$this->logException( $e );
152
+			$error = array('type-service-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
153
+			$view->errors = $view->get('errors', []) + $error;
154
+			$this->logException($e);
155 155
 		}
156
-		catch( \Exception $e )
156
+		catch (\Exception $e)
157 157
 		{
158
-			$error = array( 'type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
159
-			$view->errors = $view->get( 'errors', [] ) + $error;
160
-			$this->logException( $e );
158
+			$error = array('type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
159
+			$view->errors = $view->get('errors', []) + $error;
160
+			$this->logException($e);
161 161
 		}
162 162
 
163 163
 		$manager->rollback();
@@ -178,37 +178,37 @@  discard block
 block discarded – undo
178 178
 
179 179
 		try
180 180
 		{
181
-			if( ( $id = $view->param( 'id' ) ) === null ) {
182
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
181
+			if (($id = $view->param('id')) === null) {
182
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
183 183
 			}
184 184
 
185
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'service/lists/type' );
185
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'service/lists/type');
186 186
 
187
-			$view->item = $manager->getItem( $id );
187
+			$view->item = $manager->getItem($id);
188 188
 			$view->itemSubparts = $this->getSubClientNames();
189
-			$view->itemData = $this->toArray( $view->item );
189
+			$view->itemData = $this->toArray($view->item);
190 190
 			$view->itemBody = '';
191 191
 
192
-			foreach( $this->getSubClients() as $idx => $client )
192
+			foreach ($this->getSubClients() as $idx => $client)
193 193
 			{
194 194
 				$view->tabindex = ++$idx + 1;
195 195
 				$view->itemBody .= $client->get();
196 196
 			}
197 197
 		}
198
-		catch( \Aimeos\MShop\Exception $e )
198
+		catch (\Aimeos\MShop\Exception $e)
199 199
 		{
200
-			$error = array( 'type-service-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
201
-			$view->errors = $view->get( 'errors', [] ) + $error;
202
-			$this->logException( $e );
200
+			$error = array('type-service-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
201
+			$view->errors = $view->get('errors', []) + $error;
202
+			$this->logException($e);
203 203
 		}
204
-		catch( \Exception $e )
204
+		catch (\Exception $e)
205 205
 		{
206
-			$error = array( 'type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
207
-			$view->errors = $view->get( 'errors', [] ) + $error;
208
-			$this->logException( $e );
206
+			$error = array('type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
207
+			$view->errors = $view->get('errors', []) + $error;
208
+			$this->logException($e);
209 209
 		}
210 210
 
211
-		return $this->render( $view );
211
+		return $this->render($view);
212 212
 	}
213 213
 
214 214
 
@@ -222,40 +222,40 @@  discard block
 block discarded – undo
222 222
 		$view = $this->getView();
223 223
 		$context = $this->getContext();
224 224
 
225
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'service/lists/type' );
225
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'service/lists/type');
226 226
 		$manager->begin();
227 227
 
228 228
 		try
229 229
 		{
230
-			$item = $this->fromArray( $view->param( 'item', [] ) );
231
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
230
+			$item = $this->fromArray($view->param('item', []));
231
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
232 232
 			$view->itemBody = '';
233 233
 
234
-			foreach( $this->getSubClients() as $client ) {
234
+			foreach ($this->getSubClients() as $client) {
235 235
 				$view->itemBody .= $client->save();
236 236
 			}
237 237
 
238
-			$manager->saveItem( clone $view->item );
238
+			$manager->saveItem(clone $view->item);
239 239
 			$manager->commit();
240 240
 
241
-			$this->nextAction( $view, $view->param( 'next' ), 'type/service/lists', $view->item->getId(), 'save' );
241
+			$this->nextAction($view, $view->param('next'), 'type/service/lists', $view->item->getId(), 'save');
242 242
 			return;
243 243
 		}
244
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
244
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
245 245
 		{
246 246
 			// fall through to create
247 247
 		}
248
-		catch( \Aimeos\MShop\Exception $e )
248
+		catch (\Aimeos\MShop\Exception $e)
249 249
 		{
250
-			$error = array( 'type-service-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
251
-			$view->errors = $view->get( 'errors', [] ) + $error;
252
-			$this->logException( $e );
250
+			$error = array('type-service-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
251
+			$view->errors = $view->get('errors', []) + $error;
252
+			$this->logException($e);
253 253
 		}
254
-		catch( \Exception $e )
254
+		catch (\Exception $e)
255 255
 		{
256
-			$error = array( 'type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
257
-			$view->errors = $view->get( 'errors', [] ) + $error;
258
-			$this->logException( $e );
256
+			$error = array('type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
257
+			$view->errors = $view->get('errors', []) + $error;
258
+			$this->logException($e);
259 259
 		}
260 260
 
261 261
 		$manager->rollback();
@@ -277,31 +277,31 @@  discard block
 block discarded – undo
277 277
 		try
278 278
 		{
279 279
 			$total = 0;
280
-			$params = $this->storeSearchParams( $view->param(), 'type/service/lists' );
281
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'service/lists/type' );
282
-			$search = $this->initCriteria( $manager->createSearch(), $params );
280
+			$params = $this->storeSearchParams($view->param(), 'type/service/lists');
281
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'service/lists/type');
282
+			$search = $this->initCriteria($manager->createSearch(), $params);
283 283
 
284
-			$view->items = $manager->searchItems( $search, [], $total );
285
-			$view->filterAttributes = $manager->getSearchAttributes( true );
284
+			$view->items = $manager->searchItems($search, [], $total);
285
+			$view->filterAttributes = $manager->getSearchAttributes(true);
286 286
 			$view->filterOperators = $search->getOperators();
287 287
 			$view->total = $total;
288 288
 			$view->itemBody = '';
289 289
 
290
-			foreach( $this->getSubClients() as $client ) {
290
+			foreach ($this->getSubClients() as $client) {
291 291
 				$view->itemBody .= $client->search();
292 292
 			}
293 293
 		}
294
-		catch( \Aimeos\MShop\Exception $e )
294
+		catch (\Aimeos\MShop\Exception $e)
295 295
 		{
296
-			$error = array( 'type-service-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
297
-			$view->errors = $view->get( 'errors', [] ) + $error;
298
-			$this->logException( $e );
296
+			$error = array('type-service-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
297
+			$view->errors = $view->get('errors', []) + $error;
298
+			$this->logException($e);
299 299
 		}
300
-		catch( \Exception $e )
300
+		catch (\Exception $e)
301 301
 		{
302
-			$error = array( 'type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
303
-			$view->errors = $view->get( 'errors', [] ) + $error;
304
-			$this->logException( $e );
302
+			$error = array('type-service-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
303
+			$view->errors = $view->get('errors', []) + $error;
304
+			$this->logException($e);
305 305
 		}
306 306
 
307 307
 		/** admin/jqadm/type/service/lists/template-list
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 		$tplconf = 'admin/jqadm/type/service/lists/template-list';
327 327
 		$default = 'type/service/lists/list-standard';
328 328
 
329
-		return $view->render( $view->config( $tplconf, $default ) );
329
+		return $view->render($view->config($tplconf, $default));
330 330
 	}
331 331
 
332 332
 
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 	 * @param string|null $name Name of the sub-client (Default if null)
338 338
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
339 339
 	 */
340
-	public function getSubClient( $liststype, $name = null )
340
+	public function getSubClient($liststype, $name = null)
341 341
 	{
342 342
 		/** admin/jqadm/type/service/lists/decorators/excludes
343 343
 		 * Excludes decorators added by the "common" option from the list type JQAdm client
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 		 * @see admin/jqadm/type/service/lists/decorators/excludes
413 413
 		 * @see admin/jqadm/type/service/lists/decorators/global
414 414
 		 */
415
-		return $this->createSubClient( 'type/service/lists' . $liststype, $name );
415
+		return $this->createSubClient('type/service/lists' . $liststype, $name);
416 416
 	}
417 417
 
418 418
 
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
 		 * @since 2017.10
457 457
 		 * @category Developer
458 458
 		 */
459
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/type/service/lists/standard/subparts', [] );
459
+		return $this->getContext()->getConfig()->get('admin/jqadm/type/service/lists/standard/subparts', []);
460 460
 	}
461 461
 
462 462
 
@@ -467,17 +467,17 @@  discard block
 block discarded – undo
467 467
 	 * @param string[] Data array
468 468
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface New list type item object
469 469
 	 */
470
-	protected function fromArray( array $data )
470
+	protected function fromArray(array $data)
471 471
 	{
472
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service/lists/type' );
472
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service/lists/type');
473 473
 
474
-		if( isset( $data['service.lists.type.id'] ) && $data['service.lists.type.id'] != '' ) {
475
-			$item = $manager->getItem( $data['service.lists.type.id'] );
474
+		if (isset($data['service.lists.type.id']) && $data['service.lists.type.id'] != '') {
475
+			$item = $manager->getItem($data['service.lists.type.id']);
476 476
 		} else {
477 477
 			$item = $manager->createItem();
478 478
 		}
479 479
 
480
-		$item->fromArray( $data );
480
+		$item->fromArray($data);
481 481
 
482 482
 		return $item;
483 483
 	}
@@ -489,11 +489,11 @@  discard block
 block discarded – undo
489 489
 	 * @param \Aimeos\MShop\Common\Item\Type\Iface $item Type item object
490 490
 	 * @return string[] Multi-dimensional associative list of item data
491 491
 	 */
492
-	protected function toArray( \Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false )
492
+	protected function toArray(\Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false)
493 493
 	{
494
-		$data = $item->toArray( true );
494
+		$data = $item->toArray(true);
495 495
 
496
-		if( $copy === true )
496
+		if ($copy === true)
497 497
 		{
498 498
 			$data['service.lists.type.code'] = $data['service.lists.type.code'] . '_copy';
499 499
 			$data['service.lists.type.id'] = '';
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
510 510
 	 * @return string HTML output
511 511
 	 */
512
-	protected function render( \Aimeos\MW\View\Iface $view )
512
+	protected function render(\Aimeos\MW\View\Iface $view)
513 513
 	{
514 514
 		/** admin/jqadm/type/service/lists/template-item
515 515
 		 * Relative path to the HTML body template for the list type item.
@@ -533,6 +533,6 @@  discard block
 block discarded – undo
533 533
 		$tplconf = 'admin/jqadm/type/service/lists/template-item';
534 534
 		$default = 'type/service/lists/item-standard';
535 535
 
536
-		return $view->render( $view->config( $tplconf, $default ) );
536
+		return $view->render($view->config($tplconf, $default));
537 537
 	}
538 538
 }
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Type/Service/Standard.php 2 patches
Braces   +13 added lines, -26 removed lines patch added patch discarded remove patch
@@ -88,14 +88,12 @@  discard block
 block discarded – undo
88 88
 				$view->tabindex = ++$idx + 1;
89 89
 				$view->itemBody .= $client->copy();
90 90
 			}
91
-		}
92
-		catch( \Aimeos\MShop\Exception $e )
91
+		} catch( \Aimeos\MShop\Exception $e )
93 92
 		{
94 93
 			$error = array( 'type-service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
95 94
 			$view->errors = $view->get( 'errors', [] ) + $error;
96 95
 			$this->logException( $e );
97
-		}
98
-		catch( \Exception $e )
96
+		} catch( \Exception $e )
99 97
 		{
100 98
 			$error = array( 'type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
101 99
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -137,14 +135,12 @@  discard block
 block discarded – undo
137 135
 				$view->tabindex = ++$idx + 1;
138 136
 				$view->itemBody .= $client->create();
139 137
 			}
140
-		}
141
-		catch( \Aimeos\MShop\Exception $e )
138
+		} catch( \Aimeos\MShop\Exception $e )
142 139
 		{
143 140
 			$error = array( 'type-service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
144 141
 			$view->errors = $view->get( 'errors', [] ) + $error;
145 142
 			$this->logException( $e );
146
-		}
147
-		catch( \Exception $e )
143
+		} catch( \Exception $e )
148 144
 		{
149 145
 			$error = array( 'type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
150 146
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -185,14 +181,12 @@  discard block
 block discarded – undo
185 181
 
186 182
 			$this->nextAction( $view, 'search', 'type/service', null, 'delete' );
187 183
 			return;
188
-		}
189
-		catch( \Aimeos\MShop\Exception $e )
184
+		} catch( \Aimeos\MShop\Exception $e )
190 185
 		{
191 186
 			$error = array( 'type-service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
192 187
 			$view->errors = $view->get( 'errors', [] ) + $error;
193 188
 			$this->logException( $e );
194
-		}
195
-		catch( \Exception $e )
189
+		} catch( \Exception $e )
196 190
 		{
197 191
 			$error = array( 'type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
198 192
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -233,14 +227,12 @@  discard block
 block discarded – undo
233 227
 				$view->tabindex = ++$idx + 1;
234 228
 				$view->itemBody .= $client->get();
235 229
 			}
236
-		}
237
-		catch( \Aimeos\MShop\Exception $e )
230
+		} catch( \Aimeos\MShop\Exception $e )
238 231
 		{
239 232
 			$error = array( 'type-service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
240 233
 			$view->errors = $view->get( 'errors', [] ) + $error;
241 234
 			$this->logException( $e );
242
-		}
243
-		catch( \Exception $e )
235
+		} catch( \Exception $e )
244 236
 		{
245 237
 			$error = array( 'type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
246 238
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -277,18 +269,15 @@  discard block
 block discarded – undo
277 269
 
278 270
 			$this->nextAction( $view, $view->param( 'next' ), 'type/service', $view->item->getId(), 'save' );
279 271
 			return;
280
-		}
281
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
272
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
282 273
 		{
283 274
 			// fall through to create
284
-		}
285
-		catch( \Aimeos\MShop\Exception $e )
275
+		} catch( \Aimeos\MShop\Exception $e )
286 276
 		{
287 277
 			$error = array( 'type-service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
288 278
 			$view->errors = $view->get( 'errors', [] ) + $error;
289 279
 			$this->logException( $e );
290
-		}
291
-		catch( \Exception $e )
280
+		} catch( \Exception $e )
292 281
 		{
293 282
 			$error = array( 'type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
294 283
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -327,14 +316,12 @@  discard block
 block discarded – undo
327 316
 			foreach( $this->getSubClients() as $client ) {
328 317
 				$view->itemBody .= $client->search();
329 318
 			}
330
-		}
331
-		catch( \Aimeos\MShop\Exception $e )
319
+		} catch( \Aimeos\MShop\Exception $e )
332 320
 		{
333 321
 			$error = array( 'type-service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
334 322
 			$view->errors = $view->get( 'errors', [] ) + $error;
335 323
 			$this->logException( $e );
336
-		}
337
-		catch( \Exception $e )
324
+		} catch( \Exception $e )
338 325
 		{
339 326
 			$error = array( 'type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
340 327
 			$view->errors = $view->get( 'errors', [] ) + $error;
Please login to merge, or discard this patch.
Spacing   +102 added lines, -102 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 namespace Aimeos\Admin\JQAdm\Type\Service;
12 12
 
13
-sprintf( 'type/service' ); // for translation
13
+sprintf('type/service'); // for translation
14 14
 
15 15
 
16 16
 /**
@@ -38,37 +38,37 @@  discard block
 block discarded – undo
38 38
 
39 39
 		try
40 40
 		{
41
-			if( ( $id = $view->param( 'id' ) ) === null ) {
42
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
41
+			if (($id = $view->param('id')) === null) {
42
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
43 43
 			}
44 44
 
45
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'service/type' );
46
-			$view->item = $manager->getItem( $id );
45
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'service/type');
46
+			$view->item = $manager->getItem($id);
47 47
 
48
-			$view->itemData = $this->toArray( $view->item, true );
48
+			$view->itemData = $this->toArray($view->item, true);
49 49
 			$view->itemSubparts = $this->getSubClientNames();
50 50
 			$view->itemBody = '';
51 51
 
52
-			foreach( $this->getSubClients() as $idx => $client )
52
+			foreach ($this->getSubClients() as $idx => $client)
53 53
 			{
54 54
 				$view->tabindex = ++$idx + 1;
55 55
 				$view->itemBody .= $client->copy();
56 56
 			}
57 57
 		}
58
-		catch( \Aimeos\MShop\Exception $e )
58
+		catch (\Aimeos\MShop\Exception $e)
59 59
 		{
60
-			$error = array( 'type-service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
61
-			$view->errors = $view->get( 'errors', [] ) + $error;
62
-			$this->logException( $e );
60
+			$error = array('type-service-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
61
+			$view->errors = $view->get('errors', []) + $error;
62
+			$this->logException($e);
63 63
 		}
64
-		catch( \Exception $e )
64
+		catch (\Exception $e)
65 65
 		{
66
-			$error = array( 'type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
67
-			$view->errors = $view->get( 'errors', [] ) + $error;
68
-			$this->logException( $e );
66
+			$error = array('type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
67
+			$view->errors = $view->get('errors', []) + $error;
68
+			$this->logException($e);
69 69
 		}
70 70
 
71
-		return $this->render( $view );
71
+		return $this->render($view);
72 72
 	}
73 73
 
74 74
 
@@ -84,10 +84,10 @@  discard block
 block discarded – undo
84 84
 
85 85
 		try
86 86
 		{
87
-			$data = $view->param( 'item', [] );
87
+			$data = $view->param('item', []);
88 88
 
89
-			if( !isset( $view->item ) ) {
90
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'service/type' )->createItem();
89
+			if (!isset($view->item)) {
90
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'service/type')->createItem();
91 91
 			}
92 92
 
93 93
 			$data['service.type.siteid'] = $view->item->getSiteId();
@@ -96,26 +96,26 @@  discard block
 block discarded – undo
96 96
 			$view->itemData = $data;
97 97
 			$view->itemBody = '';
98 98
 
99
-			foreach( $this->getSubClients() as $idx => $client )
99
+			foreach ($this->getSubClients() as $idx => $client)
100 100
 			{
101 101
 				$view->tabindex = ++$idx + 1;
102 102
 				$view->itemBody .= $client->create();
103 103
 			}
104 104
 		}
105
-		catch( \Aimeos\MShop\Exception $e )
105
+		catch (\Aimeos\MShop\Exception $e)
106 106
 		{
107
-			$error = array( 'type-service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
108
-			$view->errors = $view->get( 'errors', [] ) + $error;
109
-			$this->logException( $e );
107
+			$error = array('type-service-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
108
+			$view->errors = $view->get('errors', []) + $error;
109
+			$this->logException($e);
110 110
 		}
111
-		catch( \Exception $e )
111
+		catch (\Exception $e)
112 112
 		{
113
-			$error = array( 'type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
114
-			$view->errors = $view->get( 'errors', [] ) + $error;
115
-			$this->logException( $e );
113
+			$error = array('type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
114
+			$view->errors = $view->get('errors', []) + $error;
115
+			$this->logException($e);
116 116
 		}
117 117
 
118
-		return $this->render( $view );
118
+		return $this->render($view);
119 119
 	}
120 120
 
121 121
 
@@ -129,38 +129,38 @@  discard block
 block discarded – undo
129 129
 		$view = $this->getView();
130 130
 		$context = $this->getContext();
131 131
 
132
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'service/type' );
132
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'service/type');
133 133
 		$manager->begin();
134 134
 
135 135
 		try
136 136
 		{
137
-			if( ( $id = $view->param( 'id' ) ) === null ) {
138
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
137
+			if (($id = $view->param('id')) === null) {
138
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
139 139
 			}
140 140
 
141
-			$view->item = $manager->getItem( $id );
141
+			$view->item = $manager->getItem($id);
142 142
 
143
-			foreach( $this->getSubClients() as $client ) {
143
+			foreach ($this->getSubClients() as $client) {
144 144
 				$client->delete();
145 145
 			}
146 146
 
147
-			$manager->deleteItem( $id );
147
+			$manager->deleteItem($id);
148 148
 			$manager->commit();
149 149
 
150
-			$this->nextAction( $view, 'search', 'type/service', null, 'delete' );
150
+			$this->nextAction($view, 'search', 'type/service', null, 'delete');
151 151
 			return;
152 152
 		}
153
-		catch( \Aimeos\MShop\Exception $e )
153
+		catch (\Aimeos\MShop\Exception $e)
154 154
 		{
155
-			$error = array( 'type-service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
156
-			$view->errors = $view->get( 'errors', [] ) + $error;
157
-			$this->logException( $e );
155
+			$error = array('type-service-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
156
+			$view->errors = $view->get('errors', []) + $error;
157
+			$this->logException($e);
158 158
 		}
159
-		catch( \Exception $e )
159
+		catch (\Exception $e)
160 160
 		{
161
-			$error = array( 'type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
162
-			$view->errors = $view->get( 'errors', [] ) + $error;
163
-			$this->logException( $e );
161
+			$error = array('type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
162
+			$view->errors = $view->get('errors', []) + $error;
163
+			$this->logException($e);
164 164
 		}
165 165
 
166 166
 		$manager->rollback();
@@ -181,37 +181,37 @@  discard block
 block discarded – undo
181 181
 
182 182
 		try
183 183
 		{
184
-			if( ( $id = $view->param( 'id' ) ) === null ) {
185
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
184
+			if (($id = $view->param('id')) === null) {
185
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
186 186
 			}
187 187
 
188
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'service/type' );
188
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'service/type');
189 189
 
190
-			$view->item = $manager->getItem( $id );
190
+			$view->item = $manager->getItem($id);
191 191
 			$view->itemSubparts = $this->getSubClientNames();
192
-			$view->itemData = $this->toArray( $view->item );
192
+			$view->itemData = $this->toArray($view->item);
193 193
 			$view->itemBody = '';
194 194
 
195
-			foreach( $this->getSubClients() as $idx => $client )
195
+			foreach ($this->getSubClients() as $idx => $client)
196 196
 			{
197 197
 				$view->tabindex = ++$idx + 1;
198 198
 				$view->itemBody .= $client->get();
199 199
 			}
200 200
 		}
201
-		catch( \Aimeos\MShop\Exception $e )
201
+		catch (\Aimeos\MShop\Exception $e)
202 202
 		{
203
-			$error = array( 'type-service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
204
-			$view->errors = $view->get( 'errors', [] ) + $error;
205
-			$this->logException( $e );
203
+			$error = array('type-service-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
204
+			$view->errors = $view->get('errors', []) + $error;
205
+			$this->logException($e);
206 206
 		}
207
-		catch( \Exception $e )
207
+		catch (\Exception $e)
208 208
 		{
209
-			$error = array( 'type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
210
-			$view->errors = $view->get( 'errors', [] ) + $error;
211
-			$this->logException( $e );
209
+			$error = array('type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
210
+			$view->errors = $view->get('errors', []) + $error;
211
+			$this->logException($e);
212 212
 		}
213 213
 
214
-		return $this->render( $view );
214
+		return $this->render($view);
215 215
 	}
216 216
 
217 217
 
@@ -225,40 +225,40 @@  discard block
 block discarded – undo
225 225
 		$view = $this->getView();
226 226
 		$context = $this->getContext();
227 227
 
228
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'service/type' );
228
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'service/type');
229 229
 		$manager->begin();
230 230
 
231 231
 		try
232 232
 		{
233
-			$item = $this->fromArray( $view->param( 'item', [] ) );
234
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
233
+			$item = $this->fromArray($view->param('item', []));
234
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
235 235
 			$view->itemBody = '';
236 236
 
237
-			foreach( $this->getSubClients() as $client ) {
237
+			foreach ($this->getSubClients() as $client) {
238 238
 				$view->itemBody .= $client->save();
239 239
 			}
240 240
 
241
-			$manager->saveItem( clone $view->item );
241
+			$manager->saveItem(clone $view->item);
242 242
 			$manager->commit();
243 243
 
244
-			$this->nextAction( $view, $view->param( 'next' ), 'type/service', $view->item->getId(), 'save' );
244
+			$this->nextAction($view, $view->param('next'), 'type/service', $view->item->getId(), 'save');
245 245
 			return;
246 246
 		}
247
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
247
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
248 248
 		{
249 249
 			// fall through to create
250 250
 		}
251
-		catch( \Aimeos\MShop\Exception $e )
251
+		catch (\Aimeos\MShop\Exception $e)
252 252
 		{
253
-			$error = array( 'type-service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
254
-			$view->errors = $view->get( 'errors', [] ) + $error;
255
-			$this->logException( $e );
253
+			$error = array('type-service-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
254
+			$view->errors = $view->get('errors', []) + $error;
255
+			$this->logException($e);
256 256
 		}
257
-		catch( \Exception $e )
257
+		catch (\Exception $e)
258 258
 		{
259
-			$error = array( 'type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
260
-			$view->errors = $view->get( 'errors', [] ) + $error;
261
-			$this->logException( $e );
259
+			$error = array('type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
260
+			$view->errors = $view->get('errors', []) + $error;
261
+			$this->logException($e);
262 262
 		}
263 263
 
264 264
 		$manager->rollback();
@@ -280,31 +280,31 @@  discard block
 block discarded – undo
280 280
 		try
281 281
 		{
282 282
 			$total = 0;
283
-			$params = $this->storeSearchParams( $view->param(), 'type/service' );
284
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'service/type' );
285
-			$search = $this->initCriteria( $manager->createSearch(), $params );
283
+			$params = $this->storeSearchParams($view->param(), 'type/service');
284
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'service/type');
285
+			$search = $this->initCriteria($manager->createSearch(), $params);
286 286
 
287
-			$view->items = $manager->searchItems( $search, [], $total );
288
-			$view->filterAttributes = $manager->getSearchAttributes( true );
287
+			$view->items = $manager->searchItems($search, [], $total);
288
+			$view->filterAttributes = $manager->getSearchAttributes(true);
289 289
 			$view->filterOperators = $search->getOperators();
290 290
 			$view->total = $total;
291 291
 			$view->itemBody = '';
292 292
 
293
-			foreach( $this->getSubClients() as $client ) {
293
+			foreach ($this->getSubClients() as $client) {
294 294
 				$view->itemBody .= $client->search();
295 295
 			}
296 296
 		}
297
-		catch( \Aimeos\MShop\Exception $e )
297
+		catch (\Aimeos\MShop\Exception $e)
298 298
 		{
299
-			$error = array( 'type-service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
300
-			$view->errors = $view->get( 'errors', [] ) + $error;
301
-			$this->logException( $e );
299
+			$error = array('type-service-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
300
+			$view->errors = $view->get('errors', []) + $error;
301
+			$this->logException($e);
302 302
 		}
303
-		catch( \Exception $e )
303
+		catch (\Exception $e)
304 304
 		{
305
-			$error = array( 'type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
306
-			$view->errors = $view->get( 'errors', [] ) + $error;
307
-			$this->logException( $e );
305
+			$error = array('type-service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
306
+			$view->errors = $view->get('errors', []) + $error;
307
+			$this->logException($e);
308 308
 		}
309 309
 
310 310
 		/** admin/jqadm/type/service/template-list
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
 		$tplconf = 'admin/jqadm/type/service/template-list';
330 330
 		$default = 'type/service/list-standard';
331 331
 
332
-		return $view->render( $view->config( $tplconf, $default ) );
332
+		return $view->render($view->config($tplconf, $default));
333 333
 	}
334 334
 
335 335
 
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
 	 * @param string|null $name Name of the sub-client (Default if null)
341 341
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
342 342
 	 */
343
-	public function getSubClient( $type, $name = null )
343
+	public function getSubClient($type, $name = null)
344 344
 	{
345 345
 		/** admin/jqadm/type/service/decorators/excludes
346 346
 		 * Excludes decorators added by the "common" option from the type JQAdm client
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
 		 * @see admin/jqadm/type/service/decorators/excludes
416 416
 		 * @see admin/jqadm/type/service/decorators/global
417 417
 		 */
418
-		return $this->createSubClient( 'type/service' . $type, $name );
418
+		return $this->createSubClient('type/service' . $type, $name);
419 419
 	}
420 420
 
421 421
 
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
 		 * @since 2017.10
460 460
 		 * @category Developer
461 461
 		 */
462
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/type/service/standard/subparts', [] );
462
+		return $this->getContext()->getConfig()->get('admin/jqadm/type/service/standard/subparts', []);
463 463
 	}
464 464
 
465 465
 
@@ -470,17 +470,17 @@  discard block
 block discarded – undo
470 470
 	 * @param string[] Data array
471 471
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface New type item object
472 472
 	 */
473
-	protected function fromArray( array $data )
473
+	protected function fromArray(array $data)
474 474
 	{
475
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service/type' );
475
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service/type');
476 476
 
477
-		if( isset( $data['service.type.id'] ) && $data['service.type.id'] != '' ) {
478
-			$item = $manager->getItem( $data['service.type.id'] );
477
+		if (isset($data['service.type.id']) && $data['service.type.id'] != '') {
478
+			$item = $manager->getItem($data['service.type.id']);
479 479
 		} else {
480 480
 			$item = $manager->createItem();
481 481
 		}
482 482
 
483
-		$item->fromArray( $data );
483
+		$item->fromArray($data);
484 484
 
485 485
 		return $item;
486 486
 	}
@@ -492,11 +492,11 @@  discard block
 block discarded – undo
492 492
 	 * @param \Aimeos\MShop\Common\Item\Type\Iface $item Type item object
493 493
 	 * @return string[] Multi-dimensional associative list of item data
494 494
 	 */
495
-	protected function toArray( \Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false )
495
+	protected function toArray(\Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false)
496 496
 	{
497
-		$data = $item->toArray( true );
497
+		$data = $item->toArray(true);
498 498
 
499
-		if( $copy === true )
499
+		if ($copy === true)
500 500
 		{
501 501
 			$data['service.type.code'] = $data['service.type.code'] . '_copy';
502 502
 			$data['service.type.id'] = '';
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
512 512
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
513 513
 	 * @return string HTML output
514 514
 	 */
515
-	protected function render( \Aimeos\MW\View\Iface $view )
515
+	protected function render(\Aimeos\MW\View\Iface $view)
516 516
 	{
517 517
 		/** admin/jqadm/type/service/template-item
518 518
 		 * Relative path to the HTML body template for the type item.
@@ -536,6 +536,6 @@  discard block
 block discarded – undo
536 536
 		$tplconf = 'admin/jqadm/type/service/template-item';
537 537
 		$default = 'type/service/item-standard';
538 538
 
539
-		return $view->render( $view->config( $tplconf, $default ) );
539
+		return $view->render($view->config($tplconf, $default));
540 540
 	}
541 541
 }
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Type/Media/Lists/Standard.php 2 patches
Braces   +13 added lines, -26 removed lines patch added patch discarded remove patch
@@ -88,14 +88,12 @@  discard block
 block discarded – undo
88 88
 				$view->tabindex = ++$idx + 1;
89 89
 				$view->itemBody .= $client->copy();
90 90
 			}
91
-		}
92
-		catch( \Aimeos\MShop\Exception $e )
91
+		} catch( \Aimeos\MShop\Exception $e )
93 92
 		{
94 93
 			$error = array( 'type-media-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
95 94
 			$view->errors = $view->get( 'errors', [] ) + $error;
96 95
 			$this->logException( $e );
97
-		}
98
-		catch( \Exception $e )
96
+		} catch( \Exception $e )
99 97
 		{
100 98
 			$error = array( 'type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
101 99
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -137,14 +135,12 @@  discard block
 block discarded – undo
137 135
 				$view->tabindex = ++$idx + 1;
138 136
 				$view->itemBody .= $client->create();
139 137
 			}
140
-		}
141
-		catch( \Aimeos\MShop\Exception $e )
138
+		} catch( \Aimeos\MShop\Exception $e )
142 139
 		{
143 140
 			$error = array( 'type-media-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
144 141
 			$view->errors = $view->get( 'errors', [] ) + $error;
145 142
 			$this->logException( $e );
146
-		}
147
-		catch( \Exception $e )
143
+		} catch( \Exception $e )
148 144
 		{
149 145
 			$error = array( 'type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
150 146
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -185,14 +181,12 @@  discard block
 block discarded – undo
185 181
 
186 182
 			$this->nextAction( $view, 'search', 'type/media/lists', null, 'delete' );
187 183
 			return;
188
-		}
189
-		catch( \Aimeos\MShop\Exception $e )
184
+		} catch( \Aimeos\MShop\Exception $e )
190 185
 		{
191 186
 			$error = array( 'type-media-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
192 187
 			$view->errors = $view->get( 'errors', [] ) + $error;
193 188
 			$this->logException( $e );
194
-		}
195
-		catch( \Exception $e )
189
+		} catch( \Exception $e )
196 190
 		{
197 191
 			$error = array( 'type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
198 192
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -233,14 +227,12 @@  discard block
 block discarded – undo
233 227
 				$view->tabindex = ++$idx + 1;
234 228
 				$view->itemBody .= $client->get();
235 229
 			}
236
-		}
237
-		catch( \Aimeos\MShop\Exception $e )
230
+		} catch( \Aimeos\MShop\Exception $e )
238 231
 		{
239 232
 			$error = array( 'type-media-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
240 233
 			$view->errors = $view->get( 'errors', [] ) + $error;
241 234
 			$this->logException( $e );
242
-		}
243
-		catch( \Exception $e )
235
+		} catch( \Exception $e )
244 236
 		{
245 237
 			$error = array( 'type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
246 238
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -277,18 +269,15 @@  discard block
 block discarded – undo
277 269
 
278 270
 			$this->nextAction( $view, $view->param( 'next' ), 'type/media/lists', $view->item->getId(), 'save' );
279 271
 			return;
280
-		}
281
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
272
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
282 273
 		{
283 274
 			// fall through to create
284
-		}
285
-		catch( \Aimeos\MShop\Exception $e )
275
+		} catch( \Aimeos\MShop\Exception $e )
286 276
 		{
287 277
 			$error = array( 'type-media-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
288 278
 			$view->errors = $view->get( 'errors', [] ) + $error;
289 279
 			$this->logException( $e );
290
-		}
291
-		catch( \Exception $e )
280
+		} catch( \Exception $e )
292 281
 		{
293 282
 			$error = array( 'type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
294 283
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -327,14 +316,12 @@  discard block
 block discarded – undo
327 316
 			foreach( $this->getSubClients() as $client ) {
328 317
 				$view->itemBody .= $client->search();
329 318
 			}
330
-		}
331
-		catch( \Aimeos\MShop\Exception $e )
319
+		} catch( \Aimeos\MShop\Exception $e )
332 320
 		{
333 321
 			$error = array( 'type-media-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
334 322
 			$view->errors = $view->get( 'errors', [] ) + $error;
335 323
 			$this->logException( $e );
336
-		}
337
-		catch( \Exception $e )
324
+		} catch( \Exception $e )
338 325
 		{
339 326
 			$error = array( 'type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
340 327
 			$view->errors = $view->get( 'errors', [] ) + $error;
Please login to merge, or discard this patch.
Spacing   +102 added lines, -102 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 namespace Aimeos\Admin\JQAdm\Type\Media\Lists;
12 12
 
13
-sprintf( 'type/media/lists' ); // for translation
13
+sprintf('type/media/lists'); // for translation
14 14
 
15 15
 
16 16
 /**
@@ -35,37 +35,37 @@  discard block
 block discarded – undo
35 35
 
36 36
 		try
37 37
 		{
38
-			if( ( $id = $view->param( 'id' ) ) === null ) {
39
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
38
+			if (($id = $view->param('id')) === null) {
39
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
40 40
 			}
41 41
 
42
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'media/lists/type' );
43
-			$view->item = $manager->getItem( $id );
42
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'media/lists/type');
43
+			$view->item = $manager->getItem($id);
44 44
 
45
-			$view->itemData = $this->toArray( $view->item, true );
45
+			$view->itemData = $this->toArray($view->item, true);
46 46
 			$view->itemSubparts = $this->getSubClientNames();
47 47
 			$view->itemBody = '';
48 48
 
49
-			foreach( $this->getSubClients() as $idx => $client )
49
+			foreach ($this->getSubClients() as $idx => $client)
50 50
 			{
51 51
 				$view->tabindex = ++$idx + 1;
52 52
 				$view->itemBody .= $client->copy();
53 53
 			}
54 54
 		}
55
-		catch( \Aimeos\MShop\Exception $e )
55
+		catch (\Aimeos\MShop\Exception $e)
56 56
 		{
57
-			$error = array( 'type-media-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
58
-			$view->errors = $view->get( 'errors', [] ) + $error;
59
-			$this->logException( $e );
57
+			$error = array('type-media-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
58
+			$view->errors = $view->get('errors', []) + $error;
59
+			$this->logException($e);
60 60
 		}
61
-		catch( \Exception $e )
61
+		catch (\Exception $e)
62 62
 		{
63
-			$error = array( 'type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
64
-			$view->errors = $view->get( 'errors', [] ) + $error;
65
-			$this->logException( $e );
63
+			$error = array('type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
64
+			$view->errors = $view->get('errors', []) + $error;
65
+			$this->logException($e);
66 66
 		}
67 67
 
68
-		return $this->render( $view );
68
+		return $this->render($view);
69 69
 	}
70 70
 
71 71
 
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
 
82 82
 		try
83 83
 		{
84
-			$data = $view->param( 'item', [] );
84
+			$data = $view->param('item', []);
85 85
 
86
-			if( !isset( $view->item ) ) {
87
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'media/lists/type' )->createItem();
86
+			if (!isset($view->item)) {
87
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'media/lists/type')->createItem();
88 88
 			}
89 89
 
90 90
 			$data['media.lists.type.siteid'] = $view->item->getSiteId();
@@ -93,26 +93,26 @@  discard block
 block discarded – undo
93 93
 			$view->itemData = $data;
94 94
 			$view->itemBody = '';
95 95
 
96
-			foreach( $this->getSubClients() as $idx => $client )
96
+			foreach ($this->getSubClients() as $idx => $client)
97 97
 			{
98 98
 				$view->tabindex = ++$idx + 1;
99 99
 				$view->itemBody .= $client->create();
100 100
 			}
101 101
 		}
102
-		catch( \Aimeos\MShop\Exception $e )
102
+		catch (\Aimeos\MShop\Exception $e)
103 103
 		{
104
-			$error = array( 'type-media-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
105
-			$view->errors = $view->get( 'errors', [] ) + $error;
106
-			$this->logException( $e );
104
+			$error = array('type-media-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
105
+			$view->errors = $view->get('errors', []) + $error;
106
+			$this->logException($e);
107 107
 		}
108
-		catch( \Exception $e )
108
+		catch (\Exception $e)
109 109
 		{
110
-			$error = array( 'type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
111
-			$view->errors = $view->get( 'errors', [] ) + $error;
112
-			$this->logException( $e );
110
+			$error = array('type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
111
+			$view->errors = $view->get('errors', []) + $error;
112
+			$this->logException($e);
113 113
 		}
114 114
 
115
-		return $this->render( $view );
115
+		return $this->render($view);
116 116
 	}
117 117
 
118 118
 
@@ -126,38 +126,38 @@  discard block
 block discarded – undo
126 126
 		$view = $this->getView();
127 127
 		$context = $this->getContext();
128 128
 
129
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'media/lists/type' );
129
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'media/lists/type');
130 130
 		$manager->begin();
131 131
 
132 132
 		try
133 133
 		{
134
-			if( ( $id = $view->param( 'id' ) ) === null ) {
135
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
134
+			if (($id = $view->param('id')) === null) {
135
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
136 136
 			}
137 137
 
138
-			$view->item = $manager->getItem( $id );
138
+			$view->item = $manager->getItem($id);
139 139
 
140
-			foreach( $this->getSubClients() as $client ) {
140
+			foreach ($this->getSubClients() as $client) {
141 141
 				$client->delete();
142 142
 			}
143 143
 
144
-			$manager->deleteItem( $id );
144
+			$manager->deleteItem($id);
145 145
 			$manager->commit();
146 146
 
147
-			$this->nextAction( $view, 'search', 'type/media/lists', null, 'delete' );
147
+			$this->nextAction($view, 'search', 'type/media/lists', null, 'delete');
148 148
 			return;
149 149
 		}
150
-		catch( \Aimeos\MShop\Exception $e )
150
+		catch (\Aimeos\MShop\Exception $e)
151 151
 		{
152
-			$error = array( 'type-media-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
153
-			$view->errors = $view->get( 'errors', [] ) + $error;
154
-			$this->logException( $e );
152
+			$error = array('type-media-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
153
+			$view->errors = $view->get('errors', []) + $error;
154
+			$this->logException($e);
155 155
 		}
156
-		catch( \Exception $e )
156
+		catch (\Exception $e)
157 157
 		{
158
-			$error = array( 'type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
159
-			$view->errors = $view->get( 'errors', [] ) + $error;
160
-			$this->logException( $e );
158
+			$error = array('type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
159
+			$view->errors = $view->get('errors', []) + $error;
160
+			$this->logException($e);
161 161
 		}
162 162
 
163 163
 		$manager->rollback();
@@ -178,37 +178,37 @@  discard block
 block discarded – undo
178 178
 
179 179
 		try
180 180
 		{
181
-			if( ( $id = $view->param( 'id' ) ) === null ) {
182
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
181
+			if (($id = $view->param('id')) === null) {
182
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
183 183
 			}
184 184
 
185
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'media/lists/type' );
185
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'media/lists/type');
186 186
 
187
-			$view->item = $manager->getItem( $id );
187
+			$view->item = $manager->getItem($id);
188 188
 			$view->itemSubparts = $this->getSubClientNames();
189
-			$view->itemData = $this->toArray( $view->item );
189
+			$view->itemData = $this->toArray($view->item);
190 190
 			$view->itemBody = '';
191 191
 
192
-			foreach( $this->getSubClients() as $idx => $client )
192
+			foreach ($this->getSubClients() as $idx => $client)
193 193
 			{
194 194
 				$view->tabindex = ++$idx + 1;
195 195
 				$view->itemBody .= $client->get();
196 196
 			}
197 197
 		}
198
-		catch( \Aimeos\MShop\Exception $e )
198
+		catch (\Aimeos\MShop\Exception $e)
199 199
 		{
200
-			$error = array( 'type-media-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
201
-			$view->errors = $view->get( 'errors', [] ) + $error;
202
-			$this->logException( $e );
200
+			$error = array('type-media-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
201
+			$view->errors = $view->get('errors', []) + $error;
202
+			$this->logException($e);
203 203
 		}
204
-		catch( \Exception $e )
204
+		catch (\Exception $e)
205 205
 		{
206
-			$error = array( 'type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
207
-			$view->errors = $view->get( 'errors', [] ) + $error;
208
-			$this->logException( $e );
206
+			$error = array('type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
207
+			$view->errors = $view->get('errors', []) + $error;
208
+			$this->logException($e);
209 209
 		}
210 210
 
211
-		return $this->render( $view );
211
+		return $this->render($view);
212 212
 	}
213 213
 
214 214
 
@@ -222,40 +222,40 @@  discard block
 block discarded – undo
222 222
 		$view = $this->getView();
223 223
 		$context = $this->getContext();
224 224
 
225
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'media/lists/type' );
225
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'media/lists/type');
226 226
 		$manager->begin();
227 227
 
228 228
 		try
229 229
 		{
230
-			$item = $this->fromArray( $view->param( 'item', [] ) );
231
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
230
+			$item = $this->fromArray($view->param('item', []));
231
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
232 232
 			$view->itemBody = '';
233 233
 
234
-			foreach( $this->getSubClients() as $client ) {
234
+			foreach ($this->getSubClients() as $client) {
235 235
 				$view->itemBody .= $client->save();
236 236
 			}
237 237
 
238
-			$manager->saveItem( clone $view->item );
238
+			$manager->saveItem(clone $view->item);
239 239
 			$manager->commit();
240 240
 
241
-			$this->nextAction( $view, $view->param( 'next' ), 'type/media/lists', $view->item->getId(), 'save' );
241
+			$this->nextAction($view, $view->param('next'), 'type/media/lists', $view->item->getId(), 'save');
242 242
 			return;
243 243
 		}
244
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
244
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
245 245
 		{
246 246
 			// fall through to create
247 247
 		}
248
-		catch( \Aimeos\MShop\Exception $e )
248
+		catch (\Aimeos\MShop\Exception $e)
249 249
 		{
250
-			$error = array( 'type-media-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
251
-			$view->errors = $view->get( 'errors', [] ) + $error;
252
-			$this->logException( $e );
250
+			$error = array('type-media-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
251
+			$view->errors = $view->get('errors', []) + $error;
252
+			$this->logException($e);
253 253
 		}
254
-		catch( \Exception $e )
254
+		catch (\Exception $e)
255 255
 		{
256
-			$error = array( 'type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
257
-			$view->errors = $view->get( 'errors', [] ) + $error;
258
-			$this->logException( $e );
256
+			$error = array('type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
257
+			$view->errors = $view->get('errors', []) + $error;
258
+			$this->logException($e);
259 259
 		}
260 260
 
261 261
 		$manager->rollback();
@@ -277,31 +277,31 @@  discard block
 block discarded – undo
277 277
 		try
278 278
 		{
279 279
 			$total = 0;
280
-			$params = $this->storeSearchParams( $view->param(), 'type/media/lists' );
281
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'media/lists/type' );
282
-			$search = $this->initCriteria( $manager->createSearch(), $params );
280
+			$params = $this->storeSearchParams($view->param(), 'type/media/lists');
281
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'media/lists/type');
282
+			$search = $this->initCriteria($manager->createSearch(), $params);
283 283
 
284
-			$view->items = $manager->searchItems( $search, [], $total );
285
-			$view->filterAttributes = $manager->getSearchAttributes( true );
284
+			$view->items = $manager->searchItems($search, [], $total);
285
+			$view->filterAttributes = $manager->getSearchAttributes(true);
286 286
 			$view->filterOperators = $search->getOperators();
287 287
 			$view->total = $total;
288 288
 			$view->itemBody = '';
289 289
 
290
-			foreach( $this->getSubClients() as $client ) {
290
+			foreach ($this->getSubClients() as $client) {
291 291
 				$view->itemBody .= $client->search();
292 292
 			}
293 293
 		}
294
-		catch( \Aimeos\MShop\Exception $e )
294
+		catch (\Aimeos\MShop\Exception $e)
295 295
 		{
296
-			$error = array( 'type-media-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
297
-			$view->errors = $view->get( 'errors', [] ) + $error;
298
-			$this->logException( $e );
296
+			$error = array('type-media-lists-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
297
+			$view->errors = $view->get('errors', []) + $error;
298
+			$this->logException($e);
299 299
 		}
300
-		catch( \Exception $e )
300
+		catch (\Exception $e)
301 301
 		{
302
-			$error = array( 'type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
303
-			$view->errors = $view->get( 'errors', [] ) + $error;
304
-			$this->logException( $e );
302
+			$error = array('type-media-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
303
+			$view->errors = $view->get('errors', []) + $error;
304
+			$this->logException($e);
305 305
 		}
306 306
 
307 307
 		/** admin/jqadm/type/media/lists/template-list
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 		$tplconf = 'admin/jqadm/type/media/lists/template-list';
327 327
 		$default = 'type/media/lists/list-standard';
328 328
 
329
-		return $view->render( $view->config( $tplconf, $default ) );
329
+		return $view->render($view->config($tplconf, $default));
330 330
 	}
331 331
 
332 332
 
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 	 * @param string|null $name Name of the sub-client (Default if null)
338 338
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
339 339
 	 */
340
-	public function getSubClient( $liststype, $name = null )
340
+	public function getSubClient($liststype, $name = null)
341 341
 	{
342 342
 		/** admin/jqadm/type/media/lists/decorators/excludes
343 343
 		 * Excludes decorators added by the "common" option from the list type JQAdm client
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 		 * @see admin/jqadm/type/media/lists/decorators/excludes
413 413
 		 * @see admin/jqadm/type/media/lists/decorators/global
414 414
 		 */
415
-		return $this->createSubClient( 'type/media/lists' . $liststype, $name );
415
+		return $this->createSubClient('type/media/lists' . $liststype, $name);
416 416
 	}
417 417
 
418 418
 
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
 		 * @since 2017.10
457 457
 		 * @category Developer
458 458
 		 */
459
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/type/media/lists/standard/subparts', [] );
459
+		return $this->getContext()->getConfig()->get('admin/jqadm/type/media/lists/standard/subparts', []);
460 460
 	}
461 461
 
462 462
 
@@ -467,17 +467,17 @@  discard block
 block discarded – undo
467 467
 	 * @param string[] Data array
468 468
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface New list type item object
469 469
 	 */
470
-	protected function fromArray( array $data )
470
+	protected function fromArray(array $data)
471 471
 	{
472
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/lists/type' );
472
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/lists/type');
473 473
 
474
-		if( isset( $data['media.lists.type.id'] ) && $data['media.lists.type.id'] != '' ) {
475
-			$item = $manager->getItem( $data['media.lists.type.id'] );
474
+		if (isset($data['media.lists.type.id']) && $data['media.lists.type.id'] != '') {
475
+			$item = $manager->getItem($data['media.lists.type.id']);
476 476
 		} else {
477 477
 			$item = $manager->createItem();
478 478
 		}
479 479
 
480
-		$item->fromArray( $data );
480
+		$item->fromArray($data);
481 481
 
482 482
 		return $item;
483 483
 	}
@@ -489,11 +489,11 @@  discard block
 block discarded – undo
489 489
 	 * @param \Aimeos\MShop\Common\Item\Type\Iface $item Type item object
490 490
 	 * @return string[] Multi-dimensional associative list of item data
491 491
 	 */
492
-	protected function toArray( \Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false )
492
+	protected function toArray(\Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false)
493 493
 	{
494
-		$data = $item->toArray( true );
494
+		$data = $item->toArray(true);
495 495
 
496
-		if( $copy === true )
496
+		if ($copy === true)
497 497
 		{
498 498
 			$data['media.lists.type.code'] = $data['media.lists.type.code'] . '_copy';
499 499
 			$data['media.lists.type.id'] = '';
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
510 510
 	 * @return string HTML output
511 511
 	 */
512
-	protected function render( \Aimeos\MW\View\Iface $view )
512
+	protected function render(\Aimeos\MW\View\Iface $view)
513 513
 	{
514 514
 		/** admin/jqadm/type/media/lists/template-item
515 515
 		 * Relative path to the HTML body template for the list type item.
@@ -533,6 +533,6 @@  discard block
 block discarded – undo
533 533
 		$tplconf = 'admin/jqadm/type/media/lists/template-item';
534 534
 		$default = 'type/media/lists/item-standard';
535 535
 
536
-		return $view->render( $view->config( $tplconf, $default ) );
536
+		return $view->render($view->config($tplconf, $default));
537 537
 	}
538 538
 }
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Type/Media/Property/Standard.php 2 patches
Braces   +13 added lines, -26 removed lines patch added patch discarded remove patch
@@ -88,14 +88,12 @@  discard block
 block discarded – undo
88 88
 				$view->tabindex = ++$idx + 1;
89 89
 				$view->itemBody .= $client->copy();
90 90
 			}
91
-		}
92
-		catch( \Aimeos\MShop\Exception $e )
91
+		} catch( \Aimeos\MShop\Exception $e )
93 92
 		{
94 93
 			$error = array( 'type-media-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
95 94
 			$view->errors = $view->get( 'errors', [] ) + $error;
96 95
 			$this->logException( $e );
97
-		}
98
-		catch( \Exception $e )
96
+		} catch( \Exception $e )
99 97
 		{
100 98
 			$error = array( 'type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
101 99
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -137,14 +135,12 @@  discard block
 block discarded – undo
137 135
 				$view->tabindex = ++$idx + 1;
138 136
 				$view->itemBody .= $client->create();
139 137
 			}
140
-		}
141
-		catch( \Aimeos\MShop\Exception $e )
138
+		} catch( \Aimeos\MShop\Exception $e )
142 139
 		{
143 140
 			$error = array( 'type-media-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
144 141
 			$view->errors = $view->get( 'errors', [] ) + $error;
145 142
 			$this->logException( $e );
146
-		}
147
-		catch( \Exception $e )
143
+		} catch( \Exception $e )
148 144
 		{
149 145
 			$error = array( 'type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
150 146
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -185,14 +181,12 @@  discard block
 block discarded – undo
185 181
 
186 182
 			$this->nextAction( $view, 'search', 'type/media/property', null, 'delete' );
187 183
 			return;
188
-		}
189
-		catch( \Aimeos\MShop\Exception $e )
184
+		} catch( \Aimeos\MShop\Exception $e )
190 185
 		{
191 186
 			$error = array( 'type-media-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
192 187
 			$view->errors = $view->get( 'errors', [] ) + $error;
193 188
 			$this->logException( $e );
194
-		}
195
-		catch( \Exception $e )
189
+		} catch( \Exception $e )
196 190
 		{
197 191
 			$error = array( 'type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
198 192
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -233,14 +227,12 @@  discard block
 block discarded – undo
233 227
 				$view->tabindex = ++$idx + 1;
234 228
 				$view->itemBody .= $client->get();
235 229
 			}
236
-		}
237
-		catch( \Aimeos\MShop\Exception $e )
230
+		} catch( \Aimeos\MShop\Exception $e )
238 231
 		{
239 232
 			$error = array( 'type-media-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
240 233
 			$view->errors = $view->get( 'errors', [] ) + $error;
241 234
 			$this->logException( $e );
242
-		}
243
-		catch( \Exception $e )
235
+		} catch( \Exception $e )
244 236
 		{
245 237
 			$error = array( 'type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
246 238
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -277,18 +269,15 @@  discard block
 block discarded – undo
277 269
 
278 270
 			$this->nextAction( $view, $view->param( 'next' ), 'type/media/property', $view->item->getId(), 'save' );
279 271
 			return;
280
-		}
281
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
272
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
282 273
 		{
283 274
 			// fall through to create
284
-		}
285
-		catch( \Aimeos\MShop\Exception $e )
275
+		} catch( \Aimeos\MShop\Exception $e )
286 276
 		{
287 277
 			$error = array( 'type-media-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
288 278
 			$view->errors = $view->get( 'errors', [] ) + $error;
289 279
 			$this->logException( $e );
290
-		}
291
-		catch( \Exception $e )
280
+		} catch( \Exception $e )
292 281
 		{
293 282
 			$error = array( 'type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
294 283
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -327,14 +316,12 @@  discard block
 block discarded – undo
327 316
 			foreach( $this->getSubClients() as $client ) {
328 317
 				$view->itemBody .= $client->search();
329 318
 			}
330
-		}
331
-		catch( \Aimeos\MShop\Exception $e )
319
+		} catch( \Aimeos\MShop\Exception $e )
332 320
 		{
333 321
 			$error = array( 'type-media-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
334 322
 			$view->errors = $view->get( 'errors', [] ) + $error;
335 323
 			$this->logException( $e );
336
-		}
337
-		catch( \Exception $e )
324
+		} catch( \Exception $e )
338 325
 		{
339 326
 			$error = array( 'type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
340 327
 			$view->errors = $view->get( 'errors', [] ) + $error;
Please login to merge, or discard this patch.
Spacing   +102 added lines, -102 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 namespace Aimeos\Admin\JQAdm\Type\Media\Property;
12 12
 
13
-sprintf( 'type/media/property' ); // for translation
13
+sprintf('type/media/property'); // for translation
14 14
 
15 15
 
16 16
 /**
@@ -35,37 +35,37 @@  discard block
 block discarded – undo
35 35
 
36 36
 		try
37 37
 		{
38
-			if( ( $id = $view->param( 'id' ) ) === null ) {
39
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
38
+			if (($id = $view->param('id')) === null) {
39
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
40 40
 			}
41 41
 
42
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'media/property/type' );
43
-			$view->item = $manager->getItem( $id );
42
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'media/property/type');
43
+			$view->item = $manager->getItem($id);
44 44
 
45
-			$view->itemData = $this->toArray( $view->item, true );
45
+			$view->itemData = $this->toArray($view->item, true);
46 46
 			$view->itemSubparts = $this->getSubClientNames();
47 47
 			$view->itemBody = '';
48 48
 
49
-			foreach( $this->getSubClients() as $idx => $client )
49
+			foreach ($this->getSubClients() as $idx => $client)
50 50
 			{
51 51
 				$view->tabindex = ++$idx + 1;
52 52
 				$view->itemBody .= $client->copy();
53 53
 			}
54 54
 		}
55
-		catch( \Aimeos\MShop\Exception $e )
55
+		catch (\Aimeos\MShop\Exception $e)
56 56
 		{
57
-			$error = array( 'type-media-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
58
-			$view->errors = $view->get( 'errors', [] ) + $error;
59
-			$this->logException( $e );
57
+			$error = array('type-media-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
58
+			$view->errors = $view->get('errors', []) + $error;
59
+			$this->logException($e);
60 60
 		}
61
-		catch( \Exception $e )
61
+		catch (\Exception $e)
62 62
 		{
63
-			$error = array( 'type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
64
-			$view->errors = $view->get( 'errors', [] ) + $error;
65
-			$this->logException( $e );
63
+			$error = array('type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
64
+			$view->errors = $view->get('errors', []) + $error;
65
+			$this->logException($e);
66 66
 		}
67 67
 
68
-		return $this->render( $view );
68
+		return $this->render($view);
69 69
 	}
70 70
 
71 71
 
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
 
82 82
 		try
83 83
 		{
84
-			$data = $view->param( 'item', [] );
84
+			$data = $view->param('item', []);
85 85
 
86
-			if( !isset( $view->item ) ) {
87
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'media/property/type' )->createItem();
86
+			if (!isset($view->item)) {
87
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'media/property/type')->createItem();
88 88
 			}
89 89
 
90 90
 			$data['media.property.type.siteid'] = $view->item->getSiteId();
@@ -93,26 +93,26 @@  discard block
 block discarded – undo
93 93
 			$view->itemData = $data;
94 94
 			$view->itemBody = '';
95 95
 
96
-			foreach( $this->getSubClients() as $idx => $client )
96
+			foreach ($this->getSubClients() as $idx => $client)
97 97
 			{
98 98
 				$view->tabindex = ++$idx + 1;
99 99
 				$view->itemBody .= $client->create();
100 100
 			}
101 101
 		}
102
-		catch( \Aimeos\MShop\Exception $e )
102
+		catch (\Aimeos\MShop\Exception $e)
103 103
 		{
104
-			$error = array( 'type-media-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
105
-			$view->errors = $view->get( 'errors', [] ) + $error;
106
-			$this->logException( $e );
104
+			$error = array('type-media-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
105
+			$view->errors = $view->get('errors', []) + $error;
106
+			$this->logException($e);
107 107
 		}
108
-		catch( \Exception $e )
108
+		catch (\Exception $e)
109 109
 		{
110
-			$error = array( 'type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
111
-			$view->errors = $view->get( 'errors', [] ) + $error;
112
-			$this->logException( $e );
110
+			$error = array('type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
111
+			$view->errors = $view->get('errors', []) + $error;
112
+			$this->logException($e);
113 113
 		}
114 114
 
115
-		return $this->render( $view );
115
+		return $this->render($view);
116 116
 	}
117 117
 
118 118
 
@@ -126,38 +126,38 @@  discard block
 block discarded – undo
126 126
 		$view = $this->getView();
127 127
 		$context = $this->getContext();
128 128
 
129
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'media/property/type' );
129
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'media/property/type');
130 130
 		$manager->begin();
131 131
 
132 132
 		try
133 133
 		{
134
-			if( ( $id = $view->param( 'id' ) ) === null ) {
135
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
134
+			if (($id = $view->param('id')) === null) {
135
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
136 136
 			}
137 137
 
138
-			$view->item = $manager->getItem( $id );
138
+			$view->item = $manager->getItem($id);
139 139
 
140
-			foreach( $this->getSubClients() as $client ) {
140
+			foreach ($this->getSubClients() as $client) {
141 141
 				$client->delete();
142 142
 			}
143 143
 
144
-			$manager->deleteItem( $id );
144
+			$manager->deleteItem($id);
145 145
 			$manager->commit();
146 146
 
147
-			$this->nextAction( $view, 'search', 'type/media/property', null, 'delete' );
147
+			$this->nextAction($view, 'search', 'type/media/property', null, 'delete');
148 148
 			return;
149 149
 		}
150
-		catch( \Aimeos\MShop\Exception $e )
150
+		catch (\Aimeos\MShop\Exception $e)
151 151
 		{
152
-			$error = array( 'type-media-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
153
-			$view->errors = $view->get( 'errors', [] ) + $error;
154
-			$this->logException( $e );
152
+			$error = array('type-media-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
153
+			$view->errors = $view->get('errors', []) + $error;
154
+			$this->logException($e);
155 155
 		}
156
-		catch( \Exception $e )
156
+		catch (\Exception $e)
157 157
 		{
158
-			$error = array( 'type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
159
-			$view->errors = $view->get( 'errors', [] ) + $error;
160
-			$this->logException( $e );
158
+			$error = array('type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
159
+			$view->errors = $view->get('errors', []) + $error;
160
+			$this->logException($e);
161 161
 		}
162 162
 
163 163
 		$manager->rollback();
@@ -178,37 +178,37 @@  discard block
 block discarded – undo
178 178
 
179 179
 		try
180 180
 		{
181
-			if( ( $id = $view->param( 'id' ) ) === null ) {
182
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
181
+			if (($id = $view->param('id')) === null) {
182
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
183 183
 			}
184 184
 
185
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'media/property/type' );
185
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'media/property/type');
186 186
 
187
-			$view->item = $manager->getItem( $id );
187
+			$view->item = $manager->getItem($id);
188 188
 			$view->itemSubparts = $this->getSubClientNames();
189
-			$view->itemData = $this->toArray( $view->item );
189
+			$view->itemData = $this->toArray($view->item);
190 190
 			$view->itemBody = '';
191 191
 
192
-			foreach( $this->getSubClients() as $idx => $client )
192
+			foreach ($this->getSubClients() as $idx => $client)
193 193
 			{
194 194
 				$view->tabindex = ++$idx + 1;
195 195
 				$view->itemBody .= $client->get();
196 196
 			}
197 197
 		}
198
-		catch( \Aimeos\MShop\Exception $e )
198
+		catch (\Aimeos\MShop\Exception $e)
199 199
 		{
200
-			$error = array( 'type-media-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
201
-			$view->errors = $view->get( 'errors', [] ) + $error;
202
-			$this->logException( $e );
200
+			$error = array('type-media-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
201
+			$view->errors = $view->get('errors', []) + $error;
202
+			$this->logException($e);
203 203
 		}
204
-		catch( \Exception $e )
204
+		catch (\Exception $e)
205 205
 		{
206
-			$error = array( 'type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
207
-			$view->errors = $view->get( 'errors', [] ) + $error;
208
-			$this->logException( $e );
206
+			$error = array('type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
207
+			$view->errors = $view->get('errors', []) + $error;
208
+			$this->logException($e);
209 209
 		}
210 210
 
211
-		return $this->render( $view );
211
+		return $this->render($view);
212 212
 	}
213 213
 
214 214
 
@@ -222,40 +222,40 @@  discard block
 block discarded – undo
222 222
 		$view = $this->getView();
223 223
 		$context = $this->getContext();
224 224
 
225
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'media/property/type' );
225
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'media/property/type');
226 226
 		$manager->begin();
227 227
 
228 228
 		try
229 229
 		{
230
-			$item = $this->fromArray( $view->param( 'item', [] ) );
231
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
230
+			$item = $this->fromArray($view->param('item', []));
231
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
232 232
 			$view->itemBody = '';
233 233
 
234
-			foreach( $this->getSubClients() as $client ) {
234
+			foreach ($this->getSubClients() as $client) {
235 235
 				$view->itemBody .= $client->save();
236 236
 			}
237 237
 
238
-			$manager->saveItem( clone $view->item );
238
+			$manager->saveItem(clone $view->item);
239 239
 			$manager->commit();
240 240
 
241
-			$this->nextAction( $view, $view->param( 'next' ), 'type/media/property', $view->item->getId(), 'save' );
241
+			$this->nextAction($view, $view->param('next'), 'type/media/property', $view->item->getId(), 'save');
242 242
 			return;
243 243
 		}
244
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
244
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
245 245
 		{
246 246
 			// fall through to create
247 247
 		}
248
-		catch( \Aimeos\MShop\Exception $e )
248
+		catch (\Aimeos\MShop\Exception $e)
249 249
 		{
250
-			$error = array( 'type-media-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
251
-			$view->errors = $view->get( 'errors', [] ) + $error;
252
-			$this->logException( $e );
250
+			$error = array('type-media-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
251
+			$view->errors = $view->get('errors', []) + $error;
252
+			$this->logException($e);
253 253
 		}
254
-		catch( \Exception $e )
254
+		catch (\Exception $e)
255 255
 		{
256
-			$error = array( 'type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
257
-			$view->errors = $view->get( 'errors', [] ) + $error;
258
-			$this->logException( $e );
256
+			$error = array('type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
257
+			$view->errors = $view->get('errors', []) + $error;
258
+			$this->logException($e);
259 259
 		}
260 260
 
261 261
 		$manager->rollback();
@@ -277,31 +277,31 @@  discard block
 block discarded – undo
277 277
 		try
278 278
 		{
279 279
 			$total = 0;
280
-			$params = $this->storeSearchParams( $view->param(), 'type/media/property' );
281
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'media/property/type' );
282
-			$search = $this->initCriteria( $manager->createSearch(), $params );
280
+			$params = $this->storeSearchParams($view->param(), 'type/media/property');
281
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'media/property/type');
282
+			$search = $this->initCriteria($manager->createSearch(), $params);
283 283
 
284
-			$view->items = $manager->searchItems( $search, [], $total );
285
-			$view->filterAttributes = $manager->getSearchAttributes( true );
284
+			$view->items = $manager->searchItems($search, [], $total);
285
+			$view->filterAttributes = $manager->getSearchAttributes(true);
286 286
 			$view->filterOperators = $search->getOperators();
287 287
 			$view->total = $total;
288 288
 			$view->itemBody = '';
289 289
 
290
-			foreach( $this->getSubClients() as $client ) {
290
+			foreach ($this->getSubClients() as $client) {
291 291
 				$view->itemBody .= $client->search();
292 292
 			}
293 293
 		}
294
-		catch( \Aimeos\MShop\Exception $e )
294
+		catch (\Aimeos\MShop\Exception $e)
295 295
 		{
296
-			$error = array( 'type-media-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
297
-			$view->errors = $view->get( 'errors', [] ) + $error;
298
-			$this->logException( $e );
296
+			$error = array('type-media-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
297
+			$view->errors = $view->get('errors', []) + $error;
298
+			$this->logException($e);
299 299
 		}
300
-		catch( \Exception $e )
300
+		catch (\Exception $e)
301 301
 		{
302
-			$error = array( 'type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
303
-			$view->errors = $view->get( 'errors', [] ) + $error;
304
-			$this->logException( $e );
302
+			$error = array('type-media-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
303
+			$view->errors = $view->get('errors', []) + $error;
304
+			$this->logException($e);
305 305
 		}
306 306
 
307 307
 		/** admin/jqadm/type/media/property/template-list
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 		$tplconf = 'admin/jqadm/type/media/property/template-list';
327 327
 		$default = 'type/media/property/list-standard';
328 328
 
329
-		return $view->render( $view->config( $tplconf, $default ) );
329
+		return $view->render($view->config($tplconf, $default));
330 330
 	}
331 331
 
332 332
 
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 	 * @param string|null $name Name of the sub-client (Default if null)
338 338
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
339 339
 	 */
340
-	public function getSubClient( $propertytype, $name = null )
340
+	public function getSubClient($propertytype, $name = null)
341 341
 	{
342 342
 		/** admin/jqadm/type/media/property/decorators/excludes
343 343
 		 * Excludes decorators added by the "common" option from the list type JQAdm client
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 		 * @see admin/jqadm/type/media/property/decorators/excludes
413 413
 		 * @see admin/jqadm/type/media/property/decorators/global
414 414
 		 */
415
-		return $this->createSubClient( 'type/media/property' . $propertytype, $name );
415
+		return $this->createSubClient('type/media/property' . $propertytype, $name);
416 416
 	}
417 417
 
418 418
 
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
 		 * @since 2017.10
457 457
 		 * @category Developer
458 458
 		 */
459
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/type/media/property/standard/subparts', [] );
459
+		return $this->getContext()->getConfig()->get('admin/jqadm/type/media/property/standard/subparts', []);
460 460
 	}
461 461
 
462 462
 
@@ -467,17 +467,17 @@  discard block
 block discarded – undo
467 467
 	 * @param string[] Data array
468 468
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface New list type item object
469 469
 	 */
470
-	protected function fromArray( array $data )
470
+	protected function fromArray(array $data)
471 471
 	{
472
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/property/type' );
472
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/property/type');
473 473
 
474
-		if( isset( $data['media.property.type.id'] ) && $data['media.property.type.id'] != '' ) {
475
-			$item = $manager->getItem( $data['media.property.type.id'] );
474
+		if (isset($data['media.property.type.id']) && $data['media.property.type.id'] != '') {
475
+			$item = $manager->getItem($data['media.property.type.id']);
476 476
 		} else {
477 477
 			$item = $manager->createItem();
478 478
 		}
479 479
 
480
-		$item->fromArray( $data );
480
+		$item->fromArray($data);
481 481
 
482 482
 		return $item;
483 483
 	}
@@ -489,11 +489,11 @@  discard block
 block discarded – undo
489 489
 	 * @param \Aimeos\MShop\Common\Item\Type\Iface $item Type item object
490 490
 	 * @return string[] Multi-dimensional associative list of item data
491 491
 	 */
492
-	protected function toArray( \Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false )
492
+	protected function toArray(\Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false)
493 493
 	{
494
-		$data = $item->toArray( true );
494
+		$data = $item->toArray(true);
495 495
 
496
-		if( $copy === true )
496
+		if ($copy === true)
497 497
 		{
498 498
 			$data['media.property.type.code'] = $data['media.property.type.code'] . '_copy';
499 499
 			$data['media.property.type.id'] = '';
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
510 510
 	 * @return string HTML output
511 511
 	 */
512
-	protected function render( \Aimeos\MW\View\Iface $view )
512
+	protected function render(\Aimeos\MW\View\Iface $view)
513 513
 	{
514 514
 		/** admin/jqadm/type/media/property/template-item
515 515
 		 * Relative path to the HTML body template for the list type item.
@@ -533,6 +533,6 @@  discard block
 block discarded – undo
533 533
 		$tplconf = 'admin/jqadm/type/media/property/template-item';
534 534
 		$default = 'type/media/property/item-standard';
535 535
 
536
-		return $view->render( $view->config( $tplconf, $default ) );
536
+		return $view->render($view->config($tplconf, $default));
537 537
 	}
538 538
 }
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Type/Media/Standard.php 2 patches
Braces   +13 added lines, -26 removed lines patch added patch discarded remove patch
@@ -88,14 +88,12 @@  discard block
 block discarded – undo
88 88
 				$view->tabindex = ++$idx + 1;
89 89
 				$view->itemBody .= $client->copy();
90 90
 			}
91
-		}
92
-		catch( \Aimeos\MShop\Exception $e )
91
+		} catch( \Aimeos\MShop\Exception $e )
93 92
 		{
94 93
 			$error = array( 'type-media-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
95 94
 			$view->errors = $view->get( 'errors', [] ) + $error;
96 95
 			$this->logException( $e );
97
-		}
98
-		catch( \Exception $e )
96
+		} catch( \Exception $e )
99 97
 		{
100 98
 			$error = array( 'type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
101 99
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -137,14 +135,12 @@  discard block
 block discarded – undo
137 135
 				$view->tabindex = ++$idx + 1;
138 136
 				$view->itemBody .= $client->create();
139 137
 			}
140
-		}
141
-		catch( \Aimeos\MShop\Exception $e )
138
+		} catch( \Aimeos\MShop\Exception $e )
142 139
 		{
143 140
 			$error = array( 'type-media-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
144 141
 			$view->errors = $view->get( 'errors', [] ) + $error;
145 142
 			$this->logException( $e );
146
-		}
147
-		catch( \Exception $e )
143
+		} catch( \Exception $e )
148 144
 		{
149 145
 			$error = array( 'type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
150 146
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -185,14 +181,12 @@  discard block
 block discarded – undo
185 181
 
186 182
 			$this->nextAction( $view, 'search', 'type/media', null, 'delete' );
187 183
 			return;
188
-		}
189
-		catch( \Aimeos\MShop\Exception $e )
184
+		} catch( \Aimeos\MShop\Exception $e )
190 185
 		{
191 186
 			$error = array( 'type-media-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
192 187
 			$view->errors = $view->get( 'errors', [] ) + $error;
193 188
 			$this->logException( $e );
194
-		}
195
-		catch( \Exception $e )
189
+		} catch( \Exception $e )
196 190
 		{
197 191
 			$error = array( 'type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
198 192
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -233,14 +227,12 @@  discard block
 block discarded – undo
233 227
 				$view->tabindex = ++$idx + 1;
234 228
 				$view->itemBody .= $client->get();
235 229
 			}
236
-		}
237
-		catch( \Aimeos\MShop\Exception $e )
230
+		} catch( \Aimeos\MShop\Exception $e )
238 231
 		{
239 232
 			$error = array( 'type-media-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
240 233
 			$view->errors = $view->get( 'errors', [] ) + $error;
241 234
 			$this->logException( $e );
242
-		}
243
-		catch( \Exception $e )
235
+		} catch( \Exception $e )
244 236
 		{
245 237
 			$error = array( 'type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
246 238
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -277,18 +269,15 @@  discard block
 block discarded – undo
277 269
 
278 270
 			$this->nextAction( $view, $view->param( 'next' ), 'type/media', $view->item->getId(), 'save' );
279 271
 			return;
280
-		}
281
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
272
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
282 273
 		{
283 274
 			// fall through to create
284
-		}
285
-		catch( \Aimeos\MShop\Exception $e )
275
+		} catch( \Aimeos\MShop\Exception $e )
286 276
 		{
287 277
 			$error = array( 'type-media-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
288 278
 			$view->errors = $view->get( 'errors', [] ) + $error;
289 279
 			$this->logException( $e );
290
-		}
291
-		catch( \Exception $e )
280
+		} catch( \Exception $e )
292 281
 		{
293 282
 			$error = array( 'type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
294 283
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -327,14 +316,12 @@  discard block
 block discarded – undo
327 316
 			foreach( $this->getSubClients() as $client ) {
328 317
 				$view->itemBody .= $client->search();
329 318
 			}
330
-		}
331
-		catch( \Aimeos\MShop\Exception $e )
319
+		} catch( \Aimeos\MShop\Exception $e )
332 320
 		{
333 321
 			$error = array( 'type-media-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
334 322
 			$view->errors = $view->get( 'errors', [] ) + $error;
335 323
 			$this->logException( $e );
336
-		}
337
-		catch( \Exception $e )
324
+		} catch( \Exception $e )
338 325
 		{
339 326
 			$error = array( 'type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
340 327
 			$view->errors = $view->get( 'errors', [] ) + $error;
Please login to merge, or discard this patch.
Spacing   +102 added lines, -102 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 namespace Aimeos\Admin\JQAdm\Type\Media;
12 12
 
13
-sprintf( 'type/media' ); // for translation
13
+sprintf('type/media'); // for translation
14 14
 
15 15
 
16 16
 /**
@@ -35,37 +35,37 @@  discard block
 block discarded – undo
35 35
 
36 36
 		try
37 37
 		{
38
-			if( ( $id = $view->param( 'id' ) ) === null ) {
39
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
38
+			if (($id = $view->param('id')) === null) {
39
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
40 40
 			}
41 41
 
42
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'media/type' );
43
-			$view->item = $manager->getItem( $id );
42
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'media/type');
43
+			$view->item = $manager->getItem($id);
44 44
 
45
-			$view->itemData = $this->toArray( $view->item, true );
45
+			$view->itemData = $this->toArray($view->item, true);
46 46
 			$view->itemSubparts = $this->getSubClientNames();
47 47
 			$view->itemBody = '';
48 48
 
49
-			foreach( $this->getSubClients() as $idx => $client )
49
+			foreach ($this->getSubClients() as $idx => $client)
50 50
 			{
51 51
 				$view->tabindex = ++$idx + 1;
52 52
 				$view->itemBody .= $client->copy();
53 53
 			}
54 54
 		}
55
-		catch( \Aimeos\MShop\Exception $e )
55
+		catch (\Aimeos\MShop\Exception $e)
56 56
 		{
57
-			$error = array( 'type-media-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
58
-			$view->errors = $view->get( 'errors', [] ) + $error;
59
-			$this->logException( $e );
57
+			$error = array('type-media-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
58
+			$view->errors = $view->get('errors', []) + $error;
59
+			$this->logException($e);
60 60
 		}
61
-		catch( \Exception $e )
61
+		catch (\Exception $e)
62 62
 		{
63
-			$error = array( 'type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
64
-			$view->errors = $view->get( 'errors', [] ) + $error;
65
-			$this->logException( $e );
63
+			$error = array('type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
64
+			$view->errors = $view->get('errors', []) + $error;
65
+			$this->logException($e);
66 66
 		}
67 67
 
68
-		return $this->render( $view );
68
+		return $this->render($view);
69 69
 	}
70 70
 
71 71
 
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
 
82 82
 		try
83 83
 		{
84
-			$data = $view->param( 'item', [] );
84
+			$data = $view->param('item', []);
85 85
 
86
-			if( !isset( $view->item ) ) {
87
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'media/type' )->createItem();
86
+			if (!isset($view->item)) {
87
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'media/type')->createItem();
88 88
 			}
89 89
 
90 90
 			$data['media.type.siteid'] = $view->item->getSiteId();
@@ -93,26 +93,26 @@  discard block
 block discarded – undo
93 93
 			$view->itemData = $data;
94 94
 			$view->itemBody = '';
95 95
 
96
-			foreach( $this->getSubClients() as $idx => $client )
96
+			foreach ($this->getSubClients() as $idx => $client)
97 97
 			{
98 98
 				$view->tabindex = ++$idx + 1;
99 99
 				$view->itemBody .= $client->create();
100 100
 			}
101 101
 		}
102
-		catch( \Aimeos\MShop\Exception $e )
102
+		catch (\Aimeos\MShop\Exception $e)
103 103
 		{
104
-			$error = array( 'type-media-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
105
-			$view->errors = $view->get( 'errors', [] ) + $error;
106
-			$this->logException( $e );
104
+			$error = array('type-media-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
105
+			$view->errors = $view->get('errors', []) + $error;
106
+			$this->logException($e);
107 107
 		}
108
-		catch( \Exception $e )
108
+		catch (\Exception $e)
109 109
 		{
110
-			$error = array( 'type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
111
-			$view->errors = $view->get( 'errors', [] ) + $error;
112
-			$this->logException( $e );
110
+			$error = array('type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
111
+			$view->errors = $view->get('errors', []) + $error;
112
+			$this->logException($e);
113 113
 		}
114 114
 
115
-		return $this->render( $view );
115
+		return $this->render($view);
116 116
 	}
117 117
 
118 118
 
@@ -126,38 +126,38 @@  discard block
 block discarded – undo
126 126
 		$view = $this->getView();
127 127
 		$context = $this->getContext();
128 128
 
129
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'media/type' );
129
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'media/type');
130 130
 		$manager->begin();
131 131
 
132 132
 		try
133 133
 		{
134
-			if( ( $id = $view->param( 'id' ) ) === null ) {
135
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
134
+			if (($id = $view->param('id')) === null) {
135
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
136 136
 			}
137 137
 
138
-			$view->item = $manager->getItem( $id );
138
+			$view->item = $manager->getItem($id);
139 139
 
140
-			foreach( $this->getSubClients() as $client ) {
140
+			foreach ($this->getSubClients() as $client) {
141 141
 				$client->delete();
142 142
 			}
143 143
 
144
-			$manager->deleteItem( $id );
144
+			$manager->deleteItem($id);
145 145
 			$manager->commit();
146 146
 
147
-			$this->nextAction( $view, 'search', 'type/media', null, 'delete' );
147
+			$this->nextAction($view, 'search', 'type/media', null, 'delete');
148 148
 			return;
149 149
 		}
150
-		catch( \Aimeos\MShop\Exception $e )
150
+		catch (\Aimeos\MShop\Exception $e)
151 151
 		{
152
-			$error = array( 'type-media-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
153
-			$view->errors = $view->get( 'errors', [] ) + $error;
154
-			$this->logException( $e );
152
+			$error = array('type-media-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
153
+			$view->errors = $view->get('errors', []) + $error;
154
+			$this->logException($e);
155 155
 		}
156
-		catch( \Exception $e )
156
+		catch (\Exception $e)
157 157
 		{
158
-			$error = array( 'type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
159
-			$view->errors = $view->get( 'errors', [] ) + $error;
160
-			$this->logException( $e );
158
+			$error = array('type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
159
+			$view->errors = $view->get('errors', []) + $error;
160
+			$this->logException($e);
161 161
 		}
162 162
 
163 163
 		$manager->rollback();
@@ -178,37 +178,37 @@  discard block
 block discarded – undo
178 178
 
179 179
 		try
180 180
 		{
181
-			if( ( $id = $view->param( 'id' ) ) === null ) {
182
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
181
+			if (($id = $view->param('id')) === null) {
182
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
183 183
 			}
184 184
 
185
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'media/type' );
185
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'media/type');
186 186
 
187
-			$view->item = $manager->getItem( $id );
187
+			$view->item = $manager->getItem($id);
188 188
 			$view->itemSubparts = $this->getSubClientNames();
189
-			$view->itemData = $this->toArray( $view->item );
189
+			$view->itemData = $this->toArray($view->item);
190 190
 			$view->itemBody = '';
191 191
 
192
-			foreach( $this->getSubClients() as $idx => $client )
192
+			foreach ($this->getSubClients() as $idx => $client)
193 193
 			{
194 194
 				$view->tabindex = ++$idx + 1;
195 195
 				$view->itemBody .= $client->get();
196 196
 			}
197 197
 		}
198
-		catch( \Aimeos\MShop\Exception $e )
198
+		catch (\Aimeos\MShop\Exception $e)
199 199
 		{
200
-			$error = array( 'type-media-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
201
-			$view->errors = $view->get( 'errors', [] ) + $error;
202
-			$this->logException( $e );
200
+			$error = array('type-media-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
201
+			$view->errors = $view->get('errors', []) + $error;
202
+			$this->logException($e);
203 203
 		}
204
-		catch( \Exception $e )
204
+		catch (\Exception $e)
205 205
 		{
206
-			$error = array( 'type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
207
-			$view->errors = $view->get( 'errors', [] ) + $error;
208
-			$this->logException( $e );
206
+			$error = array('type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
207
+			$view->errors = $view->get('errors', []) + $error;
208
+			$this->logException($e);
209 209
 		}
210 210
 
211
-		return $this->render( $view );
211
+		return $this->render($view);
212 212
 	}
213 213
 
214 214
 
@@ -222,40 +222,40 @@  discard block
 block discarded – undo
222 222
 		$view = $this->getView();
223 223
 		$context = $this->getContext();
224 224
 
225
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'media/type' );
225
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'media/type');
226 226
 		$manager->begin();
227 227
 
228 228
 		try
229 229
 		{
230
-			$item = $this->fromArray( $view->param( 'item', [] ) );
231
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
230
+			$item = $this->fromArray($view->param('item', []));
231
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
232 232
 			$view->itemBody = '';
233 233
 
234
-			foreach( $this->getSubClients() as $client ) {
234
+			foreach ($this->getSubClients() as $client) {
235 235
 				$view->itemBody .= $client->save();
236 236
 			}
237 237
 
238
-			$manager->saveItem( clone $view->item );
238
+			$manager->saveItem(clone $view->item);
239 239
 			$manager->commit();
240 240
 
241
-			$this->nextAction( $view, $view->param( 'next' ), 'type/media', $view->item->getId(), 'save' );
241
+			$this->nextAction($view, $view->param('next'), 'type/media', $view->item->getId(), 'save');
242 242
 			return;
243 243
 		}
244
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
244
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
245 245
 		{
246 246
 			// fall through to create
247 247
 		}
248
-		catch( \Aimeos\MShop\Exception $e )
248
+		catch (\Aimeos\MShop\Exception $e)
249 249
 		{
250
-			$error = array( 'type-media-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
251
-			$view->errors = $view->get( 'errors', [] ) + $error;
252
-			$this->logException( $e );
250
+			$error = array('type-media-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
251
+			$view->errors = $view->get('errors', []) + $error;
252
+			$this->logException($e);
253 253
 		}
254
-		catch( \Exception $e )
254
+		catch (\Exception $e)
255 255
 		{
256
-			$error = array( 'type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
257
-			$view->errors = $view->get( 'errors', [] ) + $error;
258
-			$this->logException( $e );
256
+			$error = array('type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
257
+			$view->errors = $view->get('errors', []) + $error;
258
+			$this->logException($e);
259 259
 		}
260 260
 
261 261
 		$manager->rollback();
@@ -277,31 +277,31 @@  discard block
 block discarded – undo
277 277
 		try
278 278
 		{
279 279
 			$total = 0;
280
-			$params = $this->storeSearchParams( $view->param(), 'type/media' );
281
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'media/type' );
282
-			$search = $this->initCriteria( $manager->createSearch(), $params );
280
+			$params = $this->storeSearchParams($view->param(), 'type/media');
281
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'media/type');
282
+			$search = $this->initCriteria($manager->createSearch(), $params);
283 283
 
284
-			$view->items = $manager->searchItems( $search, [], $total );
285
-			$view->filterAttributes = $manager->getSearchAttributes( true );
284
+			$view->items = $manager->searchItems($search, [], $total);
285
+			$view->filterAttributes = $manager->getSearchAttributes(true);
286 286
 			$view->filterOperators = $search->getOperators();
287 287
 			$view->total = $total;
288 288
 			$view->itemBody = '';
289 289
 
290
-			foreach( $this->getSubClients() as $client ) {
290
+			foreach ($this->getSubClients() as $client) {
291 291
 				$view->itemBody .= $client->search();
292 292
 			}
293 293
 		}
294
-		catch( \Aimeos\MShop\Exception $e )
294
+		catch (\Aimeos\MShop\Exception $e)
295 295
 		{
296
-			$error = array( 'type-media-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
297
-			$view->errors = $view->get( 'errors', [] ) + $error;
298
-			$this->logException( $e );
296
+			$error = array('type-media-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
297
+			$view->errors = $view->get('errors', []) + $error;
298
+			$this->logException($e);
299 299
 		}
300
-		catch( \Exception $e )
300
+		catch (\Exception $e)
301 301
 		{
302
-			$error = array( 'type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
303
-			$view->errors = $view->get( 'errors', [] ) + $error;
304
-			$this->logException( $e );
302
+			$error = array('type-media-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
303
+			$view->errors = $view->get('errors', []) + $error;
304
+			$this->logException($e);
305 305
 		}
306 306
 
307 307
 		/** admin/jqadm/type/media/template-list
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 		$tplconf = 'admin/jqadm/type/media/template-list';
327 327
 		$default = 'type/media/list-standard';
328 328
 
329
-		return $view->render( $view->config( $tplconf, $default ) );
329
+		return $view->render($view->config($tplconf, $default));
330 330
 	}
331 331
 
332 332
 
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 	 * @param string|null $name Name of the sub-client (Default if null)
338 338
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
339 339
 	 */
340
-	public function getSubClient( $type, $name = null )
340
+	public function getSubClient($type, $name = null)
341 341
 	{
342 342
 		/** admin/jqadm/type/media/decorators/excludes
343 343
 		 * Excludes decorators added by the "common" option from the type JQAdm client
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 		 * @see admin/jqadm/type/media/decorators/excludes
413 413
 		 * @see admin/jqadm/type/media/decorators/global
414 414
 		 */
415
-		return $this->createSubClient( 'type/media' . $type, $name );
415
+		return $this->createSubClient('type/media' . $type, $name);
416 416
 	}
417 417
 
418 418
 
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
 		 * @since 2017.10
457 457
 		 * @category Developer
458 458
 		 */
459
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/type/media/standard/subparts', [] );
459
+		return $this->getContext()->getConfig()->get('admin/jqadm/type/media/standard/subparts', []);
460 460
 	}
461 461
 
462 462
 
@@ -467,17 +467,17 @@  discard block
 block discarded – undo
467 467
 	 * @param string[] Data array
468 468
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface New type item object
469 469
 	 */
470
-	protected function fromArray( array $data )
470
+	protected function fromArray(array $data)
471 471
 	{
472
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/type' );
472
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/type');
473 473
 
474
-		if( isset( $data['media.type.id'] ) && $data['media.type.id'] != '' ) {
475
-			$item = $manager->getItem( $data['media.type.id'] );
474
+		if (isset($data['media.type.id']) && $data['media.type.id'] != '') {
475
+			$item = $manager->getItem($data['media.type.id']);
476 476
 		} else {
477 477
 			$item = $manager->createItem();
478 478
 		}
479 479
 
480
-		$item->fromArray( $data );
480
+		$item->fromArray($data);
481 481
 
482 482
 		return $item;
483 483
 	}
@@ -489,11 +489,11 @@  discard block
 block discarded – undo
489 489
 	 * @param \Aimeos\MShop\Common\Item\Type\Iface $item Type item object
490 490
 	 * @return string[] Multi-dimensional associative list of item data
491 491
 	 */
492
-	protected function toArray( \Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false )
492
+	protected function toArray(\Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false)
493 493
 	{
494
-		$data = $item->toArray( true );
494
+		$data = $item->toArray(true);
495 495
 
496
-		if( $copy === true )
496
+		if ($copy === true)
497 497
 		{
498 498
 			$data['media.type.code'] = $data['media.type.code'] . '_copy';
499 499
 			$data['media.type.id'] = '';
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
510 510
 	 * @return string HTML output
511 511
 	 */
512
-	protected function render( \Aimeos\MW\View\Iface $view )
512
+	protected function render(\Aimeos\MW\View\Iface $view)
513 513
 	{
514 514
 		/** admin/jqadm/type/media/template-item
515 515
 		 * Relative path to the HTML body template for the type item.
@@ -533,6 +533,6 @@  discard block
 block discarded – undo
533 533
 		$tplconf = 'admin/jqadm/type/media/template-item';
534 534
 		$default = 'type/media/item-standard';
535 535
 
536
-		return $view->render( $view->config( $tplconf, $default ) );
536
+		return $view->render($view->config($tplconf, $default));
537 537
 	}
538 538
 }
Please login to merge, or discard this patch.