aimeos / ai-admin-jqadm

admin/jqadm/templates/catalog/item-standard.php

Braces +5 added lines, -2 removed lines

@@ -85,9 +85,12 @@
 		<div class="item-actions">
 			<?php if( isset( $this->itemData ) ) : ?>
 				<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard.php' ), ['params' => $params] ); ?>
-			<?php else : ?>
+			<?php else {
+	: ?>
 				<span class="placeholder">&nbsp;</span>
-			<?php endif; ?>
+			<?php endif;
+}
+?>
 		</div>
 	</nav>
 

Spacing +112 added lines, -112 removed lines

@@ -5,39 +5,39 @@ 
  * @copyright Aimeos (aimeos.org), 2017-2018
  */
 
-$selected = function( $key, $code ) {
-	return ( $key == $code ? 'selected="selected"' : '' );
+$selected = function($key, $code) {
+	return ($key == $code ? 'selected="selected"' : '');
 };
 
 
 $enc = $this->encoder();
 
-$target = $this->config( 'admin/jqadm/url/save/target' );
-$cntl = $this->config( 'admin/jqadm/url/save/controller', 'Jqadm' );
-$action = $this->config( 'admin/jqadm/url/save/action', 'save' );
-$config = $this->config( 'admin/jqadm/url/save/config', [] );
+$target = $this->config('admin/jqadm/url/save/target');
+$cntl = $this->config('admin/jqadm/url/save/controller', 'Jqadm');
+$action = $this->config('admin/jqadm/url/save/action', 'save');
+$config = $this->config('admin/jqadm/url/save/config', []);
 
-$getTarget = $this->config( 'admin/jqadm/url/get/target' );
-$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
-$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' );
-$getConfig = $this->config( 'admin/jqadm/url/get/config', [] );
+$getTarget = $this->config('admin/jqadm/url/get/target');
+$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
+$getAction = $this->config('admin/jqadm/url/get/action', 'get');
+$getConfig = $this->config('admin/jqadm/url/get/config', []);
 
-$listTarget = $this->config( 'admin/jqadm/url/search/target' );
-$listCntl = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
-$listAction = $this->config( 'admin/jqadm/url/search/action', 'search' );
-$listConfig = $this->config( 'admin/jqadm/url/search/config', [] );
+$listTarget = $this->config('admin/jqadm/url/search/target');
+$listCntl = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
+$listAction = $this->config('admin/jqadm/url/search/action', 'search');
+$listConfig = $this->config('admin/jqadm/url/search/config', []);
 
-$newTarget = $this->config( 'admin/jqadm/url/create/target' );
-$newCntl = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' );
-$newAction = $this->config( 'admin/jqadm/url/create/action', 'create' );
-$newConfig = $this->config( 'admin/jqadm/url/create/config', [] );
+$newTarget = $this->config('admin/jqadm/url/create/target');
+$newCntl = $this->config('admin/jqadm/url/create/controller', 'Jqadm');
+$newAction = $this->config('admin/jqadm/url/create/action', 'create');
+$newConfig = $this->config('admin/jqadm/url/create/config', []);
 
-$jsonTarget = $this->config( 'admin/jsonadm/url/target' );
-$jsonCntl = $this->config( 'admin/jsonadm/url/controller', 'Jsonadm' );
-$jsonAction = $this->config( 'admin/jsonadm/url/action', 'get' );
-$jsonConfig = $this->config( 'admin/jsonadm/url/config', [] );
+$jsonTarget = $this->config('admin/jsonadm/url/target');
+$jsonCntl = $this->config('admin/jsonadm/url/controller', 'Jsonadm');
+$jsonAction = $this->config('admin/jsonadm/url/action', 'get');
+$jsonConfig = $this->config('admin/jsonadm/url/config', []);
 
-$params = $this->get( 'pageParams', [] );
+$params = $this->get('pageParams', []);
 
 
 /** admin/jqadm/catalog/item/config/suggest
@@ -51,42 +51,42 @@ 
  * @category Developer
  * @see admin/jqadm/product/item/config/suggest
  */
-$cfgSuggest = $this->config( 'admin/jqadm/catalog/item/config/suggest', ['css-class'] );
+$cfgSuggest = $this->config('admin/jqadm/catalog/item/config/suggest', ['css-class']);
 
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 
 <form class="item item-catalog item-tree form-horizontal" method="POST" enctype="multipart/form-data"
-	action="<?= $enc->attr( $this->url( $target, $cntl, $action, $params, [], $config ) ); ?>"
-	data-rootid="<?= $enc->attr( $this->get( 'itemRootId' ) ); ?>"
-	data-geturl="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'catalog', 'id' => '_ID_'] + $params, [], $getConfig ) ); ?>"
-	data-createurl="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, ['resource' => 'catalog', 'id' => '_ID_'] + $params, [], $newConfig ) ); ?>"
-	data-jsonurl="<?= $enc->attr( $this->url( $jsonTarget, $jsonCntl, $jsonAction, ['resource' => 'catalog'], [], $jsonConfig ) ); ?>"
-	data-idname="<?= $this->formparam( 'id' ); ?>" >
-
-	<input id="item-id" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'catalog.id' ) ) ); ?>"
-		value="<?= $enc->attr( $this->get( 'itemData/catalog.id' ) ); ?>" />
-	<input id="item-parentid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'catalog.parentid' ) ) ); ?>"
-		value="<?= $enc->attr( $this->get( 'itemData/catalog.parentid', $this->param( 'id', $this->get( 'itemRootId' ) ) ) ); ?>" />
-	<input id="item-next" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'next' ) ) ); ?>" value="get" />
+	action="<?= $enc->attr($this->url($target, $cntl, $action, $params, [], $config)); ?>"
+	data-rootid="<?= $enc->attr($this->get('itemRootId')); ?>"
+	data-geturl="<?= $enc->attr($this->url($getTarget, $getCntl, $getAction, ['resource' => 'catalog', 'id' => '_ID_'] + $params, [], $getConfig)); ?>"
+	data-createurl="<?= $enc->attr($this->url($newTarget, $newCntl, $newAction, ['resource' => 'catalog', 'id' => '_ID_'] + $params, [], $newConfig)); ?>"
+	data-jsonurl="<?= $enc->attr($this->url($jsonTarget, $jsonCntl, $jsonAction, ['resource' => 'catalog'], [], $jsonConfig)); ?>"
+	data-idname="<?= $this->formparam('id'); ?>" >
+
+	<input id="item-id" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'catalog.id'))); ?>"
+		value="<?= $enc->attr($this->get('itemData/catalog.id')); ?>" />
+	<input id="item-parentid" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'catalog.parentid'))); ?>"
+		value="<?= $enc->attr($this->get('itemData/catalog.parentid', $this->param('id', $this->get('itemRootId')))); ?>" />
+	<input id="item-next" type="hidden" name="<?= $enc->attr($this->formparam(array('next'))); ?>" value="get" />
 	<?= $this->csrf()->formfield(); ?>
 
 	<nav class="main-navbar">
 		<span class="navbar-brand">
-			<?= $enc->html( $this->translate( 'admin', 'Catalog' ) ); ?>:
-			<?php if( $this->get( 'itemData/catalog.id' ) ) : ?>
-				<?= $enc->html( $this->get( 'itemData/catalog.id' ) ); ?> -
+			<?= $enc->html($this->translate('admin', 'Catalog')); ?>:
+			<?php if ($this->get('itemData/catalog.id')) : ?>
+				<?= $enc->html($this->get('itemData/catalog.id')); ?> -
 			<?php endif; ?>
-			<?= $enc->html( $this->get( 'itemData/catalog.label', $this->translate( 'admin', 'New' ) ) ); ?>
-			<?php if( $this->get( 'itemData/catalog.siteid' ) ) : ?>
-				<span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $this->get( 'itemData/catalog.siteid' ) ) ); ?>)</span>
+			<?= $enc->html($this->get('itemData/catalog.label', $this->translate('admin', 'New'))); ?>
+			<?php if ($this->get('itemData/catalog.siteid')) : ?>
+				<span class="navbar-secondary">(<?= $enc->html($this->site()->match($this->get('itemData/catalog.siteid'))); ?>)</span>
 			<?php endif; ?>
 		</span>
 
 		<div class="item-actions">
-			<?php if( isset( $this->itemData ) ) : ?>
-				<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard.php' ), ['params' => $params] ); ?>
+			<?php if (isset($this->itemData)) : ?>
+				<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard.php'), ['params' => $params]); ?>
 			<?php else : ?>
 				<span class="placeholder">&nbsp;</span>
 			<?php endif; ?>
@@ -101,7 +101,7 @@ 
 					<span class="btn btn-secondary fa expand-all" tabindex="1"></span>
 					<span class="btn btn-secondary fa collapse-all" tabindex="1"></span>
 				</div>
