aimeos / ai-admin-jqadm

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

Braces +3 added lines, -6 removed lines

@@ -118,14 +118,12 @@ 
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item-address' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'supplier-item-address' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -284,8 +282,7 @@ 
 			{
 				$addrItem = $addrItems[$entry['supplier.address.id']];
 				unset( $addrItems[$entry['supplier.address.id']] );
-			}
-			else
+			} else
 			{
 				$addrItem = $manager->createItem();
 			}

Spacing +38 added lines, -38 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Supplier\Address;
 
-sprintf( 'address' ); // for translation
+sprintf('address'); // for translation
 
 
 /**
@@ -44,14 +44,14 @@ 
 	{
 		$view = $this->getView();
 
-		$view->addressData = $this->toArray( $view->item, true );
+		$view->addressData = $this->toArray($view->item, true);
 		$view->addressBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->addressBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -64,20 +64,20 @@ 
 	{
 		$view = $this->getView();
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->param( 'address', [] );
+		$data = $view->param('address', []);
 
-		foreach( $data as $idx => $entry ) {
+		foreach ($data as $idx => $entry) {
 			$data[$idx]['supplier.address.siteid'] = $siteid;
 		}
 
 		$view->addressData = $data;
 		$view->addressBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->addressBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -90,14 +90,14 @@ 
 	{
 		$view = $this->getView();
 
-		$view->addressData = $this->toArray( $view->item );
+		$view->addressData = $this->toArray($view->item);
 		$view->addressBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->addressBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -110,26 +110,26 @@ 
 
 		try
 		{
-			$this->fromArray( $view->item, $view->param( 'address', [] ) );
+			$this->fromArray($view->item, $view->param('address', []));
 			$view->addressBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->addressBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'supplier-item-address' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item-address' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'supplier-item-address' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item-address' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -143,7 +143,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/address/decorators/excludes
 		 * Excludes decorators added by the "common" option from the supplier JQAdm client
@@ -218,7 +218,7 @@ 
 		 * @see admin/jqadm/supplier/address/decorators/excludes
 		 * @see admin/jqadm/supplier/address/decorators/global
 		 */
-		return $this->createSubClient( 'supplier/address/' . $type, $name );
+		return $this->createSubClient('supplier/address/' . $type, $name);
 	}
 
 
@@ -262,7 +262,7 @@ 
 		 * @since 2017.10
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/supplier/address/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/supplier/address/standard/subparts', []);
 	}
 
 
@@ -272,29 +272,29 @@ 
 	 * @param \Aimeos\MShop\Supplier\Item\Iface $item Supplier item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Supplier\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Supplier\Item\Iface $item, array $data)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'supplier/address' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'supplier/address');
 
 		$addrItems = $item->getAddressItems();
 
-		foreach( $data as $entry )
+		foreach ($data as $entry)
 		{
-			if( isset( $addrItems[$entry['supplier.address.id']] ) )
+			if (isset($addrItems[$entry['supplier.address.id']]))
 			{
 				$addrItem = $addrItems[$entry['supplier.address.id']];
-				unset( $addrItems[$entry['supplier.address.id']] );
+				unset($addrItems[$entry['supplier.address.id']]);
 			}
 			else
 			{
 				$addrItem = $manager->createItem();
 			}
 
-			$addrItem->fromArray( $entry );
-			$item->addAddressItem( $addrItem );
+			$addrItem->fromArray($entry);
+			$item->addAddressItem($addrItem);
 		}
 
-		$item->deleteAddressItems( $addrItems );
+		$item->deleteAddressItems($addrItems);
 	}
 
 
@@ -305,16 +305,16 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @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)
 	{
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 		$data = [];
 
-		foreach( $item->getAddressItems() as $addrItem )
+		foreach ($item->getAddressItems() as $addrItem)
 		{
-			$list = $addrItem->toArray( true );
+			$list = $addrItem->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['supplier.address.siteid'] = $siteId;
 				$list['supplier.address.id'] = '';
@@ -333,7 +333,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/address/template-item
 		 * Relative path to the HTML body template of the address subpart for suppliers.
@@ -357,6 +357,6 @@ 
 		$tplconf = 'admin/jqadm/supplier/address/template-item';
 		$default = 'supplier/item-address-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

admin/jqadm/templates/supplier/item-address-standard.php

Spacing +112 added lines, -112 removed lines

@@ -20,8 +20,8 @@ 
 ?>
 <div id="address" class="item-address content-block tab-pane fade" role="tabpanel" aria-labelledby="address">
 	<div id="item-address-group" role="tablist" aria-multiselectable="true"
-		data-items="<?= $enc->attr( json_encode( $this->get( 'addressData', [] ) ) ); ?>"
-		data-keys="<?= $enc->attr( json_encode( $keys ) ) ?>"
+		data-items="<?= $enc->attr(json_encode($this->get('addressData', []))); ?>"
+		data-keys="<?= $enc->attr(json_encode($keys)) ?>"
 		data-siteid="<?= $this->site()->siteid() ?>" >
 
 		<div v-for="(entry, idx) in items" v-bind:key="idx" class="group-item card">
@@ -30,20 +30,20 @@ 
 				v-bind:data-target="'#item-address-group-data-' + idx" data-toggle="collapse" role="tab" class="card-header header"
 				v-bind:aria-controls="'item-address-group-data-' + idx" aria-expanded="false">
 				<div class="card-tools-left">
-					<div class="btn btn-card-header act-show fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Show/hide this entry') ); ?>">
+					<div class="btn btn-card-header act-show fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Show/hide this entry')); ?>">
 					</div>
 				</div>
 				<span class="item-label header-label">{{ getLabel(idx, 'supplier.address.') }}</span>
 				&nbsp;
 				<div class="card-tools-right">
-					<div class="btn btn-card-header act-copy fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Duplicate entry (Ctrl+D)') ); ?>"
+					<div class="btn btn-card-header act-copy fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Duplicate entry (Ctrl+D)')); ?>"
 						v-on:click.stop="duplicateItem(idx)">
 					</div>
 					<div v-if="!checkSite('supplier.address.siteid', idx)"
-						class="btn btn-card-header act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+						class="btn btn-card-header act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
 						v-on:click="removeItem(idx)">
 					</div>
 				</div>
@@ -53,29 +53,29 @@ 
 				v-bind:aria-labelledby="'item-address-group-item-' + idx" role="tabpanel" class="card-block collapse row">
 
 				<div class="col-xl-6 content-block">
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Personal data' ) ); ?></h2>
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Personal data')); ?></h2>
 
 					<input class="item-id" type="hidden"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.id' ) ) ); ?>'.replace('idx', idx)"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.id'))); ?>'.replace('idx', idx)"
 						v-bind:value="items[idx]['supplier.address.id']" />
 
-					<?php $languages = $this->get( 'pageLangItems', [] ) ?>
-					<?php if( count( $languages ) > 1 ) : ?>
+					<?php $languages = $this->get('pageLangItems', []) ?>
+					<?php if (count($languages) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Language' ) ); ?></label>
+							<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Language')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select item-languageid" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.languageid' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select item-languageid" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.languageid'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 									v-model="items[idx]['supplier.address.languageid']" >
 
 									<option value="" disable >
-										<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
+										<?= $enc->attr($this->translate('admin', 'Please select')); ?>
 									</option>
 
-									<?php foreach( $languages as $langId => $langItem ) : ?>
-										<option value="<?= $enc->attr( $langId ); ?>" v-bind:selected="entry['supplier.address.languageid'] == '<?= $enc->attr( $langId ) ?>'" >
-											<?= $enc->html( $langItem->getLabel() ); ?>
+									<?php foreach ($languages as $langId => $langItem) : ?>
+										<option value="<?= $enc->attr($langId); ?>" v-bind:selected="entry['supplier.address.languageid'] == '<?= $enc->attr($langId) ?>'" >
+											<?= $enc->html($langItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
@@ -83,261 +83,261 @@ 
 						</div>
 					<?php else : ?>
 						<input class="item-languageid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.languageid' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $languages ) ); ?>" />
+							v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.languageid'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($languages)); ?>" />
 					<?php endif; ?>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Salutation' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Salutation')); ?></label>
 						<div class="col-sm-8">
-							<select class="form-control custom-select item-salutation" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.salutation' ) ) ); ?>'.replace('idx', idx)"
+							<select class="form-control custom-select item-salutation" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.salutation'))); ?>'.replace('idx', idx)"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.salutation']" >
 								<option value="company" v-bind:selected="items[idx]['supplier.address.salutation'] == 'company'" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'company' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'company')); ?>
 								</option>
 								<option value="mr" v-bind:selected="items[idx]['supplier.address.salutation'] == 'mr'" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'mr' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'mr')); ?>
 								</option>
 								<option value="mrs" v-bind:selected="items[idx]['supplier.address.salutation'] == 'mrs'" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'mrs' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'mrs')); ?>
 								</option>
 								<option value="miss" v-bind:selected="items[idx]['supplier.address.salutation'] == 'miss'" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'miss' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'miss')); ?>
 								</option>
 							</select>
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'How the supplier is addressed in e-mails' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'How the supplier is addressed in e-mails')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Title' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Title')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-title" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.title' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Honorary title (optional)' ) ); ?>"
+							<input class="form-control item-title" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.title'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Honorary title (optional)')); ?>"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.title']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Honorary titles like Dr., Ph.D, etc.' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Honorary titles like Dr., Ph.D, etc.')); ?>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Last name' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Last name')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-lastname" type="text" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.lastname' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Last name (required)' ) ); ?>"
+							<input class="form-control item-lastname" type="text" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.lastname'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Last name (required)')); ?>"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.lastname']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Last name of the person or full name in cultures where no first names are used' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Last name of the person or full name in cultures where no first names are used')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'First name' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'First name')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-firstname" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.firstname' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'First name (optional)' ) ); ?>"
+							<input class="form-control item-firstname" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.firstname'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'First name (optional)')); ?>"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.firstname']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'First name of the person if used in cultures where they are used' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'First name of the person if used in cultures where they are used')); ?>
 						</div>
 					</div>
 				</div><!--
 
 				--><div class="col-xl-6 content-block">
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Delivery address' ) ); ?></h2>
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Delivery address')); ?></h2>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Street' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Street')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-address1" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.address1' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Street name (optional)' ) ); ?>"
+							<input class="form-control item-address1" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.address1'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Street name (optional)')); ?>"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.address1']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'First name of the person if used in cultures where they are used' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'First name of the person if used in cultures where they are used')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'House number' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'House number')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-address2" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.address2' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'House number (optional)' ) ); ?>"
+							<input class="form-control item-address2" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.address2'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'House number (optional)')); ?>"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.address2']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Address identifier of the supplier\'s house for delivery' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Address identifier of the supplier\'s house for delivery')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Floor / Appartment' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Floor / Appartment')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-address3" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.address3' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Floor and/or apartment (optional)' ) ); ?>"
+							<input class="form-control item-address3" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.address3'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Floor and/or apartment (optional)')); ?>"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.address3']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Additional information where the supplier\'s apartment can be found' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Additional information where the supplier\'s apartment can be found')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Zip code' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Zip code')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-postal" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.postal' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Zip code (optional)' ) ); ?>"
+							<input class="form-control item-postal" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.postal'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Zip code (optional)')); ?>"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.postal']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Postal code for delivery if used in the area the supplier is living' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Postal code for delivery if used in the area the supplier is living')); ?>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'City' ) ); ?></label>
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'City')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-city" type="text" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.city' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'City or town name (required)' ) ); ?>"
+							<input class="form-control item-city" type="text" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.city'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'City or town name (required)')); ?>"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.city']" />
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Country' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Country')); ?></label>
 						<div class="col-sm-8">
 							<select is="combo-box" class="form-control c-select item-countryid" required="required"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.countryid' ) ) ); ?>'.replace('idx', idx)"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.countryid'))); ?>'.replace('idx', idx)"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