-				<input type="text" class="form-control search-input" tabindex="1" placeholder="<?= $enc->attr( $this->translate( 'admin', 'Find category' ) ); ?>">
+				<input type="text" class="form-control search-input" tabindex="1" placeholder="<?= $enc->attr($this->translate('admin', 'Find category')); ?>">
 				<div class="input-group-append">
 					<span class="btn btn-secondary fa act-delete " tabindex="1"></span>
 					<span class="btn btn-primary fa act-add" tabindex="1"></span>
@@ -111,7 +111,7 @@ 
 			</div>
 		</div>
 
-		<?php if( isset( $this->itemData ) ) : ?>
+		<?php if (isset($this->itemData)) : ?>
 
 			<div class="col-lg-9 catalog-content">
 				<div class="row">
@@ -121,14 +121,14 @@ 
 
 							<li class="nav-item basic">
 								<a class="nav-link active" href="#basic" data-toggle="tab" role="tab" aria-expanded="true" aria-controls="basic" tabindex="1">
-									<?= $enc->html( $this->translate( 'admin', 'Basic' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Basic')); ?>
 								</a>
 							</li>
 
-							<?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?>
-								<li class="nav-item <?= $enc->attr( $subpart ); ?>">
-									<a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>">
-										<?= $enc->html( $this->translate( 'admin', $subpart ) ); ?>
+							<?php foreach (array_values($this->get('itemSubparts', [])) as $idx => $subpart) : ?>
+								<li class="nav-item <?= $enc->attr($subpart); ?>">
+									<a class="nav-link" href="#<?= $enc->attr($subpart); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>">
+										<?= $enc->html($this->translate('admin', $subpart)); ?>
 									</a>
 								</li>
 							<?php endforeach; ?>
@@ -137,16 +137,16 @@ 
 
 						<div class="item-meta text-muted">
 							<small>
-								<?= $enc->html( $this->translate( 'admin', 'Modified' ) ); ?>:
-								<span class="meta-value"><?= $enc->html( $this->get( 'itemData/catalog.mtime' ) ); ?></span>
+								<?= $enc->html($this->translate('admin', 'Modified')); ?>:
+								<span class="meta-value"><?= $enc->html($this->get('itemData/catalog.mtime')); ?></span>
 							</small>
 							<small>
-								<?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?>:
-								<span class="meta-value"><?= $enc->html( $this->get( 'itemData/catalog.ctime' ) ); ?></span>
+								<?= $enc->html($this->translate('admin', 'Created')); ?>:
+								<span class="meta-value"><?= $enc->html($this->get('itemData/catalog.ctime')); ?></span>
 							</small>
 							<small>
-								<?= $enc->html( $this->translate( 'admin', 'Editor' ) ); ?>:
-								<span class="meta-value"><?= $enc->html( $this->get( 'itemData/catalog.editor' ) ); ?></span>
+								<?= $enc->html($this->translate('admin', 'Editor')); ?>:
+								<span class="meta-value"><?= $enc->html($this->get('itemData/catalog.editor')); ?></span>
 							</small>
 						</div>
 					</div>
@@ -155,89 +155,89 @@ 
 
 						<div id="basic" class="row item-basic tab-pane fade show active" role="tabpanel" aria-labelledby="basic">
 
-							<div class="col-xl-6 content-block <?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?>">
+							<div class="col-xl-6 content-block <?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?>">
 								<div class="form-group row mandatory">
-									<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label>
+									<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label>
 									<div class="col-sm-8">
 										<select class="form-control custom-select item-status" required="required" tabindex="1"
-											name="<?= $enc->attr( $this->formparam( array( 'item', 'catalog.status' ) ) ); ?>"
-											<?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?> >
+											name="<?= $enc->attr($this->formparam(array('item', 'catalog.status'))); ?>"
+											<?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?> >
 											<option value="">
-												<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+												<?= $enc->html($this->translate('admin', 'Please select')); ?>
 											</option>
-											<option value="1" <?= $selected( $this->get( 'itemData/catalog.status', 1 ), 1 ); ?> >
-												<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+											<option value="1" <?= $selected($this->get('itemData/catalog.status', 1), 1); ?> >
+												<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 											</option>
-											<option value="0" <?= $selected( $this->get( 'itemData/catalog.status', 1 ), 0 ); ?> >
-												<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+											<option value="0" <?= $selected($this->get('itemData/catalog.status', 1), 0); ?> >
+												<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 											</option>
-											<option value="-1" <?= $selected( $this->get( 'itemData/catalog.status', 1 ), -1 ); ?> >
-												<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+											<option value="-1" <?= $selected($this->get('itemData/catalog.status', 1), -1); ?> >
+												<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 											</option>
-											<option value="-2" <?= $selected( $this->get( 'itemData/catalog.status', 1 ), -2 ); ?> >
-												<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+											<option value="-2" <?= $selected($this->get('itemData/catalog.status', 1), -2); ?> >
+												<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 											</option>
 										</select>
 									</div>
 								</div>
 								<div class="form-group row mandatory">
-									<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Code' ) ); ?></label>
+									<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Code')); ?></label>
 									<div class="col-sm-8">
 										<input class="form-control item-code" type="text" required="required" tabindex="1"
-											name="<?= $enc->attr( $this->formparam( array( 'item', 'catalog.code' ) ) ); ?>"
-											placeholder="<?= $enc->attr( $this->translate( 'admin', 'Unique category code (required)' ) ); ?>"
-											value="<?= $enc->attr( $this->get( 'itemData/catalog.code' ) ); ?>"
-											<?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?> />
+											name="<?= $enc->attr($this->formparam(array('item', 'catalog.code'))); ?>"
+											placeholder="<?= $enc->attr($this->translate('admin', 'Unique category code (required)')); ?>"
+											value="<?= $enc->attr($this->get('itemData/catalog.code')); ?>"
+											<?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?> />
 									</div>
 									<div class="col-sm-12 form-text text-muted help-text">
-										<?= $enc->html( $this->translate( 'admin', 'Unique category code, either from external system or self-invented' ) ); ?>
+										<?= $enc->html($this->translate('admin', 'Unique category code, either from external system or self-invented')); ?>
 									</div>
 								</div>
 								<div class="form-group row mandatory">
-									<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Label' ) ); ?></label>
+									<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Label')); ?></label>
 									<div class="col-sm-8">
 										<input class="form-control item-label" type="text" required="required" tabindex="1"
-											name="<?= $this->formparam( array( 'item', 'catalog.label' ) ); ?>"
-											placeholder="<?= $enc->attr( $this->translate( 'admin', 'Internal name (required)' ) ); ?>"
-											value="<?= $enc->attr( $this->get( 'itemData/catalog.label' ) ); ?>"
-											<?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?> />
+											name="<?= $this->formparam(array('item', 'catalog.label')); ?>"
+											placeholder="<?= $enc->attr($this->translate('admin', 'Internal name (required)')); ?>"
+											value="<?= $enc->attr($this->get('itemData/catalog.label')); ?>"
+											<?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?> />
 									</div>
 									<div class="col-sm-12 form-text text-muted help-text">
-										<?= $enc->html( $this->translate( 'admin', 'Internal category name, will be used on the web site if no name for the language is available' ) ); ?>
+										<?= $enc->html($this->translate('admin', 'Internal category name, will be used on the web site if no name for the language is available')); ?>
 									</div>
 								</div>
 								<div class="form-group row optional warning">
-									<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'URL target' ) ); ?></label>
+									<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'URL target')); ?></label>
 									<div class="col-sm-8">
 										<input class="form-control item-target" type="text" tabindex="1"
-											name="<?= $enc->attr( $this->formparam( array( 'item', 'catalog.target' ) ) ); ?>"
-											placeholder="<?= $enc->attr( $this->translate( 'admin', 'Route or page ID (optional)' ) ); ?>"
-											value="<?= $enc->attr( $this->get( 'itemData/catalog.target' ) ); ?>"
-											<?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?> />
+											name="<?= $enc->attr($this->formparam(array('item', 'catalog.target'))); ?>"
+											placeholder="<?= $enc->attr($this->translate('admin', 'Route or page ID (optional)')); ?>"
+											value="<?= $enc->attr($this->get('itemData/catalog.target')); ?>"
+											<?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?> />
 									</div>
 									<div class="col-sm-12 form-text text-muted help-text">
-										<?= $enc->html( $this->translate( 'admin', 'Route name or page ID of the category page if this category should shown on a different page' ) ); ?>
+										<?= $enc->html($this->translate('admin', 'Route name or page ID of the category page if this category should shown on a different page')); ?>
 									</div>
 								</div>
 							</div><!--
 
-							--><div class="col-xl-6 content-block <?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?>">
-								<table class="item-config table table-striped" data-keys="<?= $enc->attr( json_encode( $cfgSuggest ) ); ?>">
+							--><div class="col-xl-6 content-block <?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?>">
+								<table class="item-config table table-striped" data-keys="<?= $enc->attr(json_encode($cfgSuggest)); ?>">
 									<thead>
 										<tr>
 											<th>
-												<span class="help"><?= $enc->html( $this->translate( 'admin', 'Option' ) ); ?></span>
+												<span class="help"><?= $enc->html($this->translate('admin', 'Option')); ?></span>
 												<div class="form-text text-muted help-text">
-													<?= $enc->html( $this->translate( 'admin', 'Category specific configuration options, will be available as key/value pairs in the templates' ) ); ?>
+													<?= $enc->html($this->translate('admin', 'Category specific configuration options, will be available as key/value pairs in the templates')); ?>
 												</div>
 											</th>
 											<th>
-												<?= $enc->html( $this->translate( 'admin', 'Value' ) ); ?>
+												<?= $enc->html($this->translate('admin', 'Value')); ?>
 											</th>
 											<th class="actions">
-												<?php if( !$this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ) ) : ?>
+												<?php if (!$this->site()->readonly($this->get('itemData/catalog.siteid'))) : ?>
 													<div class="btn act-add fa" tabindex="1"
-														title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>">
+														title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>">
 													</div>
 												<?php endif; ?>
 											</th>
@@ -245,24 +245,24 @@ 
 									</thead>
 									<tbody>
 
-										<?php foreach( (array) $this->get( 'itemData/config/key', [] ) as $idx => $key ) : ?>
+										<?php foreach ((array) $this->get('itemData/config/key', []) as $idx => $key) : ?>
 											<tr class="config-item">
 												<td>
 													<input type="text" class="config-key form-control" tabindex="1"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'key', '' ) ) ); ?>"
-														value="<?= $enc->attr( $this->get( 'itemData/config/key/' . $idx, $key ) ); ?>"
-														<?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?> />
+														name="<?= $enc->attr($this->formparam(array('item', 'config', 'key', ''))); ?>"
+														value="<?= $enc->attr($this->get('itemData/config/key/' . $idx, $key)); ?>"
+														<?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?> />
 												</td>
 												<td>
 													<input type="text" class="config-value form-control" tabindex="1"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>"
-														value="<?= $enc->attr( $this->get( 'itemData/config/val/' . $idx ) ); ?>"
-														<?= $this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ); ?> />
+														name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>"
+														value="<?= $enc->attr($this->get('itemData/config/val/' . $idx)); ?>"
+														<?= $this->site()->readonly($this->get('itemData/catalog.siteid')); ?> />
 												</td>
 												<td class="actions">
-													<?php if( !$this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ) ) : ?>
+													<?php if (!$this->site()->readonly($this->get('itemData/catalog.siteid'))) : ?>
 														<div class="btn act-delete fa" tabindex="1"
-															title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+															title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 														</div>
 													<?php endif; ?>
 												</td>
@@ -272,16 +272,16 @@ 
 										<tr class="prototype">
 											<td>
 												<input type="text" class="config-key form-control" tabindex="1" disabled="disabled"
-													name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'key', '' ) ) ); ?>" />
+													name="<?= $enc->attr($this->formparam(array('item', 'config', 'key', ''))); ?>" />
 											</td>
 											<td>
 												<input type="text" class="config-value form-control" tabindex="1" disabled="disabled"
-													name="<?= $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>" />
+													name="<?= $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>" />
 											</td>
 											<td class="actions">
-												<?php if( !$this->site()->readonly( $this->get( 'itemData/catalog.siteid' ) ) ) : ?>
+												<?php if (!$this->site()->readonly($this->get('itemData/catalog.siteid'))) : ?>
 													<div class="btn act-delete fa" tabindex="1"
-														title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+														title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 													</div>
 												<?php endif; ?>
 											</td>
@@ -292,12 +292,12 @@ 
 
 						</div>
 
-						<?= $this->get( 'itemBody' ); ?>
+						<?= $this->get('itemBody'); ?>
 
 					</div>
 
 					<div class="item-actions">
-						<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard.php' ), ['params' => $params] ); ?>
+						<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard.php'), ['params' => $params]); ?>
 					</div>
 				</div>
 
@@ -311,4 +311,4 @@ 
 <?php $this->block()->stop(); ?>
 
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard.php' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard.php')); ?>

admin/jqadm/templates/dashboard/list-order-standard.php

Spacing +3 added lines, -3 removed lines

@@ -6,10 +6,10 @@
  */
 
 $enc = $this->encoder();
-$currencies = array_keys( $this->get( 'orderCurrencyItems', [] ) );
+$currencies = array_keys($this->get('orderCurrencyItems', []));
 
 
 ?>
-<div class="dashboard-order row" data-currencies="<?= $enc->attr( json_encode( $currencies ) ) ?>">
-	<?= $this->get( 'orderBody' ); ?>
+<div class="dashboard-order row" data-currencies="<?= $enc->attr(json_encode($currencies)) ?>">
+	<?= $this->get('orderBody'); ?>
 </div>

admin/jqadm/src/Admin/JQAdm/Plugin/Standard.php

Braces +13 added lines, -26 removed lines

@@ -92,14 +92,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -144,14 +142,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -192,14 +188,12 @@ 
 
 			$this->nextAction( $view, 'search', 'plugin', null, 'delete' );
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -244,14 +238,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -288,18 +280,15 @@ 
 
 			$this->nextAction( $view, $view->param( 'next' ), 'plugin', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -342,14 +331,12 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +124 added lines, -124 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Plugin;
 
-sprintf( 'plugin' ); // for translation
+sprintf('plugin'); // for translation
 
 
 /**
@@ -35,41 +35,41 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'plugin' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'plugin');
 
-			$view->item = $manager->getItem( $id );
-			$view->itemData = $this->toArray( $view->item, true );
+			$view->item = $manager->getItem($id);
+			$view->itemData = $this->toArray($view->item, true);
 			$view->itemSubparts = $this->getSubClientNames();
 			$view->itemProviders = $this->getProviderNames();
 			$view->itemDecorators = $this->getDecoratorNames();
-			$view->itemAttributes = $this->getConfigAttributes( $view->item );
+			$view->itemAttributes = $this->getConfigAttributes($view->item);
 			$view->itemTypes = $this->getTypeItems();
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('plugin-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -85,10 +85,10 @@ 
 
 		try
 		{
-			$data = $view->param( 'item', [] );
+			$data = $view->param('item', []);
 
-			if( !isset( $view->item ) ) {
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'plugin' )->createItem();
+			if (!isset($view->item)) {
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'plugin')->createItem();
 			}
 
 			$data['plugin.siteid'] = $view->item->getSiteId();
@@ -100,26 +100,26 @@ 
 			$view->itemData = $data;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('plugin-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -133,38 +133,38 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'plugin' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'plugin');
 		$manager->begin();
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$view->item = $manager->getItem( $id );
+			$view->item = $manager->getItem($id);
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$client->delete();
 			}
 
-			$manager->deleteItem( $id );
+			$manager->deleteItem($id);
 			$manager->commit();
 
-			$this->nextAction( $view, 'search', 'plugin', null, 'delete' );
+			$this->nextAction($view, 'search', 'plugin', null, 'delete');
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('plugin-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -185,41 +185,41 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'plugin' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'plugin');
 
-			$view->item = $manager->getItem( $id );
-			$view->itemData = $this->toArray( $view->item );
+			$view->item = $manager->getItem($id);
+			$view->itemData = $this->toArray($view->item);
 			$view->itemSubparts = $this->getSubClientNames();
 			$view->itemDecorators = $this->getDecoratorNames();
 			$view->itemProviders = $this->getProviderNames();
-			$view->itemAttributes = $this->getConfigAttributes( $view->item );
+			$view->itemAttributes = $this->getConfigAttributes($view->item);
 			$view->itemTypes = $this->getTypeItems();
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('plugin-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -233,40 +233,40 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'plugin' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'plugin');
 		$manager->begin();
 
 		try
 		{
-			$item = $this->fromArray( $view->param( 'item', [] ) );
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
+			$item = $this->fromArray($view->param('item', []));
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->save();
 			}
 
-			$manager->saveItem( clone $view->item );
+			$manager->saveItem(clone $view->item);
 			$manager->commit();
 
-			$this->nextAction( $view, $view->param( 'next' ), 'plugin', $view->item->getId(), 'save' );
+			$this->nextAction($view, $view->param('next'), 'plugin', $view->item->getId(), 'save');
 			return;
 		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
 		{
 			// fall through to create
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('plugin-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -288,35 +288,35 @@ 
 		try
 		{
 			$total = 0;
-			$params = $this->storeSearchParams( $view->param(), 'plugin' );
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'plugin' );
+			$params = $this->storeSearchParams($view->param(), 'plugin');
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'plugin');
 
 			$search = $manager->createSearch();
-			$search->setSortations( [$search->sort( '+', 'plugin.typeid' ), $search->sort( '+', 'plugin.position' )] );
-			$search = $this->initCriteria( $search, $params );
+			$search->setSortations([$search->sort('+', 'plugin.typeid'), $search->sort('+', 'plugin.position')]);
+			$search = $this->initCriteria($search, $params);
 
-			$view->items = $manager->searchItems( $search, [], $total );
-			$view->filterAttributes = $manager->getSearchAttributes( true );
+			$view->items = $manager->searchItems($search, [], $total);
+			$view->filterAttributes = $manager->getSearchAttributes(true);
 			$view->filterOperators = $search->getOperators();
 			$view->itemTypes = $this->getTypeItems();
 			$view->total = $total;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->search();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'plugin-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('plugin-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('plugin-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		/** admin/jqadm/plugin/template-list
@@ -341,7 +341,7 @@ 
 		$tplconf = 'admin/jqadm/plugin/template-list';
 		$default = 'plugin/list-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -352,7 +352,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/plugin/decorators/excludes
 		 * Excludes decorators added by the "common" option from the plugin JQAdm client
@@ -427,7 +427,7 @@ 
 		 * @see admin/jqadm/plugin/decorators/excludes
 		 * @see admin/jqadm/plugin/decorators/global
 		 */
-		return $this->createSubClient( 'plugin/' . $type, $name );
+		return $this->createSubClient('plugin/' . $type, $name);
 	}
 
 