-								v-bind:tabindex="'<?= $this->get( 'tabindex' ); ?>'"
+								v-bind:tabindex="'<?= $this->get('tabindex'); ?>'"
 								v-bind:getfcn="getCountries"
 								v-model="items[idx]['supplier.address.countryid']" >
 								<option value=""></option>
 							</select>
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Two letter ISO country code' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Two letter ISO country code')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'State' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'State')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-state" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.state' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Country state code (optional)' ) ); ?>"
+							<input class="form-control item-state" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.state'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Country state code (optional)')); ?>"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.state']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Short state code (e.g. NY) if used in the country the supplier is living' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Short state code (e.g. NY) if used in the country the supplier is living')); ?>
 						</div>
 					</div>
 				</div><!--
 
 				--><div class="col-xl-6 content-block">
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Communication' ) ); ?></h2>
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Communication')); ?></h2>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Telephone' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Telephone')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-telephone" type="tel" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.telephone' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Telephone number (optional)' ) ); ?>"
+							<input class="form-control item-telephone" type="tel" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.telephone'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Telephone number (optional)')); ?>"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.telephone']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', '(International) telephone number without separation characters, can start with a "+"' ) ); ?>
+							<?= $enc->html($this->translate('admin', '(International) telephone number without separation characters, can start with a "+"')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Facsimile' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Facsimile')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-telefax" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.telefax' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Facsimile number (optional)' ) ); ?>"
+							<input class="form-control item-telefax" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.telefax'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Facsimile number (optional)')); ?>"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.telefax']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', '(International) facsimilie number without separation characters, can start with a "+"' ) ); ?>
+							<?= $enc->html($this->translate('admin', '(International) facsimilie number without separation characters, can start with a "+"')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'E-mail' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'E-mail')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-email" type="email" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.email' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'E-mail address (optional)' ) ); ?>"
+							<input class="form-control item-email" type="email" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.email'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'E-mail address (optional)')); ?>"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.email']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'E-mail address that belongs to the address' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'E-mail address that belongs to the address')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Web site' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Web site')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-website" type="url" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.website' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Web site URL (optional)' ) ); ?>"
+							<input class="form-control item-website" type="url" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.website'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Web site URL (optional)')); ?>"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.website']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'URL of the supplier web site' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'URL of the supplier web site')); ?>
 						</div>
 					</div>
 				</div><!--
 
 				--><div class="col-xl-6 content-block">
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Company details' ) ); ?></h2>
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Company details')); ?></h2>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Company' ) ); ?></label>
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Company')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-company" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.company' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Company name (optional)' ) ); ?>"
+							<input class="form-control item-company" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.company'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Company name (optional)')); ?>"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.company']" />
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'VAT ID' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'VAT ID')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-vatid" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.vatid' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Value added tax identifier (optional)' ) ); ?>"
+							<input class="form-control item-vatid" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'supplier.address.vatid'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Value added tax identifier (optional)')); ?>"
 								v-bind:readonly="checkSite('supplier.address.siteid', idx)"
 								v-model="items[idx]['supplier.address.vatid']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Official VAT ID to determine if the tax needs to be billed in invoices' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Official VAT ID to determine if the tax needs to be billed in invoices')); ?>
 						</div>
 					</div>
 				</div>
 
-				<?= $this->get( 'addressBody' ); ?>
+				<?= $this->get('addressBody'); ?>
 
 			</div>
 		</div>
 
 		<div class="card-tools-more">
-			<div class="btn btn-primary btn-card-more act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-				title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+			<div class="btn btn-primary btn-card-more act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+				title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 				v-on:click="addItem('supplier.address.')" >
 			</div>
 		</div>

Braces +5 added lines, -2 removed lines

@@ -81,9 +81,12 @@
 								</select>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="item-languageid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.languageid' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'supplier.address.languageid' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $languages ) ); ?>" />
 					<?php endif; ?>
 					<div class="form-group row optional">

admin/jqadm/src/Admin/JQAdm/Product/Selection/Standard.php

Braces +2 added lines, -4 removed lines

@@ -135,14 +135,12 @@
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-selection' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'product-item-selection' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +69 added lines, -69 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Product\Selection;
 
-sprintf( 'selection' ); // for translation
+sprintf('selection'); // for translation
 
 
 /**
@@ -44,14 +44,14 @@ 
 	{
 		$view = $this->getView();
 
-		$view->selectionData = $this->toArray( $view->item, true );
+		$view->selectionData = $this->toArray($view->item, true);
 		$view->selectionBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->selectionBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -64,9 +64,9 @@ 
 	{
 		$view = $this->getView();
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->param( 'selection', [] );
+		$data = $view->param('selection', []);
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
 			$data[$idx]['product.lists.siteid'] = $siteid;
 			$data[$idx]['product.siteid'] = $siteid;
@@ -75,11 +75,11 @@ 
 		$view->selectionData = $data;
 		$view->selectionBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->selectionBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -91,7 +91,7 @@ 
 		parent::delete();
 
 		$item = $this->getView()->item;
-		$item->deleteListItems( $item->getListItems( 'product', 'default', null, false ) );
+		$item->deleteListItems($item->getListItems('product', 'default', null, false));
 	}
 
 
@@ -104,14 +104,14 @@ 
 	{
 		$view = $this->getView();
 
-		$view->selectionData = $this->toArray( $view->item );
+		$view->selectionData = $this->toArray($view->item);
 		$view->selectionBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->selectionBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -124,29 +124,29 @@ 
 
 		try
 		{
-			if( $view->item->getType() === 'select' )
+			if ($view->item->getType() === 'select')
 			{
-				$this->fromArray( $view->item, $view->param( 'selection', [] ) );
+				$this->fromArray($view->item, $view->param('selection', []));
 				$view->selectionBody = '';
 
-				foreach( $this->getSubClients() as $client ) {
+				foreach ($this->getSubClients() as $client) {
 					$view->selectionBody .= $client->save();
 				}
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-selection' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-selection' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'product-item-selection' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-selection' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -160,7 +160,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/product/selection/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -235,7 +235,7 @@ 
 		 * @see admin/jqadm/product/selection/decorators/excludes
 		 * @see admin/jqadm/product/selection/decorators/global
 		 */
-		return $this->createSubClient( 'product/selection/' . $type, $name );
+		return $this->createSubClient('product/selection/' . $type, $name);
 	}
 
 
@@ -279,7 +279,7 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/product/selection/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/product/selection/standard/subparts', []);
 	}
 
 
@@ -289,43 +289,43 @@ 
 	 * @param \Aimeos\MShop\Product\Item\Iface $item Product item object without referenced domain items
 	 * @param array $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Product\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Product\Item\Iface $item, array $data)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop::create( $context, 'product' );
-		$listManager = \Aimeos\MShop::create( $context, 'product/lists' );
+		$manager = \Aimeos\MShop::create($context, 'product');
+		$listManager = \Aimeos\MShop::create($context, 'product/lists');
 