@@ -437,13 +437,13 @@ 
 	 * @param \Aimeos\MShop\Plugin\Item\Iface $item Plugin item incl. provider/decorator property
 	 * @return \Aimeos\MW\Common\Critera\Attribute\Iface[] List of configuration attributes
 	 */
-	public function getConfigAttributes( \Aimeos\MShop\Plugin\Item\Iface $item )
+	public function getConfigAttributes(\Aimeos\MShop\Plugin\Item\Iface $item)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'plugin' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'plugin');
 
 		try {
-			return $manager->getProvider( $item, $item->getType() )->getConfigBE();
-		} catch( \Aimeos\MShop\Exception $e ) {
+			return $manager->getProvider($item, $item->getType())->getConfigBE();
+		} catch (\Aimeos\MShop\Exception $e) {
 			return [];
 		}
 	}
@@ -457,7 +457,7 @@ 
 	protected function getDecoratorNames()
 	{
 		$ds = DIRECTORY_SEPARATOR;
-		return $this->getClassNames( 'MShop' . $ds . 'Plugin' . $ds . 'Provider' . $ds . 'Decorator' );
+		return $this->getClassNames('MShop' . $ds . 'Plugin' . $ds . 'Provider' . $ds . 'Decorator');
 	}
 
 
@@ -470,7 +470,7 @@ 
 	{
 		$ds = DIRECTORY_SEPARATOR;
 		return [
-			'order' => $this->getClassNames( 'MShop' . $ds . 'Plugin' . $ds . 'Provider' . $ds . 'Order' )
+			'order' => $this->getClassNames('MShop' . $ds . 'Plugin' . $ds . 'Provider' . $ds . 'Order')
 		];
 	}
 
@@ -515,7 +515,7 @@ 
 		 * @since 2017.10
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/plugin/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/plugin/standard/subparts', []);
 	}
 
 
@@ -526,12 +526,12 @@ 
 	 */
 	protected function getTypeItems()
 	{
-		$typeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'plugin/type' );
+		$typeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'plugin/type');
 
-		$search = $typeManager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setSortations( array( $search->sort( '+', 'plugin.type.label' ) ) );
+		$search = $typeManager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setSortations(array($search->sort('+', 'plugin.type.label')));
 
-		return $typeManager->searchItems( $search );
+		return $typeManager->searchItems($search);
 	}
 
 
@@ -541,17 +541,17 @@ 
 	 * @param string[] Data array
 	 * @return \Aimeos\MShop\Plugin\Item\Iface New plugin item object
 	 */