-		$prodItem = $manager->createItem()->setType( 'default' );
-		$listItem = $listManager->createItem()->setType( 'default' );
-		$articles = $item->getRefItems( 'product', null, 'default', false );
-		$listItems = $item->getListItems( 'product', 'default', null, false );
+		$prodItem = $manager->createItem()->setType('default');
+		$listItem = $listManager->createItem()->setType('default');
+		$articles = $item->getRefItems('product', null, 'default', false);
+		$listItems = $item->getListItems('product', 'default', null, false);
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
-			if( ( $litem = $item->getListItem( 'product', 'default', $entry['product.id'], false ) ) === null ) {
+			if (($litem = $item->getListItem('product', 'default', $entry['product.id'], false)) === null) {
 				$litem = clone $listItem;
 			}
 
-			if( isset( $articles[$litem->getRefId()] ) ) {
+			if (isset($articles[$litem->getRefId()])) {
 				$refItem = $articles[$litem->getRefId()];
 			} else {
 				$refItem = clone $prodItem;
 			}
 
-			$litem->fromArray( $entry );
-			$litem->setPosition( $idx );
+			$litem->fromArray($entry);
+			$litem->setPosition($idx);
 
-			$refItem->fromArray( $entry );
+			$refItem->fromArray($entry);
 
-			if( isset( $entry['attr'] ) ) {
-				$refItem = $this->fromArrayAttributes( $refItem, $entry['attr'] );
+			if (isset($entry['attr'])) {
+				$refItem = $this->fromArrayAttributes($refItem, $entry['attr']);
 			}
 
-			$item->addListItem( 'product', $litem, $refItem );
-			unset( $listItems[$litem->getId()] );
+			$item->addListItem('product', $litem, $refItem);
+			unset($listItems[$litem->getId()]);
 		}
 
-		return $item->deleteListItems( $listItems );
+		return $item->deleteListItems($listItems);
 	}
 
 
@@ -336,31 +336,31 @@ 
 	 * @param array $entry Associative list of key/values for product attribute references
 	 * @return \Aimeos\MShop\Product\Item\Iface Updated artice item object
 	 */
-	protected function fromArrayAttributes( \Aimeos\MShop\Product\Item\Iface $refItem, array $entry )
+	protected function fromArrayAttributes(\Aimeos\MShop\Product\Item\Iface $refItem, array $entry)
 	{
-		$listManager = \Aimeos\MShop::create( $this->getContext(), 'product/lists' );
+		$listManager = \Aimeos\MShop::create($this->getContext(), 'product/lists');
 
-		$listItem = $listManager->createItem()->setType( 'variant' );
-		$litems = $refItem->getListItems( 'attribute', 'variant', null, false );
+		$listItem = $listManager->createItem()->setType('variant');
+		$litems = $refItem->getListItems('attribute', 'variant', null, false);
 
-		foreach( $entry as $pos => $attr )
+		foreach ($entry as $pos => $attr)
 		{
-			if( !isset( $attr['product.lists.refid'] ) || $attr['product.lists.refid'] == '' ) {
+			if (!isset($attr['product.lists.refid']) || $attr['product.lists.refid'] == '') {
 				continue;
 			}
 
-			if( ( $litem = $refItem->getListItem( 'attribute', 'variant', $attr['product.lists.refid'], false ) ) === null ) {
+			if (($litem = $refItem->getListItem('attribute', 'variant', $attr['product.lists.refid'], false)) === null) {
 				$litem = clone $listItem;
 			}
 
-			$litem->fromArray( $attr );
-			$litem->setPosition( $pos );
+			$litem->fromArray($attr);
+			$litem->setPosition($pos);
 
-			$refItem->addListItem( 'attribute', $litem, $litem->getRefItem() );
-			unset( $litems[$litem->getId()] );
+			$refItem->addListItem('attribute', $litem, $litem->getRefItem());
+			unset($litems[$litem->getId()]);
 		}
 
-		return $refItem->deleteListItems( $litems );
+		return $refItem->deleteListItems($litems);
 	}
 
 
@@ -371,27 +371,27 @@ 
 	 * @param boolean $copy True if items should be copied
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Product\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Product\Item\Iface $item, $copy = false)
 	{
-		if( $item->getType() !== 'select' ) {
+		if ($item->getType() !== 'select') {
 			return [];
 		}
 
 		$data = [];
 		$context = $this->getContext();
 		$siteId = $context->getLocale()->getSiteId();
-		$articles = $item->getRefItems( 'product', null, 'default', false );
+		$articles = $item->getRefItems('product', null, 'default', false);
 
 
-		foreach( $item->getListItems( 'product', 'default', null, false ) as $id => $listItem )
+		foreach ($item->getListItems('product', 'default', null, false) as $id => $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				continue;
 			}
 
-			$list = $listItem->toArray( true ) + $refItem->toArray( true );
+			$list = $listItem->toArray(true) + $refItem->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['product.lists.siteid'] = $siteId;
 				$list['product.lists.id'] = '';
@@ -399,14 +399,14 @@ 
 				$list['product.id'] = null;
 			}
 
-			if( isset( $articles[$refItem->getId()] ) )
+			if (isset($articles[$refItem->getId()]))
 			{
 				$idx = 0;
 
-				foreach( $articles[$refItem->getId()]->getListItems( 'attribute', 'variant', null, false ) as $litem )
+				foreach ($articles[$refItem->getId()]->getListItems('attribute', 'variant', null, false) as $litem)
 				{
-					if( ( $attrItem = $litem->getRefItem() ) !== null ) {
-						$list['attr'][$idx++] = $litem->toArray( true ) + $attrItem->toArray( true );
+					if (($attrItem = $litem->getRefItem()) !== null) {
+						$list['attr'][$idx++] = $litem->toArray(true) + $attrItem->toArray(true);
 					}
 				}
 			}
@@ -424,7 +424,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/product/selection/template-item
 		 * Relative path to the HTML body template of the selection subpart for products.
@@ -448,6 +448,6 @@ 
 		$tplconf = 'admin/jqadm/product/selection/template-item';
 		$default = 'product/item-selection-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

admin/jqadm/src/Admin/JQAdm/Product/Bundle/Standard.php

Braces +2 added lines, -4 removed lines

@@ -121,14 +121,12 @@
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-bundle' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'product-item-bundle' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +46 added lines, -46 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Product\Bundle;
 
-sprintf( 'bundle' ); // for translation
+sprintf('bundle'); // for translation
 
 
 /**
@@ -44,14 +44,14 @@ 
 	{
 		$view = $this->getView();
 
-		$view->bundleData = $this->toArray( $view->item, true );
+		$view->bundleData = $this->toArray($view->item, true);
 		$view->bundleBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->bundleBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -63,21 +63,21 @@ 
 	public function create()
 	{
 		$view = $this->getView();
-		$data = $view->param( 'bundle', [] );
+		$data = $view->param('bundle', []);
 		$siteid = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $view->value( $data, 'product.lists.id', [] ) as $idx => $value ) {
+		foreach ($view->value($data, 'product.lists.id', []) as $idx => $value) {
 			$data['product.lists.siteid'][$idx] = $siteid;
 		}
 
 		$view->bundleData = $data;
 		$view->bundleBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->bundleBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -90,14 +90,14 @@ 
 	{
 		$view = $this->getView();
 
-		$view->bundleData = $this->toArray( $view->item );
+		$view->bundleData = $this->toArray($view->item);
 		$view->bundleBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->bundleBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -110,29 +110,29 @@ 
 
 		try
 		{
-			if( $view->item->getType() === 'bundle' )
+			if ($view->item->getType() === 'bundle')
 			{
-				$this->fromArray( $view->item, $view->param( 'bundle', [] ) );
+				$this->fromArray($view->item, $view->param('bundle', []));
 				$view->bundleBody = '';
 
-				foreach( $this->getSubClients() as $client ) {
+				foreach ($this->getSubClients() as $client) {
 					$view->bundleBody .= $client->save();
 				}
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-bundle' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-bundle' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'product-item-bundle' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-bundle' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -146,7 +146,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/product/bundle/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -221,7 +221,7 @@ 
 		 * @see admin/jqadm/product/bundle/decorators/excludes
 		 * @see admin/jqadm/product/bundle/decorators/global
 		 */
-		return $this->createSubClient( 'product/bundle/' . $type, $name );
+		return $this->createSubClient('product/bundle/' . $type, $name);
 	}
 
 
@@ -265,7 +265,7 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/product/bundle/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/product/bundle/standard/subparts', []);
 	}
 
 
@@ -275,31 +275,31 @@ 
 	 * @param \Aimeos\MShop\Product\Item\Iface $item Product item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Product\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Product\Item\Iface $item, array $data)
 	{
-		$listManager = \Aimeos\MShop::create( $this->getContext(), 'product/lists' );
+		$listManager = \Aimeos\MShop::create($this->getContext(), 'product/lists');
 
-		$listItem = $listManager->createItem()->setType( 'default' );
-		$listItems = $item->getListItems( 'product', 'default', null, false );
+		$listItem = $listManager->createItem()->setType('default');
+		$listItems = $item->getListItems('product', 'default', null, false);
 
-		foreach( $this->getValue( $data, 'product.lists.id', [] ) as $idx => $id )
+		foreach ($this->getValue($data, 'product.lists.id', []) as $idx => $id)
 		{
-			if( isset( $listItems[$id] ) ) {
+			if (isset($listItems[$id])) {
 				$litem = $listItems[$id];
 			} else {
 				$litem = clone $listItem;
 			}
 
-			$litem->setId( $id );
-			$litem->setPosition( $idx );
-			$litem->setRefId( $this->getValue( $data, 'product.lists.refid/' . $idx ) );
+			$litem->setId($id);
+			$litem->setPosition($idx);
+			$litem->setRefId($this->getValue($data, 'product.lists.refid/' . $idx));
 
-			$item->addListItem( 'product', $litem, $litem->getRefItem() );
+			$item->addListItem('product', $litem, $litem->getRefItem());
 
-			unset( $listItems[$litem->getId()] );
+			unset($listItems[$litem->getId()]);
 		}
 
-		return $item->deleteListItems( $listItems );
+		return $item->deleteListItems($listItems);
 	}
 
 
@@ -310,30 +310,30 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Product\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Product\Item\Iface $item, $copy = false)
 	{
-		if( $item->getType() !== 'bundle' ) {
+		if ($item->getType() !== 'bundle') {
 			return [];
 		}
 
 		$data = [];
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $item->getListItems( 'product', 'default', null, false ) as $listItem )
+		foreach ($item->getListItems('product', 'default', null, false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				continue;
 			}
 
-			$list = $listItem->toArray( true ) + $refItem->toArray( true );
+			$list = $listItem->toArray(true) + $refItem->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['product.lists.siteid'] = $siteId;
 				$list['product.lists.id'] = '';
 			}
 
-			foreach( $list as $key => $value ) {
+			foreach ($list as $key => $value) {
 				$data[$key][] = $value;
 			}
 		}
@@ -348,7 +348,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/product/bundle/template-item
 		 * Relative path to the HTML body template of the bundle subpart for products.
@@ -372,6 +372,6 @@ 
 		$tplconf = 'admin/jqadm/product/bundle/template-item';
 		$default = 'product/item-bundle-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

admin/jqadm/src/Admin/JQAdm/Product/Physical/Standard.php

Braces +3 added lines, -6 removed lines

@@ -118,14 +118,12 @@ 
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-physical' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'product-item-physical' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -293,8 +291,7 @@ 
 
 				$item->addPropertyItem( $propItem );
 
-			}
-			else
+			} else
 			{
 				$item->deletePropertyItems( $propItems );
 			}

Spacing +40 added lines, -40 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Product\Physical;
 
-sprintf( 'physical' ); // for translation
+sprintf('physical'); // for translation
 
 
 /**
@@ -44,14 +44,14 @@ 
 	{
 		$view = $this->getView();
 
-		$view->physicalData = $this->toArray( $view->item, true );
+		$view->physicalData = $this->toArray($view->item, true);
 		$view->physicalBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->physicalBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -64,20 +64,20 @@ 
 	{
 		$view = $this->getView();
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->param( 'physical', [] );
+		$data = $view->param('physical', []);
 
-		foreach( $view->value( $data, 'product.property.id', [] ) as $idx => $value ) {
+		foreach ($view->value($data, 'product.property.id', []) as $idx => $value) {
 			$data['product.property.siteid'][$idx] = $siteid;
 		}
 
 		$view->physicalData = $data;
 		$view->physicalBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->physicalBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -90,14 +90,14 @@ 
 	{
 		$view = $this->getView();
 
-		$view->physicalData = $this->toArray( $view->item );
+		$view->physicalData = $this->toArray($view->item);
 		$view->physicalBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->physicalBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -110,26 +110,26 @@ 
 
 		try
 		{
-			$this->fromArray( $view->item, $view->param( 'physical', [] ) );
+			$this->fromArray($view->item, $view->param('physical', []));
 			$view->physicalBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->physicalBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-physical' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-physical' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'product-item-physical' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-physical' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -143,7 +143,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/product/physical/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -218,7 +218,7 @@ 
 		 * @see admin/jqadm/product/physical/decorators/excludes
 		 * @see admin/jqadm/product/physical/decorators/global
 		 */
-		return $this->createSubClient( 'product/physical/' . $type, $name );
+		return $this->createSubClient('product/physical/' . $type, $name);
 	}
 
 
@@ -262,7 +262,7 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/product/physical/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/product/physical/standard/subparts', []);
 	}
 
 
@@ -272,30 +272,30 @@ 
 	 * @param \Aimeos\MShop\Product\Item\Iface $item Product item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Product\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Product\Item\Iface $item, array $data)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'product/property' );
-		$typeManager = \Aimeos\MShop::create( $this->getContext(), 'product/property/type' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'product/property');
+		$typeManager = \Aimeos\MShop::create($this->getContext(), 'product/property/type');
 
-		foreach( $data as $type => $value )
+		foreach ($data as $type => $value)
 		{
-			$propItems = $item->getPropertyItems( $type, false );
+			$propItems = $item->getPropertyItems($type, false);
 
-			if( ( $value = trim( $value ) ) != '' )
+			if (($value = trim($value)) != '')
 			{
-				if( ( $propItem = reset( $propItems ) ) === false ) {
-					$propItem = $manager->createItem()->setType( $type );
+				if (($propItem = reset($propItems)) === false) {
+					$propItem = $manager->createItem()->setType($type);
 				}
 
-				$propItem->setLanguageId( null );
-				$propItem->setValue( $value );
+				$propItem->setLanguageId(null);
+				$propItem->setValue($value);
 
-				$item->addPropertyItem( $propItem );
+				$item->addPropertyItem($propItem);
 
 			}
 			else
 			{
-				$item->deletePropertyItems( $propItems );
+				$item->deletePropertyItems($propItems);
 			}
 		}
 	}
@@ -308,12 +308,12 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Product\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Product\Item\Iface $item, $copy = false)
 	{
 		$data = [];
 		$types = ['package-length', 'package-height', 'package-width', 'package-weight'];
 
-		foreach( $item->getPropertyItems( $types, false ) as $item ) {
+		foreach ($item->getPropertyItems($types, false) as $item) {
 			$data[$item->getType()] = $item->getValue();
 		}
 
@@ -327,7 +327,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/product/physical/template-item
 		 * Relative path to the HTML body template of the physical subpart for products.
@@ -351,6 +351,6 @@ 
 		$tplconf = 'admin/jqadm/product/physical/template-item';
 		$default = 'product/item-physical-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

admin/jqadm/src/Admin/JQAdm/Product/Download/Standard.php

Braces +3 added lines, -6 removed lines

@@ -137,14 +137,12 @@ 
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-download' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'product-item-download' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -402,8 +400,7 @@ 
 
 				$data['time'] = $fs->time( $data['attribute.code'] );
 				$data['size'] = $fs->size( $data['attribute.code'] );
-			}
-			catch( \Exception $e ) { ; } // Show product even if file isn't available any more
+			} catch( \Exception $e ) { ; } // Show product even if file isn't available any more
 		}
 
 		return $data;

Spacing +72 added lines, -72 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Product\Download;
 
-sprintf( 'download' ); // for translation
+sprintf('download'); // for translation
 
 
 /**
@@ -44,14 +44,14 @@ 
 	{
 		$view = $this->getView();
 
-		$view->downloadData = $this->toArray( $view->item, true );
+		$view->downloadData = $this->toArray($view->item, true);
 		$view->downloadBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->downloadBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -64,16 +64,16 @@ 
 	{
 		$view = $this->getView();
 		$data['product.lists.siteid'] = $this->getContext()->getLocale()->getSiteId();
-		$data = array_replace_recursive( $this->toArray( $view->item ), $view->param( 'download', [] ) );
+		$data = array_replace_recursive($this->toArray($view->item), $view->param('download', []));
 
 		$view->downloadData = $data;
 		$view->downloadBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->downloadBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -85,17 +85,17 @@ 
 		parent::delete();
 
 		$item = $this->getView()->item;
-		$fs = $this->getContext()->getFilesystemManager()->get( 'fs-secure' );
+		$fs = $this->getContext()->getFilesystemManager()->get('fs-secure');
 
-		foreach( $item->getListItems( 'attribute', 'hidden', 'download', false ) as $listItem )
+		foreach ($item->getListItems('attribute', 'hidden', 'download', false) as $listItem)
 		{
 			$refItem = $listItem->getRefItem();
 
-			if( $refItem !== null && $refItem->getCode() != '' && $fs->has( $refItem->getCode() ) ) {
-				$fs->rm( $refItem->getCode() );
+			if ($refItem !== null && $refItem->getCode() != '' && $fs->has($refItem->getCode())) {
+				$fs->rm($refItem->getCode());
 			}
 
-			$item->deleteListItem( 'attribute', $listItem, $refItem );
+			$item->deleteListItem('attribute', $listItem, $refItem);
 		}
 	}
 
@@ -109,14 +109,14 @@ 
 	{
 		$view = $this->getView();
 
-		$view->downloadData = $this->toArray( $view->item );
+		$view->downloadData = $this->toArray($view->item);
 		$view->downloadBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->downloadBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -129,26 +129,26 @@ 
 
 		try
 		{
-			$this->fromArray( $view->item, $view->param( 'download', [] ) );
+			$this->fromArray($view->item, $view->param('download', []));
 			$view->downloadBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->downloadBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-download' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-download' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'product-item-download' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-download' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -162,7 +162,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/product/download/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -237,7 +237,7 @@ 
 		 * @see admin/jqadm/product/download/decorators/excludes
 		 * @see admin/jqadm/product/download/decorators/global
 		 */
-		return $this->createSubClient( 'product/download/' . $type, $name );
+		return $this->createSubClient('product/download/' . $type, $name);
 	}
 
 
@@ -281,7 +281,7 @@ 
 		 * @since 2016.03
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/product/download/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/product/download/standard/subparts', []);
 	}
 
 
@@ -292,22 +292,22 @@ 
 	 * @param string $path Path the file should be stored at
 	 * @return string Path to the uploaded file
 	 */