-	protected function fromArray( array $data )
+	protected function fromArray(array $data)
 	{
 		$conf = [];
 
-		if( isset( $data['config']['key'] ) )
+		if (isset($data['config']['key']))
 		{
-			foreach( (array) $data['config']['key'] as $idx => $key )
+			foreach ((array) $data['config']['key'] as $idx => $key)
 			{
-				if( trim( $key ) !== '' && isset( $data['config']['val'][$idx] ) )
+				if (trim($key) !== '' && isset($data['config']['val'][$idx]))
 				{
-					if( ( $val = json_decode( $data['config']['val'][$idx] ) ) === null ) {
+					if (($val = json_decode($data['config']['val'][$idx])) === null) {
 						$conf[$key] = $data['config']['val'][$idx];
 					} else {
 						$conf[$key] = $val;
@@ -560,17 +560,17 @@ 
 			}
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'plugin' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'plugin');
 
-		if( isset( $data['plugin.id'] ) && $data['plugin.id'] != '' ) {
-			$item = $manager->getItem( $data['plugin.id'], $this->getDomains() );
+		if (isset($data['plugin.id']) && $data['plugin.id'] != '') {
+			$item = $manager->getItem($data['plugin.id'], $this->getDomains());
 		} else {
-			$typeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'plugin/type' );
-			$item = $manager->createItem( $typeManager->getItem( $data['plugin.typeid'] )->getCode(), 'plugin' );
+			$typeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'plugin/type');
+			$item = $manager->createItem($typeManager->getItem($data['plugin.typeid'])->getCode(), 'plugin');
 		}
 
-		$item->fromArray( $data );
-		$item->setConfig( $conf );
+		$item->fromArray($data);
+		$item->setConfig($conf);
 
 		return $item;
 	}
@@ -582,21 +582,21 @@ 
 	 * @param \Aimeos\MShop\Plugin\Item\Iface $item Plugin item object
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Plugin\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Plugin\Item\Iface $item, $copy = false)
 	{
 		$config = $item->getConfig();
-		$data = $item->toArray( true );
+		$data = $item->toArray(true);
 		$data['config'] = [];
 
-		if( $copy === true )
+		if ($copy === true)
 		{
 			$data['plugin.siteid'] = $this->getContext()->getLocale()->getSiteId();
 			$data['plugin.id'] = '';
 		}
 
-		ksort( $config );
+		ksort($config);
 
-		foreach( $config as $key => $value )
+		foreach ($config as $key => $value)
 		{
 			$data['config']['key'][] = $key;
 			$data['config']['val'][] = $value;
@@ -612,7 +612,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/plugin/template-item
 		 * Relative path to the HTML body template for the plugin item.
@@ -636,6 +636,6 @@ 
 		$tplconf = 'admin/jqadm/plugin/template-item';
 		$default = 'plugin/item-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

admin/jqadm/src/Admin/JQAdm/Dashboard/Standard.php

Braces +2 added lines, -4 removed lines

@@ -111,14 +111,12 @@
 			foreach( $this->getSubClients() as $client ) {
 				$view->listBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'dashboard' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'dashboard' => $e->getMessage() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +14 added lines, -14 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Dashboard;
 
-sprintf( 'dashboard' ); // for translation
+sprintf('dashboard'); // for translation
 
 
 /**
@@ -49,21 +49,21 @@ 
 		{
 			$view->listBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->listBody .= $client->search();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'dashboard' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('dashboard' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'dashboard' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('dashboard' => $e->getMessage());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		/** admin/jqadm/dashboard/template-list
@@ -88,7 +88,7 @@ 
 		$tplconf = 'admin/jqadm/dashboard/template-list';
 		$default = 'dashboard/list-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -99,7 +99,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/dashboard/decorators/excludes
 		 * Excludes decorators added by the "common" option from the dashboard JQAdm client
@@ -174,7 +174,7 @@ 
 		 * @see admin/jqadm/dashboard/decorators/excludes
 		 * @see admin/jqadm/dashboard/decorators/global
 		 */
-		return $this->createSubClient( 'dashboard/' . $type, $name );
+		return $this->createSubClient('dashboard/' . $type, $name);
 	}
 
 
@@ -218,6 +218,6 @@ 
 		 * @since 2016.07
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/dashboard/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/dashboard/standard/subparts', []);
 	}
 }

admin/jqadm/src/Admin/JQAdm/Service/Standard.php

Braces +13 added lines, -26 removed lines

@@ -125,14 +125,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -177,14 +175,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -225,14 +221,12 @@ 
 
 			$this->nextAction( $view, 'search', 'service', null, 'delete' );
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -277,14 +271,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -321,18 +313,15 @@ 
 
 			$this->nextAction( $view, $view->param( 'next' ), 'service', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -375,14 +364,12 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +128 added lines, -128 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Service;
 
-sprintf( 'service' ); // for translation
+sprintf('service'); // for translation
 
 
 /**
@@ -35,41 +35,41 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'service');
 
-			$view->item = $manager->getItem( $id, $this->getDomains() );
-			$view->itemData = $this->toArray( $view->item, true );
+			$view->item = $manager->getItem($id, $this->getDomains());
+			$view->itemData = $this->toArray($view->item, true);
 			$view->itemSubparts = $this->getSubClientNames();
 			$view->itemProviders = $this->getProviderNames();
 			$view->itemDecorators = $this->getDecoratorNames();
-			$view->itemAttributes = $this->getConfigAttributes( $view->item );
+			$view->itemAttributes = $this->getConfigAttributes($view->item);
 			$view->itemTypes = $this->getTypeItems();
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -85,10 +85,10 @@ 
 
 		try
 		{
-			$data = $view->param( 'item', [] );
+			$data = $view->param('item', []);
 
-			if( !isset( $view->item ) ) {
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'service' )->createItem();
+			if (!isset($view->item)) {
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'service')->createItem();
 			}
 
 			$data['service.siteid'] = $view->item->getSiteId();
@@ -100,26 +100,26 @@ 
 			$view->itemData = $data;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -133,39 +133,39 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'service');
 		$manager->begin();
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$view->item = $manager->getItem( $id, $this->getDomains() );
+			$view->item = $manager->getItem($id, $this->getDomains());
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$client->delete();
 			}
 
-			$manager->saveItem( $view->item );
-			$manager->deleteItem( $id );
+			$manager->saveItem($view->item);
+			$manager->deleteItem($id);
 			$manager->commit();
 
-			$this->nextAction( $view, 'search', 'service', null, 'delete' );
+			$this->nextAction($view, 'search', 'service', null, 'delete');
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -186,41 +186,41 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'service');
 
-			$view->item = $manager->getItem( $id, $this->getDomains() );
-			$view->itemData = $this->toArray( $view->item );
+			$view->item = $manager->getItem($id, $this->getDomains());
+			$view->itemData = $this->toArray($view->item);
 			$view->itemSubparts = $this->getSubClientNames();
 			$view->itemDecorators = $this->getDecoratorNames();
 			$view->itemProviders = $this->getProviderNames();
-			$view->itemAttributes = $this->getConfigAttributes( $view->item );
+			$view->itemAttributes = $this->getConfigAttributes($view->item);
 			$view->itemTypes = $this->getTypeItems();
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -234,40 +234,40 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'service');
 		$manager->begin();
 
 		try
 		{
-			$item = $this->fromArray( $view->param( 'item', [] ) );
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
+			$item = $this->fromArray($view->param('item', []));
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->save();
 			}
 
-			$manager->saveItem( clone $view->item );
+			$manager->saveItem(clone $view->item);
 			$manager->commit();
 
-			$this->nextAction( $view, $view->param( 'next' ), 'service', $view->item->getId(), 'save' );
+			$this->nextAction($view, $view->param('next'), 'service', $view->item->getId(), 'save');
 			return;
 		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
 		{
 			// fall through to create
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -289,35 +289,35 @@ 
 		try
 		{
 			$total = 0;
-			$params = $this->storeSearchParams( $view->param(), 'service' );
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+			$params = $this->storeSearchParams($view->param(), 'service');
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'service');
 
 			$search = $manager->createSearch();
-			$search->setSortations( [$search->sort( '+', 'service.typeid' ), $search->sort( '+', 'service.position' )] );
-			$search = $this->initCriteria( $search, $params );
+			$search->setSortations([$search->sort('+', 'service.typeid'), $search->sort('+', 'service.position')]);
+			$search = $this->initCriteria($search, $params);
 
-			$view->items = $manager->searchItems( $search, $this->getDomains(), $total );
-			$view->filterAttributes = $manager->getSearchAttributes( true );
+			$view->items = $manager->searchItems($search, $this->getDomains(), $total);
+			$view->filterAttributes = $manager->getSearchAttributes(true);
 			$view->filterOperators = $search->getOperators();
 			$view->itemTypes = $this->getTypeItems();
 			$view->total = $total;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->search();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		/** admin/jqadm/service/template-list
@@ -342,7 +342,7 @@ 
 		$tplconf = 'admin/jqadm/service/template-list';
 		$default = 'service/list-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -353,7 +353,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/service/decorators/excludes
 		 * Excludes decorators added by the "common" option from the service JQAdm client
@@ -428,7 +428,7 @@ 
 		 * @see admin/jqadm/service/decorators/excludes
 		 * @see admin/jqadm/service/decorators/global
 		 */
-		return $this->createSubClient( 'service/' . $type, $name );
+		return $this->createSubClient('service/' . $type, $name);
 	}
 
 
@@ -438,13 +438,13 @@ 
 	 * @param \Aimeos\MShop\Service\Item\Iface $item Service item incl. provider/decorator property
 	 * @return \Aimeos\MW\Common\Critera\Attribute\Iface[] List of configuration attributes
 	 */
-	public function getConfigAttributes( \Aimeos\MShop\Service\Item\Iface $item )
+	public function getConfigAttributes(\Aimeos\MShop\Service\Item\Iface $item)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
 
 		try {
-			return $manager->getProvider( $item, $item->getType() )->getConfigBE();
-		} catch( \Aimeos\MShop\Exception $e ) {
+			return $manager->getProvider($item, $item->getType())->getConfigBE();
+		} catch (\Aimeos\MShop\Exception $e) {
 			return [];
 		}
 	}
@@ -468,9 +468,9 @@ 
 		 * @since 2017.10
 		 * @category Developer
 		 */
-		$domains = array( 'media', 'price', 'text' );
+		$domains = array('media', 'price', 'text');
 
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/service/domains', $domains );
+		return $this->getContext()->getConfig()->get('admin/jqadm/service/domains', $domains);
 	}
 
 
@@ -482,7 +482,7 @@ 
 	protected function getDecoratorNames()
 	{
 		$ds = DIRECTORY_SEPARATOR;
-		return $this->getClassNames( 'MShop' . $ds . 'Service' . $ds . 'Provider' . $ds . 'Decorator' );
+		return $this->getClassNames('MShop' . $ds . 'Service' . $ds . 'Provider' . $ds . 'Decorator');
 	}
 
 
@@ -495,8 +495,8 @@ 
 	{
 		$ds = DIRECTORY_SEPARATOR;
 		return [
-			'delivery' => $this->getClassNames( 'MShop' . $ds . 'Service' . $ds . 'Provider' . $ds . 'Delivery' ),
-			'payment' => $this->getClassNames( 'MShop' . $ds . 'Service' . $ds . 'Provider' . $ds . 'Payment' ),
+			'delivery' => $this->getClassNames('MShop' . $ds . 'Service' . $ds . 'Provider' . $ds . 'Delivery'),
+			'payment' => $this->getClassNames('MShop' . $ds . 'Service' . $ds . 'Provider' . $ds . 'Payment'),
 		];
 	}
 
@@ -541,7 +541,7 @@ 
 		 * @since 2017.10
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/service/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/service/standard/subparts', []);
 	}
 
 
@@ -552,12 +552,12 @@ 
 	 */
 	protected function getTypeItems()
 	{
-		$typeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service/type' );
+		$typeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service/type');
 
-		$search = $typeManager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setSortations( array( $search->sort( '+', 'service.type.label' ) ) );
+		$search = $typeManager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setSortations(array($search->sort('+', 'service.type.label')));
 
-		return $typeManager->searchItems( $search );
+		return $typeManager->searchItems($search);
 	}
 
 
@@ -567,17 +567,17 @@ 
 	 * @param string[] Data array
 	 * @return \Aimeos\MShop\Service\Item\Iface New service item object
 	 */