-	protected function storeFile( \Psr\Http\Message\UploadedFileInterface $file, $path )
+	protected function storeFile(\Psr\Http\Message\UploadedFileInterface $file, $path)
 	{
-		$fs = $this->getContext()->getFilesystemManager()->get( 'fs-secure' );
+		$fs = $this->getContext()->getFilesystemManager()->get('fs-secure');
 
-		if( $path == null )
+		if ($path == null)
 		{
-			$ext = pathinfo( $file->getClientFilename(), PATHINFO_EXTENSION );
-			$hash = md5( $file->getClientFilename() . microtime( true ) );
-			$path = sprintf( '%s/%s/%s.%s', $hash[0], $hash[1], $hash, $ext );
+			$ext = pathinfo($file->getClientFilename(), PATHINFO_EXTENSION);
+			$hash = md5($file->getClientFilename() . microtime(true));
+			$path = sprintf('%s/%s/%s.%s', $hash[0], $hash[1], $hash, $ext);
 
-			if( !$fs->isdir( $hash[0] . '/' . $hash[1] ) ) {
-				$fs->mkdir( $hash[0] . '/' . $hash[1] );
+			if (!$fs->isdir($hash[0] . '/' . $hash[1])) {
+				$fs->mkdir($hash[0] . '/' . $hash[1]);
 			}
 		}
 
-		$fs->writes( $path, $file->getStream()->detach() );
+		$fs->writes($path, $file->getStream()->detach());
 
 		return $path;
 	}
@@ -319,55 +319,55 @@ 
 	 * @param \Aimeos\MShop\Product\Item\Iface $item Product item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Product\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Product\Item\Iface $item, array $data)
 	{
 		$context = $this->getContext();
-		$fs = $context->getFilesystemManager()->get( 'fs-secure' );
+		$fs = $context->getFilesystemManager()->get('fs-secure');
 
-		$attrManager = \Aimeos\MShop::create( $context, 'attribute' );
-		$typeManager = \Aimeos\MShop::create( $context, 'attribute/type' );
-		$listManager = \Aimeos\MShop::create( $context, 'product/lists' );
+		$attrManager = \Aimeos\MShop::create($context, 'attribute');
+		$typeManager = \Aimeos\MShop::create($context, 'attribute/type');
+		$listManager = \Aimeos\MShop::create($context, 'product/lists');
 
-		$attrItem = $attrManager->createItem()->setType( 'download' );
-		$listItem = $listManager->createItem()->setType( 'hidden' );
-		$listItems = $item->getListItems( 'attribute', 'hidden', 'download', false );
+		$attrItem = $attrManager->createItem()->setType('download');
+		$listItem = $listManager->createItem()->setType('hidden');
+		$listItems = $item->getListItems('attribute', 'hidden', 'download', false);
 
-		if( $this->getValue( $data, 'attribute.label' ) != '' )
+		if ($this->getValue($data, 'attribute.label') != '')
 		{
-			$listId = $this->getValue( $data, 'product.lists.id' );
+			$listId = $this->getValue($data, 'product.lists.id');
 
-			if( isset( $listItems[$listId] ) ) {
-				$litem = $listItems[$listId]; unset( $listItems[$listId] );
+			if (isset($listItems[$listId])) {
+				$litem = $listItems[$listId]; unset($listItems[$listId]);
 			} else {
 				$litem = clone $listItem;
 			}
 
-			if( ( $refItem = $litem->getRefItem() ) === null ) {
+			if (($refItem = $litem->getRefItem()) === null) {
 				$refItem = clone $attrItem;
 			}
 
-			$litem->fromArray( $data );
-			$refItem->fromArray( $data );
+			$litem->fromArray($data);
+			$refItem->fromArray($data);
 
-			if( ( $file = $this->getValue( (array) $this->getView()->request()->getUploadedFiles(), 'download/file' ) ) !== null
+			if (($file = $this->getValue((array) $this->getView()->request()->getUploadedFiles(), 'download/file')) !== null
 				&& $file->getError() === UPLOAD_ERR_OK
 			) {
-				$path = ( $this->getValue( $data, 'overwrite' ) == 1 ? $refItem->getCode() : null );
-				$refItem->setCode( $this->storeFile( $file, $path ) );
+				$path = ($this->getValue($data, 'overwrite') == 1 ? $refItem->getCode() : null);
+				$refItem->setCode($this->storeFile($file, $path));
 			}
 
-			$item->addListItem( 'attribute', $litem, $refItem );
+			$item->addListItem('attribute', $litem, $refItem);
 		}
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
 			$refItem = $listItem->getRefItem();
 
-			if( $refItem !== null && ( $path = $refItem->getCode() ) != '' && $fs->has( $path ) ) {
-				$fs->rm( $path );
+			if ($refItem !== null && ($path = $refItem->getCode()) != '' && $fs->has($path)) {
+				$fs->rm($path);
 			}
 
-			$item->deleteListItem( 'attribute', $listItem, $refItem );
+			$item->deleteListItem('attribute', $listItem, $refItem);
 		}
 	}
 
@@ -379,35 +379,35 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Product\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Product\Item\Iface $item, $copy = false)
 	{
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 		$data = ['product.lists.siteid' => $siteId];
 
-		foreach( $item->getListItems( 'attribute', 'hidden', 'download', false ) as $listItem )
+		foreach ($item->getListItems('attribute', 'hidden', 'download', false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				continue;
 			}
 
-			$list = $listItem->toArray( true ) + $refItem->toArray( true );
+			$list = $listItem->toArray(true) + $refItem->toArray(true);
 
-			if( $copy === true ) {
+			if ($copy === true) {
 				$list['product.lists.id'] = '';
 			}
 
-			foreach( $list as $key => $value ) {
+			foreach ($list as $key => $value) {
 				$data[$key] = $value;
 			}
 
 			try
 			{
-				$fs = $this->getContext()->getFilesystemManager()->get( 'fs-secure' );
+				$fs = $this->getContext()->getFilesystemManager()->get('fs-secure');
 
-				$data['time'] = $fs->time( $data['attribute.code'] );
-				$data['size'] = $fs->size( $data['attribute.code'] );
+				$data['time'] = $fs->time($data['attribute.code']);
+				$data['size'] = $fs->size($data['attribute.code']);
 			}
-			catch( \Exception $e ) { ; } // Show product even if file isn't available any more
+			catch (\Exception $e) {; } // Show product even if file isn't available any more
 		}
 
 		return $data;
@@ -420,7 +420,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/product/download/template-item
 		 * Relative path to the HTML body template of the download subpart for products.
@@ -444,6 +444,6 @@ 
 		$tplconf = 'admin/jqadm/product/download/template-item';
 		$default = 'product/item-download-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

admin/jqadm/src/Admin/JQAdm/Product/Subscription/Standard.php

Braces +3 added lines, -6 removed lines

@@ -118,14 +118,12 @@ 
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-subscription' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'product-item-subscription' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -361,8 +359,7 @@ 
 			{
 				$list['product.lists.siteid'] = (string) $map[$attrId]->getSiteId();
 				$list['product.lists.id'] = (string) $map[$attrId]->getId();
-			}
-			else
+			} else
 			{
 				$list['product.lists.siteid'] = $siteId;
 				$list['product.lists.id'] = '';

Spacing +52 added lines, -52 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Product\Subscription;
 
-sprintf( 'subscription' ); // for translation
+sprintf('subscription'); // for translation
 
 
 /**
@@ -44,14 +44,14 @@ 
 	{
 		$view = $this->getView();
 
-		$view->subscriptionData = $this->toArray( $view->item, true );
+		$view->subscriptionData = $this->toArray($view->item, true);
 		$view->subscriptionBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->subscriptionBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -64,20 +64,20 @@ 
 	{
 		$view = $this->getView();
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->param( 'subscription', [] );
+		$data = $view->param('subscription', []);
 
-		foreach( $view->value( $data, 'product.lists.id', [] ) as $idx => $value ) {
+		foreach ($view->value($data, 'product.lists.id', []) as $idx => $value) {
 			$data['product.lists.siteid'][$idx] = $siteid;
 		}
 
 		$view->subscriptionData = $data;
 		$view->subscriptionBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->subscriptionBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -90,14 +90,14 @@ 
 	{
 		$view = $this->getView();
 
-		$view->subscriptionData = $this->toArray( $view->item );
+		$view->subscriptionData = $this->toArray($view->item);
 		$view->subscriptionBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->subscriptionBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -110,26 +110,26 @@ 
 
 		try
 		{
-			$this->fromArray( $view->item, $view->param( 'subscription', [] ) );
+			$this->fromArray($view->item, $view->param('subscription', []));
 			$view->subscriptionBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->subscriptionBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-subscription' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-subscription' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'product-item-subscription' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-subscription' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -143,7 +143,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/product/subscription/decorators/excludes
 		 * Excludes decorators added by the "common" subscription from the product JQAdm client
@@ -218,7 +218,7 @@ 
 		 * @see admin/jqadm/product/subscription/decorators/excludes
 		 * @see admin/jqadm/product/subscription/decorators/global
 		 */
-		return $this->createSubClient( 'product/subscription/' . $type, $name );
+		return $this->createSubClient('product/subscription/' . $type, $name);
 	}
 
 
@@ -229,17 +229,17 @@ 
 	 */
 	protected function getIntervalItems()
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'attribute' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'attribute');
 
 		$search = $manager->createSearch();
 		$expr = [
-			$search->compare( '==', 'attribute.type', 'interval' ),
-			$search->compare( '==', 'attribute.domain', 'product' ),
+			$search->compare('==', 'attribute.type', 'interval'),
+			$search->compare('==', 'attribute.domain', 'product'),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( [$search->sort( '+', 'attribute.code' )] );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations([$search->sort('+', 'attribute.code')]);
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -283,7 +283,7 @@ 
 		 * @since 2018.04
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/product/subscription/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/product/subscription/standard/subparts', []);
 	}
 
 
@@ -293,37 +293,37 @@ 
 	 * @param \Aimeos\MShop\Product\Item\Iface $item Product item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Product\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Product\Item\Iface $item, array $data)
 	{
 		$context = $this->getContext();
 
-		$attrManager = \Aimeos\MShop::create( $context, 'attribute' );
-		$listManager = \Aimeos\MShop::create( $context, 'product/lists' );
+		$attrManager = \Aimeos\MShop::create($context, 'attribute');
+		$listManager = \Aimeos\MShop::create($context, 'product/lists');
 
-		$listItems = $item->getListItems( 'attribute', 'config', 'interval', false );
+		$listItems = $item->getListItems('attribute', 'config', 'interval', false);
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
-			if( !array_key_exists( 'attribute.id', $entry ) ) {
+			if (!array_key_exists('attribute.id', $entry)) {
 				continue;
 			}
 
-			if( $entry['attribute.id'] == '' || ( $listItem = $item->getListItem( 'attribute', 'config', $entry['attribute.id'], false ) ) === null ) {
-				$listItem = $listManager->createItem()->setType( 'config' );
+			if ($entry['attribute.id'] == '' || ($listItem = $item->getListItem('attribute', 'config', $entry['attribute.id'], false)) === null) {
+				$listItem = $listManager->createItem()->setType('config');
 			}
 
-			if( $entry['attribute.id'] == '' || ( $refItem = $listItem->getRefItem() ) === null )
+			if ($entry['attribute.id'] == '' || ($refItem = $listItem->getRefItem()) === null)
 			{
-				$refItem = $attrManager->createItem()->setType( 'interval' );
-				$refItem->fromArray( $entry );
+				$refItem = $attrManager->createItem()->setType('interval');
+				$refItem->fromArray($entry);
 			}
 
-			unset( $listItems[$listItem->getId()] );
+			unset($listItems[$listItem->getId()]);
 
-			$item->addListItem( 'attribute', $listItem->setPosition( $idx ), $refItem );
+			$item->addListItem('attribute', $listItem->setPosition($idx), $refItem);
 		}
 
-		$item->deleteListItems( $listItems );
+		$item->deleteListItems($listItems);
 	}
 
 
@@ -334,20 +334,20 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Product\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Product\Item\Iface $item, $copy = false)
 	{
 		$data = $map = [];
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $item->getListItems( 'attribute', 'config', 'interval', false ) as $listItem ) {
+		foreach ($item->getListItems('attribute', 'config', 'interval', false) as $listItem) {
 			$map[$listItem->getRefId()] = $listItem;
 		}
 
-		foreach( $this->getIntervalItems() as $attrId => $attrItem )
+		foreach ($this->getIntervalItems() as $attrId => $attrItem)
 		{
-			$list = $attrItem->toArray( true );
+			$list = $attrItem->toArray(true);
 
-			if( isset( $map[$attrId] ) && $copy !== true )
+			if (isset($map[$attrId]) && $copy !== true)
 			{
 				$list['product.lists.siteid'] = (string) $map[$attrId]->getSiteId();
 				$list['product.lists.id'] = (string) $map[$attrId]->getId();
@@ -361,7 +361,7 @@ 
 			$matches = [];
 			$list['Y'] = $list['M'] = $list['W'] = $list['D'] = 0;
 
-			if( preg_match( '/^P([0-9]+)Y([0-9]+)M([0-9]+)W([0-9]+)D$/', $list['attribute.code'], $matches ) === 1 )
+			if (preg_match('/^P([0-9]+)Y([0-9]+)M([0-9]+)W([0-9]+)D$/', $list['attribute.code'], $matches) === 1)
 			{
 				$list['Y'] = $matches[1];
 				$list['M'] = $matches[2];
@@ -382,7 +382,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/product/subscription/template-item
 		 * Relative path to the HTML body template of the subscription subpart for products.
@@ -406,6 +406,6 @@ 
 		$tplconf = 'admin/jqadm/product/subscription/template-item';
 		$default = 'product/item-subscription-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

admin/jqadm/templates/product/item-subscription-standard.php

Spacing +30 added lines, -30 removed lines

@@ -17,39 +17,39 @@ 
 <div id="subscription" class="item-subscription tab-pane fade" role="tablist" aria-labelledby="subscription">
 
 	<table class="subscription-list table table-default col-xl-12 content-block"
-		data-items="<?= $enc->attr( json_encode( $this->get( 'subscriptionData', [] ) ) ); ?>"
-		data-keys="<?= $enc->attr( json_encode( $keys ) ) ?>"
+		data-items="<?= $enc->attr(json_encode($this->get('subscriptionData', []))); ?>"
+		data-keys="<?= $enc->attr(json_encode($keys)) ?>"
 		data-siteid="<?= $this->site()->siteid() ?>" >
 
 		<thead>
 			<tr>
 				<th>
-					<span class="help"><?= $enc->html( $this->translate( 'admin', 'Active' ) ); ?></span>
+					<span class="help"><?= $enc->html($this->translate('admin', 'Active')); ?></span>
 					<div class="form-text text-muted help-text">
-						<?= $enc->html( $this->translate( 'admin', 'Available intervals in the front-end' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Available intervals in the front-end')); ?>
 					</div>
 				</th>
 				<th>
-					<span class="help"><?= $enc->html( $this->translate( 'admin', 'Label' ) ); ?></span>
+					<span class="help"><?= $enc->html($this->translate('admin', 'Label')); ?></span>
 					<div class="form-text text-muted help-text">
-						<?= $enc->html( $this->translate( 'admin', 'Label describing the interval, will be used if no name is available' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Label describing the interval, will be used if no name is available')); ?>
 					</div>
 				</th>
 				<th>
-					<?= $enc->html( $this->translate( 'admin', 'Years' ) ); ?>
+					<?= $enc->html($this->translate('admin', 'Years')); ?>
 				</th>
 				<th>
-					<?= $enc->html( $this->translate( 'admin', 'Months' ) ); ?>
+					<?= $enc->html($this->translate('admin', 'Months')); ?>
 				</th>
 				<th>
-					<?= $enc->html( $this->translate( 'admin', 'Weeks' ) ); ?>
+					<?= $enc->html($this->translate('admin', 'Weeks')); ?>
 				</th>
 				<th>
-					<?= $enc->html( $this->translate( 'admin', 'Days' ) ); ?>
+					<?= $enc->html($this->translate('admin', 'Days')); ?>
 				</th>
 				<th class="actions">
-					<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+					<div class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 						v-on:click="addItem()">
 					</div>
 				</th>
@@ -60,57 +60,57 @@ 
 				v-bind:class="entry['product.lists.siteid'] != '<?= $this->site()->siteid() ?>' ? 'readonly' : ''">
 
 				<td class="interval-check">
-					<input class="form-control item-id" type="checkbox" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'subscription', 'idx', 'attribute.id' ) ) ); ?>'.replace( 'idx', idx )"
+					<input class="form-control item-id" type="checkbox" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('subscription', 'idx', 'attribute.id'))); ?>'.replace( 'idx', idx )"
 						v-bind:checked="entry['product.lists.id'] || !entry['attribute.id'] ? 'checked' : ''"
 						v-bind:value="entry['attribute.id']" />
 				</td>
 				<td class="interval-label mandatory">
-					<input class="form-control item-label" type="text" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'subscription', 'idx', 'attribute.label' ) ) ); ?>'.replace( 'idx', idx )"
+					<input class="form-control item-label" type="text" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('subscription', 'idx', 'attribute.label'))); ?>'.replace( 'idx', idx )"
 						v-bind:readonly="getReadOnly(idx)"
 						v-model="items[idx]['attribute.label']" />
 				</td>
 				<td class="interval-field mandatory">
-					<input class="form-control field-year" type="number" step="1" min="0" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'subscription', 'idx', 'Y' ) ) ); ?>'.replace( 'idx', idx )"
+					<input class="form-control field-year" type="number" step="1" min="0" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('subscription', 'idx', 'Y'))); ?>'.replace( 'idx', idx )"
 						v-bind:readonly="getReadOnly(idx)"
 						v-model="items[idx]['Y']" />
 				</td>
 				<td class="interval-field mandatory">
-					<input class="form-control field-month" type="number" step="1" min="0" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'subscription', 'idx', 'M' ) ) ); ?>'.replace( 'idx', idx )"
+					<input class="form-control field-month" type="number" step="1" min="0" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('subscription', 'idx', 'M'))); ?>'.replace( 'idx', idx )"
 						v-bind:readonly="getReadOnly(idx)"
 						v-model="items[idx]['M']" />
 				</td>
 				<td class="interval-field mandatory">
-					<input class="form-control field-week" type="number" step="1" min="0" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'subscription', 'idx', 'W' ) ) ); ?>'.replace( 'idx', idx )"
+					<input class="form-control field-week" type="number" step="1" min="0" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('subscription', 'idx', 'W'))); ?>'.replace( 'idx', idx )"
 						v-bind:readonly="getReadOnly(idx)"
 						v-model="items[idx]['W']" />
 				</td>
 				<td class="interval-field mandatory">
-					<input class="form-control field-day" type="number" step="1" min="0" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'subscription', 'idx', 'D' ) ) ); ?>'.replace( 'idx', idx )"
+					<input class="form-control field-day" type="number" step="1" min="0" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('subscription', 'idx', 'D'))); ?>'.replace( 'idx', idx )"
 						v-bind:readonly="getReadOnly(idx)"
 						v-model="items[idx]['D']" />
 				</td>
 				<td class="actions">
 					<input class="item-code" type="hidden"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'subscription', 'idx', 'attribute.code' ) ) ); ?>'.replace( 'idx', idx )"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('subscription', 'idx', 'attribute.code'))); ?>'.replace( 'idx', idx )"
 						v-bind:value="getAttributeValue(idx)" />
 
 					<input class="item-listid" type="hidden"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'subscription', 'idx', 'product.lists.id' ) ) ); ?>'.replace( 'idx', idx )"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('subscription', 'idx', 'product.lists.id'))); ?>'.replace( 'idx', idx )"
 						v-bind:value="entry['product.lists.id']" />
 
 					<input class="item-siteid" type="hidden"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'subscription', 'idx', 'product.lists.siteid' ) ) ); ?>'.replace( 'idx', idx )"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('subscription', 'idx', 'product.lists.siteid'))); ?>'.replace( 'idx', idx )"
 						v-bind:value="entry['product.lists.siteid']" />
 
 					<div v-if="entry['attribute.id'] == ''" v-on:click="removeItem(idx)"
-						class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+						class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 					</div>
 				</td>
 
@@ -118,6 +118,6 @@ 
 		</tbody>
 	</table>
 
-	<?= $this->get( 'subscriptionBody' ); ?>
+	<?= $this->get('subscriptionBody'); ?>
 
 </div>

admin/jqadm/templates/product/item-characteristic-attribute-standard.php

Spacing +14 added lines, -14 removed lines

@@ -18,22 +18,22 @@ 
 <div class="col-xl-6 content-block item-characteristic-attribute">
 
 	<table class="attribute-list table table-default"
-		data-items="<?= $enc->attr( json_encode( $this->get( 'attributeData', [] ) ) ); ?>"
-		data-keys="<?= $enc->attr( json_encode( $keys ) ) ?>"
+		data-items="<?= $enc->attr(json_encode($this->get('attributeData', []))); ?>"
+		data-keys="<?= $enc->attr(json_encode($keys)) ?>"
 		data-prefix="product.lists."
 		data-siteid="<?= $this->site()->siteid() ?>" >
 
 		<thead>
 			<tr>
 				<th>
-					<span class="help"><?= $enc->html( $this->translate( 'admin', 'Attributes' ) ); ?></span>
+					<span class="help"><?= $enc->html($this->translate('admin', 'Attributes')); ?></span>
 					<div class="form-text text-muted help-text">
-						<?= $enc->html( $this->translate( 'admin', 'Product attributes that are used by other products too' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Product attributes that are used by other products too')); ?>
 					</div>
 				</th>
 				<th class="actions">
-					<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+					<div class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 						v-on:click="addItem()">
 					</div>
 				</th>
@@ -46,18 +46,18 @@ 
 
 				<td>
 					<input class="item-listid" type="hidden" v-model="items['product.lists.id'][idx]"
-						name="<?= $enc->attr( $this->formparam( array( 'characteristic', 'attribute', 'product.lists.id', '' ) ) ); ?>" />
+						name="<?= $enc->attr($this->formparam(array('characteristic', 'attribute', 'product.lists.id', ''))); ?>" />
 
 					<input class="item-label" type="hidden" v-model="items['attribute.label'][idx]"
-						name="<?= $enc->attr( $this->formparam( array( 'characteristic', 'attribute', 'attribute.label', '' ) ) ); ?>" />
+						name="<?= $enc->attr($this->formparam(array('characteristic', 'attribute', 'attribute.label', ''))); ?>" />
 
 					<input class="item-type" type="hidden" v-model="items['attribute.type'][idx]"
-						name="<?= $enc->attr( $this->formparam( array( 'characteristic', 'attribute', 'attribute.type', '' ) ) ); ?>" />
+						name="<?= $enc->attr($this->formparam(array('characteristic', 'attribute', 'attribute.type', ''))); ?>" />
 
 					<select is="combo-box" class="form-control custom-select item-refid"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'characteristic', 'attribute', 'product.lists.refid', '' ) ) ); ?>'"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('characteristic', 'attribute', 'product.lists.refid', ''))); ?>'"
 						v-bind:readonly="checkSite('product.lists.siteid', idx) || id != ''"
-						v-bind:tabindex="'<?= $this->get( 'tabindex' ); ?>'"
+						v-bind:tabindex="'<?= $this->get('tabindex'); ?>'"
 						v-bind:label="getLabel(idx)"
 						v-bind:required="'required'"
 						v-bind:getfcn="getItems"
@@ -67,8 +67,8 @@ 
 					</select>
 				</td>
 				<td class="actions">
-					<div v-if="!checkSite('product.lists.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+					<div v-if="!checkSite('product.lists.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
 						v-on:click.stop="removeItem(idx)">
 				</td>
 
@@ -77,6 +77,6 @@ 
 
 	</table>
 
-	<?= $this->get( 'attributeBody' ); ?>
+	<?= $this->get('attributeBody'); ?>
 
 </div>