-	protected function fromArray( array $data )
+	protected function fromArray(array $data)
 	{
 		$conf = [];
 
-		if( isset( $data['config']['key'] ) )
+		if (isset($data['config']['key']))
 		{
-			foreach( (array) $data['config']['key'] as $idx => $key )
+			foreach ((array) $data['config']['key'] as $idx => $key)
 			{
-				if( trim( $key ) !== '' && isset( $data['config']['val'][$idx] ) )
+				if (trim($key) !== '' && isset($data['config']['val'][$idx]))
 				{
-					if( ( $val = json_decode( $data['config']['val'][$idx] ) ) === null ) {
+					if (($val = json_decode($data['config']['val'][$idx])) === null) {
 						$conf[$key] = $data['config']['val'][$idx];
 					} else {
 						$conf[$key] = $val;
@@ -586,17 +586,17 @@ 
 			}
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
 
-		if( isset( $data['service.id'] ) && $data['service.id'] != '' ) {
-			$item = $manager->getItem( $data['service.id'], $this->getDomains() );
+		if (isset($data['service.id']) && $data['service.id'] != '') {
+			$item = $manager->getItem($data['service.id'], $this->getDomains());
 		} else {
-			$typeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service/type' );
-			$item = $manager->createItem( $typeManager->getItem( $data['service.typeid'] )->getCode(), 'service' );
+			$typeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service/type');
+			$item = $manager->createItem($typeManager->getItem($data['service.typeid'])->getCode(), 'service');
 		}
 
-		$item->fromArray( $data );
-		$item->setConfig( $conf );
+		$item->fromArray($data);
+		$item->setConfig($conf);
 
 		return $item;
 	}
@@ -608,22 +608,22 @@ 
 	 * @param \Aimeos\MShop\Service\Item\Iface $item Service item object
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Service\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Service\Item\Iface $item, $copy = false)
 	{
 		$config = $item->getConfig();
-		$data = $item->toArray( true );
+		$data = $item->toArray(true);
 		$data['config'] = [];
 
-		if( $copy === true )
+		if ($copy === true)
 		{
 			$data['service.siteid'] = $this->getContext()->getLocale()->getSiteId();
 			$data['service.code'] = $data['service.code'] . '_copy';
 			$data['service.id'] = '';
 		}
 
-		ksort( $config );
+		ksort($config);
 
-		foreach( $config as $key => $value )
+		foreach ($config as $key => $value)
 		{
 			$data['config']['key'][] = $key;
 			$data['config']['val'][] = $value;
@@ -639,7 +639,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/service/template-item
 		 * Relative path to the HTML body template for the service item.
@@ -663,6 +663,6 @@ 
 		$tplconf = 'admin/jqadm/service/template-item';
 		$default = 'service/item-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

admin/jqadm/src/Admin/JQAdm/Customer/Standard.php

Braces +13 added lines, -26 removed lines

@@ -122,14 +122,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -172,14 +170,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -220,14 +216,12 @@ 
 
 			$this->nextAction( $view, 'search', 'customer', null, 'delete' );
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -269,14 +263,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -313,18 +305,15 @@ 
 
 			$this->nextAction( $view, $view->param( 'next' ), 'customer', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -363,14 +352,12 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +112 added lines, -112 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Customer;
 
-sprintf( 'customer' ); // for translation
+sprintf('customer'); // for translation
 
 
 /**
@@ -35,38 +35,38 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-			$view->item = $manager->getItem( $id, $this->getDomains() );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
+			$view->item = $manager->getItem($id, $this->getDomains());
 
-			$view->itemData = $this->toArray( $view->item, true );
+			$view->itemData = $this->toArray($view->item, true);
 			$view->itemSubparts = $this->getSubClientNames();
 			$view->itemGroups = $this->getGroupItems();
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -82,10 +82,10 @@ 
 
 		try
 		{
-			$data = $view->param( 'item', [] );
+			$data = $view->param('item', []);
 
-			if( !isset( $view->item ) ) {
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'customer' )->createItem();
+			if (!isset($view->item)) {
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'customer')->createItem();
 			}
 
 			$data['customer.siteid'] = $view->item->getSiteId();
@@ -95,26 +95,26 @@ 
 			$view->itemData = $data;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -128,39 +128,39 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
 		$manager->begin();
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$view->item = $manager->getItem( $id, $this->getDomains() );
+			$view->item = $manager->getItem($id, $this->getDomains());
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$client->delete();
 			}
 
-			$manager->saveItem( $view->item );
-			$manager->deleteItem( $id );
+			$manager->saveItem($view->item);
+			$manager->deleteItem($id);
 			$manager->commit();
 
-			$this->nextAction( $view, 'search', 'customer', null, 'delete' );
+			$this->nextAction($view, 'search', 'customer', null, 'delete');
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -181,38 +181,38 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
 
-			$view->item = $manager->getItem( $id, $this->getDomains() );
+			$view->item = $manager->getItem($id, $this->getDomains());
 			$view->itemSubparts = $this->getSubClientNames();
-			$view->itemData = $this->toArray( $view->item );
+			$view->itemData = $this->toArray($view->item);
 			$view->itemGroups = $this->getGroupItems();
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -226,40 +226,40 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
 		$manager->begin();
 
 		try
 		{
-			$item = $this->fromArray( $view->param( 'item', [] ) );
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
+			$item = $this->fromArray($view->param('item', []));
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->save();
 			}
 
-			$manager->saveItem( clone $view->item );
+			$manager->saveItem(clone $view->item);
 			$manager->commit();
 
-			$this->nextAction( $view, $view->param( 'next' ), 'customer', $view->item->getId(), 'save' );
+			$this->nextAction($view, $view->param('next'), 'customer', $view->item->getId(), 'save');
 			return;
 		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
 		{
 			// fall through to create
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -281,31 +281,31 @@ 
 		try
 		{
 			$total = 0;
-			$params = $this->storeSearchParams( $view->param(), 'customer' );
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-			$search = $this->initCriteria( $manager->createSearch(), $params );
+			$params = $this->storeSearchParams($view->param(), 'customer');
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
+			$search = $this->initCriteria($manager->createSearch(), $params);
 
-			$view->items = $manager->searchItems( $search, $this->getDomains(), $total );
-			$view->filterAttributes = $manager->getSearchAttributes( true );
+			$view->items = $manager->searchItems($search, $this->getDomains(), $total);
+			$view->filterAttributes = $manager->getSearchAttributes(true);
 			$view->filterOperators = $search->getOperators();
 			$view->total = $total;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->search();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		/** admin/jqadm/customer/template-list
@@ -330,7 +330,7 @@ 
 		$tplconf = 'admin/jqadm/customer/template-list';
 		$default = 'customer/list-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -341,7 +341,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/customer/decorators/excludes
 		 * Excludes decorators added by the "common" option from the customer JQAdm client
@@ -416,7 +416,7 @@ 
 		 * @see admin/jqadm/customer/decorators/excludes
 		 * @see admin/jqadm/customer/decorators/global
 		 */
-		return $this->createSubClient( 'customer/' . $type, $name );
+		return $this->createSubClient('customer/' . $type, $name);
 	}
 
 
@@ -440,7 +440,7 @@ 
 		 */
 		$domains = ['customer/address', 'customer/group', 'customer/property'];
 
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/customer/domains', $domains );
+		return $this->getContext()->getConfig()->get('admin/jqadm/customer/domains', $domains);
 	}
 
 
@@ -452,20 +452,20 @@ 
 	protected function getGroupItems()
 	{
 		$list = [];
-		$isSuper = $this->getView()->access( ['super'] );
-		$isAdmin = $this->getView()->access( ['admin'] );
+		$isSuper = $this->getView()->access(['super']);
+		$isAdmin = $this->getView()->access(['admin']);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/group' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/group');
 		$search = $manager->createSearch();
-		$search->setSortations( [$search->sort( '+', 'customer.group.label' )] );
+		$search->setSortations([$search->sort('+', 'customer.group.label')]);
 
-		foreach( $manager->searchItems( $search ) as $groupId => $groupItem )
+		foreach ($manager->searchItems($search) as $groupId => $groupItem)
 		{
-			if( !$isSuper && in_array( $groupItem->getCode(), ['super'] ) ) {
+			if (!$isSuper && in_array($groupItem->getCode(), ['super'])) {
 				continue;
 			}
 
-			if( !$isSuper && !$isAdmin && in_array( $groupItem->getCode(), ['super', 'admin', 'editor'] ) ) {
+			if (!$isSuper && !$isAdmin && in_array($groupItem->getCode(), ['super', 'admin', 'editor'])) {
 				continue;
 			}
 
@@ -516,7 +516,7 @@ 
 		 * @since 2017.07
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/customer/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/customer/standard/subparts', []);
 	}
 
 
@@ -527,21 +527,21 @@ 
 	 * @param string[] Data array
 	 * @return \Aimeos\MShop\Customer\Item\Iface New customer item object
 	 */
-	protected function fromArray( array $data )
+	protected function fromArray(array $data)
 	{
 		$data['customer.label'] = $data['customer.firstname'] . ' ' . $data['customer.lastname'];
 		$data['customer.code'] = $data['customer.email'];
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
 
-		if( isset( $data['customer.id'] ) && $data['customer.id'] != '' ) {
-			$item = $manager->getItem( $data['customer.id'], $this->getDomains() );
+		if (isset($data['customer.id']) && $data['customer.id'] != '') {
+			$item = $manager->getItem($data['customer.id'], $this->getDomains());
 		} else {
 			$item = $manager->createItem();
 		}
 
-		$item->fromArray( $data );
-		$item->setGroups( array_intersect( array_keys( $this->getGroupItems() ), $item->getGroups() ) );
+		$item->fromArray($data);
+		$item->setGroups(array_intersect(array_keys($this->getGroupItems()), $item->getGroups()));
 
 		return $item;
 	}
@@ -553,11 +553,11 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item object
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Customer\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Customer\Item\Iface $item, $copy = false)
 	{
-		$data = $item->toArray( true );
+		$data = $item->toArray(true);
 
-		if( $copy === true )
+		if ($copy === true)
 		{
 			$data['customer.siteid'] = $this->getContext()->getLocale()->getSiteId();
 			$data['customer.email'] = '';
@@ -574,7 +574,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/customer/template-item
 		 * Relative path to the HTML body template for the customer item.
@@ -598,6 +598,6 @@ 
 		$tplconf = 'admin/jqadm/customer/template-item';
 		$default = 'customer/item-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

admin/jqadm/src/Admin/JQAdm/Log/Standard.php

Braces +2 added lines, -4 removed lines

@@ -84,14 +84,12 @@
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		} catch( \Aimeos\MAdmin\Exception $e )
 		{
 			$error = array( 'log-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'log-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +21 added lines, -21 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Log;
 
-sprintf( 'log' ); // for translation
+sprintf('log'); // for translation
 
 
 /**
@@ -36,32 +36,32 @@ 
 		try
 		{
 			$total = 0;
-			$params = $this->storeSearchParams( $view->param(), 'log' );
-			$manager = \Aimeos\MAdmin\Factory::createManager( $context, 'log' );
+			$params = $this->storeSearchParams($view->param(), 'log');
+			$manager = \Aimeos\MAdmin\Factory::createManager($context, 'log');
 
 			$search = $manager->createSearch();
-			$search->setSortations( [$search->sort( '-', 'log.timestamp')] );
-			$search = $this->initCriteria( $search, $params );
+			$search->setSortations([$search->sort('-', 'log.timestamp')]);
+			$search = $this->initCriteria($search, $params);
 
-			$view->items = $manager->searchItems( $search, [], $total );
+			$view->items = $manager->searchItems($search, [], $total);
 			$view->total = $total;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->search();
 			}
 		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		catch (\Aimeos\MAdmin\Exception $e)
 		{
-			$error = array( 'log-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('log-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'log-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('log-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		/** admin/jqadm/log/template-list
@@ -86,7 +86,7 @@ 
 		$tplconf = 'admin/jqadm/log/template-list';
 		$default = 'log/list-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -97,7 +97,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/log/decorators/excludes
 		 * Excludes decorators added by the "common" option from the log JQAdm client
@@ -172,7 +172,7 @@ 
 		 * @see admin/jqadm/log/decorators/excludes
 		 * @see admin/jqadm/log/decorators/global
 		 */
-		return $this->createSubClient( 'log/' . $type, $name );
+		return $this->createSubClient('log/' . $type, $name);
 	}
 
 
@@ -216,7 +216,7 @@ 
 		 * @since 2018.04
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/log/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/log/standard/subparts', []);
 	}
 
 
@@ -226,7 +226,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/log/template-item
 		 * Relative path to the HTML body template for the log item.
@@ -250,6 +250,6 @@ 
 		$tplconf = 'admin/jqadm/log/template-item';
 		$default = 'log/item-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

admin/jqadm/src/Admin/JQAdm/Supplier/Standard.php

Braces +13 added lines, -26 removed lines

@@ -121,14 +121,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -170,14 +168,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -218,14 +214,12 @@ 
 
 			$this->nextAction( $view, 'search', 'supplier', null, 'delete' );
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -266,14 +260,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -310,18 +302,15 @@ 
 
 			$this->nextAction( $view, $view->param( 'next' ), 'supplier', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -360,14 +349,12 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +104 added lines, -104 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Supplier;
 
-sprintf( 'supplier' ); // for translation
+sprintf('supplier'); // for translation
 
 
 /**
@@ -35,37 +35,37 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'supplier' );
-			$view->item = $manager->getItem( $id, $this->getDomains() );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'supplier');
+			$view->item = $manager->getItem($id, $this->getDomains());
 
-			$view->itemData = $this->toArray( $view->item, true );
+			$view->itemData = $this->toArray($view->item, true);
 			$view->itemSubparts = $this->getSubClientNames();
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -81,10 +81,10 @@ 
 
 		try
 		{
-			$data = $view->param( 'item', [] );
+			$data = $view->param('item', []);
 
-			if( !isset( $view->item ) ) {
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'supplier' )->createItem();
+			if (!isset($view->item)) {
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'supplier')->createItem();
 			}
 
 			$data['supplier.siteid'] = $view->item->getSiteId();
@@ -93,26 +93,26 @@ 
 			$view->itemData = $data;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -126,39 +126,39 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'supplier' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'supplier');
 		$manager->begin();
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$view->item = $manager->getItem( $id, $this->getDomains() );
+			$view->item = $manager->getItem($id, $this->getDomains());
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$client->delete();
 			}
 
-			$manager->saveItem( $view->item );
-			$manager->deleteItem( $id );
+			$manager->saveItem($view->item);
+			$manager->deleteItem($id);
 			$manager->commit();
 
-			$this->nextAction( $view, 'search', 'supplier', null, 'delete' );
+			$this->nextAction($view, 'search', 'supplier', null, 'delete');
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -179,37 +179,37 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'supplier' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'supplier');
 
-			$view->item = $manager->getItem( $id, $this->getDomains() );
+			$view->item = $manager->getItem($id, $this->getDomains());
 			$view->itemSubparts = $this->getSubClientNames();
-			$view->itemData = $this->toArray( $view->item );
+			$view->itemData = $this->toArray($view->item);
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -223,40 +223,40 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'supplier' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'supplier');
 		$manager->begin();
 
 		try
 		{
-			$item = $this->fromArray( $view->param( 'item', [] ) );
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
+			$item = $this->fromArray($view->param('item', []));
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->save();
 			}
 
-			$manager->saveItem( clone $view->item );
+			$manager->saveItem(clone $view->item);
 			$manager->commit();
 
-			$this->nextAction( $view, $view->param( 'next' ), 'supplier', $view->item->getId(), 'save' );
+			$this->nextAction($view, $view->param('next'), 'supplier', $view->item->getId(), 'save');
 			return;
 		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
 		{
 			// fall through to create
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -278,31 +278,31 @@ 
 		try
 		{
 			$total = 0;
-			$params = $this->storeSearchParams( $view->param(), 'supplier' );
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'supplier' );
-			$search = $this->initCriteria( $manager->createSearch(), $params );
+			$params = $this->storeSearchParams($view->param(), 'supplier');
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'supplier');
+			$search = $this->initCriteria($manager->createSearch(), $params);
 
-			$view->items = $manager->searchItems( $search, $this->getDomains(), $total );
-			$view->filterAttributes = $manager->getSearchAttributes( true );
+			$view->items = $manager->searchItems($search, $this->getDomains(), $total);
+			$view->filterAttributes = $manager->getSearchAttributes(true);
 			$view->filterOperators = $search->getOperators();
 			$view->total = $total;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->search();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		/** admin/jqadm/supplier/template-list
@@ -327,7 +327,7 @@ 
 		$tplconf = 'admin/jqadm/supplier/template-list';
 		$default = 'supplier/list-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -338,7 +338,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/supplier/decorators/excludes
 		 * Excludes decorators added by the "common" option from the supplier JQAdm client
@@ -413,7 +413,7 @@ 
 		 * @see admin/jqadm/supplier/decorators/excludes
 		 * @see admin/jqadm/supplier/decorators/global
 		 */
-		return $this->createSubClient( 'supplier/' . $type, $name );
+		return $this->createSubClient('supplier/' . $type, $name);
 	}
 
 
@@ -437,7 +437,7 @@ 
 		 */
 		$domains = ['media', 'supplier/address', 'text'];
 
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/supplier/domains', $domains );
+		return $this->getContext()->getConfig()->get('admin/jqadm/supplier/domains', $domains);
 	}
 
 
@@ -481,7 +481,7 @@ 
 		 * @since 2017.10
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/supplier/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/supplier/standard/subparts', []);
 	}
 
 
@@ -492,17 +492,17 @@ 
 	 * @param string[] Data array
 	 * @return \Aimeos\MShop\Supplier\Item\Iface New supplier item object
 	 */
-	protected function fromArray( array $data )
+	protected function fromArray(array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'supplier' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'supplier');
 
-		if( isset( $data['supplier.id'] ) && $data['supplier.id'] != '' ) {
-			$item = $manager->getItem( $data['supplier.id'], $this->getDomains() );
+		if (isset($data['supplier.id']) && $data['supplier.id'] != '') {
+			$item = $manager->getItem($data['supplier.id'], $this->getDomains());
 		} else {
 			$item = $manager->createItem();
 		}
 
-		$item->fromArray( $data );
+		$item->fromArray($data);
 
 		return $item;
 	}
@@ -514,11 +514,11 @@ 
 	 * @param \Aimeos\MShop\Supplier\Item\Iface $item Supplier item object
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Supplier\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Supplier\Item\Iface $item, $copy = false)
 	{
-		$data = $item->toArray( true );
+		$data = $item->toArray(true);
 
-		if( $copy === true )
+		if ($copy === true)
 		{
 			$data['supplier.siteid'] = $this->getContext()->getLocale()->getSiteId();
 			$data['supplier.code'] = $data['supplier.code'] . '_copy';
@@ -535,7 +535,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/supplier/template-item
 		 * Relative path to the HTML body template for the supplier item.
@@ -559,6 +559,6 @@ 
 		$tplconf = 'admin/jqadm/supplier/template-item';
 		$default = 'supplier/item-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

admin/jqadm/src/Admin/JQAdm/Attribute/Standard.php

Braces +13 added lines, -26 removed lines

@@ -133,14 +133,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -183,14 +181,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -231,14 +227,12 @@ 
 
 			$this->nextAction( $view, 'search', 'attribute', null, 'delete' );
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -280,14 +274,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -324,18 +316,15 @@ 
 
 			$this->nextAction( $view, $view->param( 'next' ), 'attribute', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -375,14 +364,12 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +111 added lines, -111 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Attribute;
 
-sprintf( 'attribute' ); // for translation
+sprintf('attribute'); // for translation
 
 
 /**
@@ -35,38 +35,38 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
-			$view->item = $manager->getItem( $id, $this->getDomains() );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
+			$view->item = $manager->getItem($id, $this->getDomains());
 
-			$view->itemData = $this->toArray( $view->item, true );
+			$view->itemData = $this->toArray($view->item, true);
 			$view->itemSubparts = $this->getSubClientNames();
 			$view->itemTypes = $this->getTypeItems();
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -82,10 +82,10 @@ 
 
 		try
 		{
-			$data = $view->param( 'item', [] );
+			$data = $view->param('item', []);
 
-			if( !isset( $view->item ) ) {
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'attribute' )->createItem();
+			if (!isset($view->item)) {
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'attribute')->createItem();
 			}
 
 			$data['attribute.siteid'] = $view->item->getSiteId();
@@ -95,26 +95,26 @@ 
 			$view->itemData = $data;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -128,39 +128,39 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
 		$manager->begin();
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$view->item = $manager->getItem( $id, $this->getDomains() );
+			$view->item = $manager->getItem($id, $this->getDomains());
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$client->delete();
 			}
 
-			$manager->saveItem( $view->item );
-			$manager->deleteItem( $id );
+			$manager->saveItem($view->item);
+			$manager->deleteItem($id);
 			$manager->commit();
 
-			$this->nextAction( $view, 'search', 'attribute', null, 'delete' );
+			$this->nextAction($view, 'search', 'attribute', null, 'delete');
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -181,38 +181,38 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
 
-			$view->item = $manager->getItem( $id, $this->getDomains() );
+			$view->item = $manager->getItem($id, $this->getDomains());
 			$view->itemSubparts = $this->getSubClientNames();
-			$view->itemData = $this->toArray( $view->item );
+			$view->itemData = $this->toArray($view->item);
 			$view->itemTypes = $this->getTypeItems();
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -226,40 +226,40 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
 		$manager->begin();
 
 		try
 		{
-			$item = $this->fromArray( $view->param( 'item', [] ) );
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
+			$item = $this->fromArray($view->param('item', []));
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->save();
 			}
 
-			$manager->saveItem( clone $view->item );
+			$manager->saveItem(clone $view->item);
 			$manager->commit();
 
-			$this->nextAction( $view, $view->param( 'next' ), 'attribute', $view->item->getId(), 'save' );
+			$this->nextAction($view, $view->param('next'), 'attribute', $view->item->getId(), 'save');
 			return;
 		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
 		{
 			// fall through to create
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -281,32 +281,32 @@ 
 		try
 		{
 			$total = 0;
-			$params = $this->storeSearchParams( $view->param(), 'attribute' );
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
-			$search = $this->initCriteria( $manager->createSearch(), $params );
+			$params = $this->storeSearchParams($view->param(), 'attribute');
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
+			$search = $this->initCriteria($manager->createSearch(), $params);
 
-			$view->items = $manager->searchItems( $search, $this->getDomains(), $total );
-			$view->filterAttributes = $manager->getSearchAttributes( true );
+			$view->items = $manager->searchItems($search, $this->getDomains(), $total);
+			$view->filterAttributes = $manager->getSearchAttributes(true);
 			$view->filterOperators = $search->getOperators();
 			$view->itemTypes = $this->getTypeItems();
 			$view->total = $total;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->search();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		/** admin/jqadm/attribute/template-list
@@ -331,7 +331,7 @@ 
 		$tplconf = 'admin/jqadm/attribute/template-list';
 		$default = 'attribute/list-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -342,7 +342,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/attribute/decorators/excludes
 		 * Excludes decorators added by the "common" option from the attribute JQAdm client
@@ -417,7 +417,7 @@ 
 		 * @see admin/jqadm/attribute/decorators/excludes
 		 * @see admin/jqadm/attribute/decorators/global
 		 */
-		return $this->createSubClient( 'attribute/' . $type, $name );
+		return $this->createSubClient('attribute/' . $type, $name);
 	}
 
 
@@ -439,9 +439,9 @@ 
 		 * @since 2017.07
 		 * @category Developer
 		 */
-		$domains = array( 'attribute/property', 'media', 'price', 'text' );
+		$domains = array('attribute/property', 'media', 'price', 'text');
 
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/attribute/domains', $domains );
+		return $this->getContext()->getConfig()->get('admin/jqadm/attribute/domains', $domains);
 	}
 
 
@@ -485,7 +485,7 @@ 
 		 * @since 2017.07
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/attribute/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/attribute/standard/subparts', []);
 	}
 
 
@@ -496,12 +496,12 @@ 
 	 */
 	protected function getTypeItems()
 	{
-		$typeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute/type' );
+		$typeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute/type');
 
-		$search = $typeManager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setSortations( array( $search->sort( '+', 'attribute.type.code' ) ) );
+		$search = $typeManager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setSortations(array($search->sort('+', 'attribute.type.code')));
 
-		return $typeManager->searchItems( $search );
+		return $typeManager->searchItems($search);
 	}
 
 
@@ -511,18 +511,18 @@ 
 	 * @param string[] Data array
 	 * @return \Aimeos\MShop\Attribute\Item\Iface New attribute item object
 	 */
-	protected function fromArray( array $data )
+	protected function fromArray(array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
 
-		if( isset( $data['attribute.id'] ) && $data['attribute.id'] != '' ) {
-			$item = $manager->getItem( $data['attribute.id'], $this->getDomains() );
+		if (isset($data['attribute.id']) && $data['attribute.id'] != '') {
+			$item = $manager->getItem($data['attribute.id'], $this->getDomains());
 		} else {
-			$typeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute/type' );
-			$item = $manager->createItem( $typeManager->getItem( $data['attribute.typeid'] )->getCode(), $data['attribute.domain'] );
+			$typeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute/type');
+			$item = $manager->createItem($typeManager->getItem($data['attribute.typeid'])->getCode(), $data['attribute.domain']);
 		}
 
-		$item->fromArray( $data );
+		$item->fromArray($data);
 
 		return $item;
 	}
@@ -534,11 +534,11 @@ 
 	 * @param \Aimeos\MShop\Attribute\Item\Iface $item Attribute item object
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Attribute\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Attribute\Item\Iface $item, $copy = false)
 	{
-		$data = $item->toArray( true );
+		$data = $item->toArray(true);
 
-		if( $copy === true )
+		if ($copy === true)
 		{
 			$data['attribute.siteid'] = $this->getContext()->getLocale()->getSiteId();
 			$data['attribute.code'] = $data['attribute.code'] . '_copy';
@@ -555,7 +555,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/attribute/template-item
 		 * Relative path to the HTML body template for the attribute item.
@@ -579,6 +579,6 @@ 
 		$tplconf = 'admin/jqadm/attribute/template-item';
 		$default = 'attribute/item-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }