aimeos / ai-admin-jqadm

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

Braces +1 added lines, -2 removed lines

@@ -291,8 +291,7 @@
 				{
 					$propItem = $propItems[$entry['media.property.id']];
 					unset( $propItems[$entry['media.property.id']] );
-				}
-				else
+				} else
 				{
 					$propItem = $propManager->createItem();
 				}

Spacing +42 added lines, -42 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Attribute\Image\Property;
 
-sprintf( 'property' ); // for translation
+sprintf('property'); // for translation
 
 
 /**
@@ -42,16 +42,16 @@ 
 	 */
 	public function copy()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->imageData = $this->toArray( $view->item, $view->get( 'imageData', [] ), true );
+		$view->imageData = $this->toArray($view->item, $view->get('imageData', []), true);
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -62,13 +62,13 @@ 
 	 */
 	public function create()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->get( 'imageData', [] );
+		$data = $view->get('imageData', []);
 
-		foreach( $data as $index => $entry )
+		foreach ($data as $index => $entry)
 		{
-			foreach( $view->value( $entry, 'property', [] ) as $idx => $y ) {
+			foreach ($view->value($entry, 'property', []) as $idx => $y) {
 				$data[$index]['property'][$idx]['attribute.lists.siteid'] = $siteid;
 			}
 		}
@@ -76,11 +76,11 @@ 
 		$view->propertyData = $data;
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -91,16 +91,16 @@ 
 	 */
 	public function get()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->imageData = $this->toArray( $view->item, $view->get( 'imageData', [] ) );
+		$view->imageData = $this->toArray($view->item, $view->get('imageData', []));
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -111,10 +111,10 @@ 
 	{
 		$view = $this->getView();
 
-		$view->item = $this->fromArray( $view->item, $view->param( 'image', [] ) );
+		$view->item = $this->fromArray($view->item, $view->param('image', []));
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->save();
 		}
 	}
@@ -127,7 +127,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/attribute/image/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the attribute JQAdm client
@@ -202,7 +202,7 @@ 
 		 * @see admin/jqadm/attribute/image/property/decorators/excludes
 		 * @see admin/jqadm/attribute/image/property/decorators/global
 		 */
-		return $this->createSubClient( 'attribute/image/property/' . $type, $name );
+		return $this->createSubClient('attribute/image/property/' . $type, $name);
 	}
 
 
@@ -212,15 +212,15 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface View object with assigned parameters
 	 */
-	protected function addViewData( \Aimeos\MW\View\Iface $view )
+	protected function addViewData(\Aimeos\MW\View\Iface $view)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/property/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/property/type');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'media.property.type.domain', 'attribute' ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->compare('==', 'media.property.type.domain', 'attribute'));
+		$search->setSlice(0, 0x7fffffff);
 
-		$view->propertyTypes = $manager->searchItems( $search );
+		$view->propertyTypes = $manager->searchItems($search);
 
 		return $view;
 	}
@@ -266,7 +266,7 @@ 
 		 * @since 2018.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/attribute/image/property/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/attribute/image/property/standard/subparts', []);
 	}
 
 
@@ -276,32 +276,32 @@ 
 	 * @param \Aimeos\MShop\Attribute\Item\Iface $item Attribute item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Attribute\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Attribute\Item\Iface $item, array $data)
 	{
-		$propManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/property' );
+		$propManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/property');
 		$index = 0;
 
-		foreach( $item->getRefItems( 'media', null, null, false ) as $refItem )
+		foreach ($item->getRefItems('media', null, null, false) as $refItem)
 		{
-			$propItems = $refItem->getPropertyItems( null, false );
+			$propItems = $refItem->getPropertyItems(null, false);
 
-			foreach( (array) $this->getValue( $data, $index . '/property', [] ) as $entry )
+			foreach ((array) $this->getValue($data, $index . '/property', []) as $entry)
 			{
-				if( isset( $propItems[$entry['media.property.id']] ) )
+				if (isset($propItems[$entry['media.property.id']]))
 				{
 					$propItem = $propItems[$entry['media.property.id']];
-					unset( $propItems[$entry['media.property.id']] );
+					unset($propItems[$entry['media.property.id']]);
 				}
 				else
 				{
 					$propItem = $propManager->createItem();
 				}
 
-				$propItem->fromArray( $entry );
-				$refItem->addPropertyItem( $propItem );
+				$propItem->fromArray($entry);
+				$refItem->addPropertyItem($propItem);
 			}
 
-			$refItem->deletePropertyItems( $propItems );
+			$refItem->deletePropertyItems($propItems);
 			$index++;
 		}
 
@@ -317,18 +317,18 @@ 
 	 * @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\Attribute\Item\Iface $item, array $data, $copy = false )
+	protected function toArray(\Aimeos\MShop\Attribute\Item\Iface $item, array $data, $copy = false)
 	{
 		$idx = 0;
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $item->getRefItems( 'media', null, null, false ) as $mediaItem )
+		foreach ($item->getRefItems('media', null, null, false) as $mediaItem)
 		{
-			foreach( $mediaItem->getPropertyItems( null, false )  as $propItem )
+			foreach ($mediaItem->getPropertyItems(null, false)  as $propItem)
 			{
-				$list = $propItem->toArray( true );
+				$list = $propItem->toArray(true);
 
-				if( $copy === true )
+				if ($copy === true)
 				{
 					$list['media.property.siteid'] = $siteId;
 					$list['media.property.id'] = '';
@@ -350,7 +350,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/attribute/image/property/template-item
 		 * Relative path to the HTML body template of the image subpart for attributes.
@@ -374,6 +374,6 @@ 
 		$tplconf = 'admin/jqadm/attribute/image/property/template-item';
 		$default = 'attribute/item-image-property-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/Supplier/Image/Property/Standard.php

Braces +1 added lines, -2 removed lines

@@ -291,8 +291,7 @@
 				{
 					$propItem = $propItems[$entry['media.property.id']];
 					unset( $propItems[$entry['media.property.id']] );
-				}
-				else
+				} else
 				{
 					$propItem = $propManager->createItem();
 				}

Spacing +42 added lines, -42 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Supplier\Image\Property;
 
-sprintf( 'property' ); // for translation
+sprintf('property'); // for translation
 
 
 /**
@@ -42,16 +42,16 @@ 
 	 */
 	public function copy()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->imageData = $this->toArray( $view->item, $view->get( 'imageData', [] ), true );
+		$view->imageData = $this->toArray($view->item, $view->get('imageData', []), true);
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -62,13 +62,13 @@ 
 	 */
 	public function create()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->get( 'imageData', [] );
+		$data = $view->get('imageData', []);
 
-		foreach( $data as $index => $entry )
+		foreach ($data as $index => $entry)
 		{
-			foreach( $view->value( $entry, 'property', [] ) as $idx => $y ) {
+			foreach ($view->value($entry, 'property', []) as $idx => $y) {
 				$data[$index]['property'][$idx]['supplier.lists.siteid'] = $siteid;
 			}
 		}
@@ -76,11 +76,11 @@ 
 		$view->propertyData = $data;
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -91,16 +91,16 @@ 
 	 */
 	public function get()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->imageData = $this->toArray( $view->item, $view->get( 'imageData', [] ) );
+		$view->imageData = $this->toArray($view->item, $view->get('imageData', []));
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -111,10 +111,10 @@ 
 	{
 		$view = $this->getView();
 
-		$view->item = $this->fromArray( $view->item, $view->param( 'image', [] ) );
+		$view->item = $this->fromArray($view->item, $view->param('image', []));
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->save();
 		}
 	}
@@ -127,7 +127,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/image/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the supplier JQAdm client
@@ -202,7 +202,7 @@ 
 		 * @see admin/jqadm/supplier/image/property/decorators/excludes
 		 * @see admin/jqadm/supplier/image/property/decorators/global
 		 */
-		return $this->createSubClient( 'supplier/image/property/' . $type, $name );
+		return $this->createSubClient('supplier/image/property/' . $type, $name);
 	}
 
 
@@ -212,15 +212,15 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface View object with assigned parameters
 	 */
-	protected function addViewData( \Aimeos\MW\View\Iface $view )
+	protected function addViewData(\Aimeos\MW\View\Iface $view)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/property/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/property/type');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'media.property.type.domain', 'supplier' ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->compare('==', 'media.property.type.domain', 'supplier'));
+		$search->setSlice(0, 0x7fffffff);
 
-		$view->propertyTypes = $manager->searchItems( $search );
+		$view->propertyTypes = $manager->searchItems($search);
 
 		return $view;
 	}
@@ -266,7 +266,7 @@ 
 		 * @since 2018.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/supplier/image/property/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/supplier/image/property/standard/subparts', []);
 	}
 
 
@@ -276,32 +276,32 @@ 
 	 * @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)
 	{
-		$propManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/property' );
+		$propManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/property');
 		$index = 0;
 
-		foreach( $item->getRefItems( 'media', null, null, false ) as $refItem )
+		foreach ($item->getRefItems('media', null, null, false) as $refItem)
 		{
-			$propItems = $refItem->getPropertyItems( null, false );
+			$propItems = $refItem->getPropertyItems(null, false);
 
-			foreach( (array) $this->getValue( $data, $index . '/property', [] ) as $entry )
+			foreach ((array) $this->getValue($data, $index . '/property', []) as $entry)
 			{
-				if( isset( $propItems[$entry['media.property.id']] ) )
+				if (isset($propItems[$entry['media.property.id']]))
 				{
 					$propItem = $propItems[$entry['media.property.id']];
-					unset( $propItems[$entry['media.property.id']] );
+					unset($propItems[$entry['media.property.id']]);
 				}
 				else
 				{
 					$propItem = $propManager->createItem();
 				}
 
-				$propItem->fromArray( $entry );
-				$refItem->addPropertyItem( $propItem );
+				$propItem->fromArray($entry);
+				$refItem->addPropertyItem($propItem);
 			}
 
-			$refItem->deletePropertyItems( $propItems );
+			$refItem->deletePropertyItems($propItems);
 			$index++;
 		}
 
@@ -317,18 +317,18 @@ 
 	 * @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, array $data, $copy = false )
+	protected function toArray(\Aimeos\MShop\Supplier\Item\Iface $item, array $data, $copy = false)
 	{
 		$idx = 0;
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $item->getRefItems( 'media', null, null, false ) as $mediaItem )
+		foreach ($item->getRefItems('media', null, null, false) as $mediaItem)
 		{
-			foreach( $mediaItem->getPropertyItems( null, false )  as $propItem )
+			foreach ($mediaItem->getPropertyItems(null, false)  as $propItem)
 			{
-				$list = $propItem->toArray( true );
+				$list = $propItem->toArray(true);
 
-				if( $copy === true )
+				if ($copy === true)
 				{
 					$list['media.property.siteid'] = $siteId;
 					$list['media.property.id'] = '';
@@ -350,7 +350,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/image/property/template-item
 		 * Relative path to the HTML body template of the image subpart for suppliers.
@@ -374,6 +374,6 @@ 
 		$tplconf = 'admin/jqadm/supplier/image/property/template-item';
 		$default = 'supplier/item-image-property-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/Catalog/Image/Property/Standard.php

Braces +1 added lines, -2 removed lines

@@ -291,8 +291,7 @@
 				{
 					$propItem = $propItems[$entry['media.property.id']];
 					unset( $propItems[$entry['media.property.id']] );
-				}
-				else
+				} else
 				{
 					$propItem = $propManager->createItem();
 				}

Spacing +42 added lines, -42 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Catalog\Image\Property;
 
-sprintf( 'property' ); // for translation
+sprintf('property'); // for translation
 
 
 /**
@@ -42,16 +42,16 @@ 
 	 */
 	public function copy()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->imageData = $this->toArray( $view->item, $view->get( 'imageData', [] ), true );
+		$view->imageData = $this->toArray($view->item, $view->get('imageData', []), true);
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -62,13 +62,13 @@ 
 	 */
 	public function create()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->get( 'imageData', [] );
+		$data = $view->get('imageData', []);
 
-		foreach( $data as $index => $entry )
+		foreach ($data as $index => $entry)
 		{
-			foreach( $view->value( $entry, 'property', [] ) as $idx => $y ) {
+			foreach ($view->value($entry, 'property', []) as $idx => $y) {
 				$data[$index]['property'][$idx]['catalog.lists.siteid'] = $siteid;
 			}
 		}
@@ -76,11 +76,11 @@ 
 		$view->propertyData = $data;
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -91,16 +91,16 @@ 
 	 */
 	public function get()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->imageData = $this->toArray( $view->item, $view->get( 'imageData', [] ) );
+		$view->imageData = $this->toArray($view->item, $view->get('imageData', []));
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -111,10 +111,10 @@ 
 	{
 		$view = $this->getView();
 
-		$view->item = $this->fromArray( $view->item, $view->param( 'image', [] ) );
+		$view->item = $this->fromArray($view->item, $view->param('image', []));
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->save();
 		}
 	}
@@ -127,7 +127,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/catalog/image/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog JQAdm client
@@ -202,7 +202,7 @@ 
 		 * @see admin/jqadm/catalog/image/property/decorators/excludes
 		 * @see admin/jqadm/catalog/image/property/decorators/global
 		 */
-		return $this->createSubClient( 'catalog/image/property/' . $type, $name );
+		return $this->createSubClient('catalog/image/property/' . $type, $name);
 	}
 
 
@@ -212,15 +212,15 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface View object with assigned parameters
 	 */
-	protected function addViewData( \Aimeos\MW\View\Iface $view )
+	protected function addViewData(\Aimeos\MW\View\Iface $view)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/property/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/property/type');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'media.property.type.domain', 'catalog' ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->compare('==', 'media.property.type.domain', 'catalog'));
+		$search->setSlice(0, 0x7fffffff);
 
-		$view->propertyTypes = $manager->searchItems( $search );
+		$view->propertyTypes = $manager->searchItems($search);
 
 		return $view;
 	}
@@ -266,7 +266,7 @@ 
 		 * @since 2018.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/catalog/image/property/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/catalog/image/property/standard/subparts', []);
 	}
 
 
@@ -276,32 +276,32 @@ 
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Catalog\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Catalog\Item\Iface $item, array $data)
 	{
-		$propManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/property' );
+		$propManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/property');
 		$index = 0;
 
-		foreach( $item->getRefItems( 'media', null, null, false ) as $refItem )
+		foreach ($item->getRefItems('media', null, null, false) as $refItem)
 		{
-			$propItems = $refItem->getPropertyItems( null, false );
+			$propItems = $refItem->getPropertyItems(null, false);
 
-			foreach( (array) $this->getValue( $data, $index . '/property', [] ) as $entry )
+			foreach ((array) $this->getValue($data, $index . '/property', []) as $entry)
 			{
-				if( isset( $propItems[$entry['media.property.id']] ) )
+				if (isset($propItems[$entry['media.property.id']]))
 				{
 					$propItem = $propItems[$entry['media.property.id']];
-					unset( $propItems[$entry['media.property.id']] );
+					unset($propItems[$entry['media.property.id']]);
 				}
 				else
 				{
 					$propItem = $propManager->createItem();
 				}
 
-				$propItem->fromArray( $entry );
-				$refItem->addPropertyItem( $propItem );
+				$propItem->fromArray($entry);
+				$refItem->addPropertyItem($propItem);
 			}
 
-			$refItem->deletePropertyItems( $propItems );
+			$refItem->deletePropertyItems($propItems);
 			$index++;
 		}
 
@@ -317,18 +317,18 @@ 
 	 * @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\Catalog\Item\Iface $item, array $data, $copy = false )
+	protected function toArray(\Aimeos\MShop\Catalog\Item\Iface $item, array $data, $copy = false)
 	{
 		$idx = 0;
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $item->getRefItems( 'media', null, null, false ) as $mediaItem )
+		foreach ($item->getRefItems('media', null, null, false) as $mediaItem)
 		{
-			foreach( $mediaItem->getPropertyItems( null, false )  as $propItem )
+			foreach ($mediaItem->getPropertyItems(null, false)  as $propItem)
 			{
-				$list = $propItem->toArray( true );
+				$list = $propItem->toArray(true);
 
-				if( $copy === true )
+				if ($copy === true)
 				{
 					$list['media.property.siteid'] = $siteId;
 					$list['media.property.id'] = '';
@@ -350,7 +350,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/catalog/image/property/template-item
 		 * Relative path to the HTML body template of the image subpart for catalogs.
@@ -374,6 +374,6 @@ 
 		$tplconf = 'admin/jqadm/catalog/image/property/template-item';
 		$default = 'catalog/item-image-property-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/Attribute/Property/Standard.php

Braces +3 added lines, -6 removed lines

@@ -121,14 +121,12 @@ 
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item-property' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item-property' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -320,8 +318,7 @@ 
 			{
 				$propItem = $propItems[$entry['attribute.property.id']];
 				unset( $propItems[$entry['attribute.property.id']] );
-			}
-			else
+			} else
 			{
 				$propItem = $manager->createItem();
 			}

Spacing +41 added lines, -41 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Attribute\Property;
 
-sprintf( 'property' ); // for translation
+sprintf('property'); // for translation
 
 
 /**
@@ -44,15 +44,15 @@ 
 	{
 		$view = $this->getView();
 
-		$view->propertyData = $this->toArray( $view->item, true );
+		$view->propertyData = $this->toArray($view->item, true);
 		$view->propertyTypes = $this->getPropertyTypes();
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -65,9 +65,9 @@ 
 	{
 		$view = $this->getView();
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->param( 'property', [] );
+		$data = $view->param('property', []);
 
-		foreach( $data as $idx => $entry ) {
+		foreach ($data as $idx => $entry) {
 			$data[$idx]['attribute.lists.siteid'] = $siteid;
 		}
 
@@ -75,11 +75,11 @@ 
 		$view->propertyData = $data;
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -92,15 +92,15 @@ 
 	{
 		$view = $this->getView();
 
-		$view->propertyData = $this->toArray( $view->item );
+		$view->propertyData = $this->toArray($view->item);
 		$view->propertyTypes = $this->getPropertyTypes();
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -113,26 +113,26 @@ 
 
 		try
 		{
-			$this->fromArray( $view->item, $view->param( 'property', [] ) );
+			$this->fromArray($view->item, $view->param('property', []));
 			$view->propertyBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->propertyBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'attribute-item-property' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item-property' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'attribute-item-property' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item-property' => $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/attribute/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the attribute JQAdm client
@@ -221,7 +221,7 @@ 
 		 * @see admin/jqadm/attribute/property/decorators/excludes
 		 * @see admin/jqadm/attribute/property/decorators/global
 		 */
-		return $this->createSubClient( 'attribute/property/' . $type, $name );
+		return $this->createSubClient('attribute/property/' . $type, $name);
 	}
 
 
@@ -265,7 +265,7 @@ 
 		 * @since 2018.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/attribute/property/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/attribute/property/standard/subparts', []);
 	}
 
 
@@ -276,8 +276,8 @@ 
 	 */
 	protected function getPropertyTypes()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute/property/type' );
-		return $manager->searchItems( $manager->createSearch()->setSlice( 0, 0x7fffffff ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute/property/type');
+		return $manager->searchItems($manager->createSearch()->setSlice(0, 0x7fffffff));
 	}
 
 
@@ -287,29 +287,29 @@ 
 	 * @param \Aimeos\MShop\Attribute\Item\Iface $item Attribute item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Attribute\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Attribute\Item\Iface $item, array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute/property' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute/property');
 
-		$propItems = $item->getPropertyItems( null, false );
+		$propItems = $item->getPropertyItems(null, false);
 
-		foreach( $data as $entry )
+		foreach ($data as $entry)
 		{
-			if( isset( $propItems[$entry['attribute.property.id']] ) )
+			if (isset($propItems[$entry['attribute.property.id']]))
 			{
 				$propItem = $propItems[$entry['attribute.property.id']];
-				unset( $propItems[$entry['attribute.property.id']] );
+				unset($propItems[$entry['attribute.property.id']]);
 			}
 			else
 			{
 				$propItem = $manager->createItem();
 			}
 
-			$propItem->fromArray( $entry );
-			$item->addPropertyItem( $propItem );
+			$propItem->fromArray($entry);
+			$item->addPropertyItem($propItem);
 		}
 
-		$item->deletePropertyItems( $propItems );
+		$item->deletePropertyItems($propItems);
 	}
 
 
@@ -320,16 +320,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\Attribute\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Attribute\Item\Iface $item, $copy = false)
 	{
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 		$data = [];
 
-		foreach( $item->getPropertyItems( null, false ) as $item )
+		foreach ($item->getPropertyItems(null, false) as $item)
 		{
-			$list = $item->toArray( true );
+			$list = $item->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['attribute.property.siteid'] = $siteId;
 				$list['attribute.property.id'] = '';
@@ -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/attribute/property/template-item
 		 * Relative path to the HTML body template of the property subpart for attributes.
@@ -372,6 +372,6 @@ 
 		$tplconf = 'admin/jqadm/attribute/property/template-item';
 		$default = 'attribute/item-property-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

admin/jqadm/src/Admin/JQAdm/Product/Characteristic/Property/Standard.php

Braces +1 added lines, -2 removed lines

@@ -305,8 +305,7 @@
 			{
 				$propItem = $propItems[$entry['product.property.id']];
 				unset( $propItems[$entry['product.property.id']] );
-			}
-			else
+			} else
 			{
 				$propItem = $manager->createItem();
 			}

Spacing +40 added lines, -40 removed lines

@@ -42,15 +42,15 @@ 
 	{
 		$view = $this->getView();
 
-		$view->propertyData = $this->toArray( $view->item, true );
+		$view->propertyData = $this->toArray($view->item, true);
 		$view->propertyTypes = $this->getPropertyTypes();
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -63,9 +63,9 @@ 
 	{
 		$view = $this->getView();
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->param( 'characteristic/property', [] );
+		$data = $view->param('characteristic/property', []);
 
-		foreach( $data as $idx => $entry ) {
+		foreach ($data as $idx => $entry) {
 			$data[$idx]['product.lists.siteid'] = $siteid;
 		}
 
@@ -73,11 +73,11 @@ 
 		$view->propertyData = $data;
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -90,15 +90,15 @@ 
 	{
 		$view = $this->getView();
 
-		$view->propertyData = $this->toArray( $view->item );
+		$view->propertyData = $this->toArray($view->item);
 		$view->propertyTypes = $this->getPropertyTypes();
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -109,10 +109,10 @@ 
 	{
 		$view = $this->getView();
 
-		$this->fromArray( $view->item, $view->param( 'characteristic/property', [] ) );
+		$this->fromArray($view->item, $view->param('characteristic/property', []));
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->save();
 		}
 	}
@@ -125,7 +125,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/characteristic/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -200,7 +200,7 @@ 
 		 * @see admin/jqadm/product/characteristic/property/decorators/excludes
 		 * @see admin/jqadm/product/characteristic/property/decorators/global
 		 */
-		return $this->createSubClient( 'product/characteristic/property/' . $type, $name );
+		return $this->createSubClient('product/characteristic/property/' . $type, $name);
 	}
 
 
@@ -210,14 +210,14 @@ 
 	 * @param \Aimeos\MShop\Common\Item\Property\Iface[] $propItems List of property items
 	 * @return \Aimeos\MShop\Common\Item\Property\Iface[] Filtered list of property items
 	 */
-	protected function excludeItems( array $propItems )
+	protected function excludeItems(array $propItems)
 	{
-		$excludes = array( 'package-length', 'package-height', 'package-width', 'package-weight' );
+		$excludes = array('package-length', 'package-height', 'package-width', 'package-weight');
 
-		foreach( $propItems as $key => $propItem )
+		foreach ($propItems as $key => $propItem)
 		{
-			if( in_array( $propItem->getType(), $excludes ) ) {
-				unset( $propItems[$key] );
+			if (in_array($propItem->getType(), $excludes)) {
+				unset($propItems[$key]);
 			}
 		}
 
@@ -265,7 +265,7 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/product/characteristic/property/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/product/characteristic/property/standard/subparts', []);
 	}
 
 
@@ -276,14 +276,14 @@ 
 	 */
 	protected function getPropertyTypes()
 	{
-		$excludes = array( 'package-length', 'package-height', 'package-width', 'package-weight' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property/type' );
+		$excludes = array('package-length', 'package-height', 'package-width', 'package-weight');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property/type');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '!=', 'product.property.type.code', $excludes ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->compare('!=', 'product.property.type.code', $excludes));
+		$search->setSlice(0, 0x7fffffff);
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -293,28 +293,28 @@ 
 	 * @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\Factory::createManager( $this->getContext(), 'product/property' );
-		$propItems = $this->excludeItems( $item->getPropertyItems( null, false ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property');
+		$propItems = $this->excludeItems($item->getPropertyItems(null, false));
 
-		foreach( $data as $entry )
+		foreach ($data as $entry)
 		{
-			if( isset( $propItems[$entry['product.property.id']] ) )
+			if (isset($propItems[$entry['product.property.id']]))
 			{
 				$propItem = $propItems[$entry['product.property.id']];
-				unset( $propItems[$entry['product.property.id']] );
+				unset($propItems[$entry['product.property.id']]);
 			}
 			else
 			{
 				$propItem = $manager->createItem();
 			}
 
-			$propItem->fromArray( $entry );
-			$item->addPropertyItem( $propItem );
+			$propItem->fromArray($entry);
+			$item->addPropertyItem($propItem);
 		}
 
-		$item->deletePropertyItems( $propItems );
+		$item->deletePropertyItems($propItems);
 	}
 
 
@@ -325,16 +325,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\Product\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Product\Item\Iface $item, $copy = false)
 	{
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 		$data = [];
 
-		foreach( $this->excludeItems( $item->getPropertyItems( null, false ) ) as $item )
+		foreach ($this->excludeItems($item->getPropertyItems(null, false)) as $item)
 		{
-			$list = $item->toArray( true );
+			$list = $item->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['product.property.siteid'] = $siteId;
 				$list['product.property.id'] = '';
@@ -353,7 +353,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/characteristic/property/template-item
 		 * Relative path to the HTML body template of the property characteristic subpart for products.
@@ -377,6 +377,6 @@ 
 		$tplconf = 'admin/jqadm/product/characteristic/property/template-item';
 		$default = 'product/item-characteristic-property-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

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

Braces +3 added lines, -6 removed lines

@@ -121,14 +121,12 @@ 
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-item-property' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'customer-item-property' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -299,8 +297,7 @@ 
 			{
 				$propItem = $propItems[$entry['customer.property.id']];
 				unset( $propItems[$entry['customer.property.id']] );
-			}
-			else
+			} else
 			{
 				$propItem = $manager->createItem();
 			}

Spacing +41 added lines, -41 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Customer\Property;
 
-sprintf( 'property' ); // for translation
+sprintf('property'); // for translation
 
 
 /**
@@ -44,15 +44,15 @@ 
 	{
 		$view = $this->getView();
 
-		$view->propertyData = $this->toArray( $view->item, true );
+		$view->propertyData = $this->toArray($view->item, true);
 		$view->propertyTypes = $this->getPropertyTypes();
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -65,9 +65,9 @@ 
 	{
 		$view = $this->getView();
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->param( 'property', [] );
+		$data = $view->param('property', []);
 
-		foreach( $data as $idx => $entry ) {
+		foreach ($data as $idx => $entry) {
 			$data[$idx]['customer.lists.siteid'] = $siteid;
 		}
 
@@ -75,11 +75,11 @@ 
 		$view->propertyData = $data;
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -92,15 +92,15 @@ 
 	{
 		$view = $this->getView();
 
-		$view->propertyData = $this->toArray( $view->item );
+		$view->propertyData = $this->toArray($view->item);
 		$view->propertyTypes = $this->getPropertyTypes();
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -113,26 +113,26 @@ 
 
 		try
 		{
-			$this->fromArray( $view->item, $view->param( 'property', [] ) );
+			$this->fromArray($view->item, $view->param('property', []));
 			$view->propertyBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->propertyBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'customer-item-property' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item-property' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'customer-item-property' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item-property' => $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/customer/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the customer JQAdm client
@@ -221,7 +221,7 @@ 
 		 * @see admin/jqadm/customer/property/decorators/excludes
 		 * @see admin/jqadm/customer/property/decorators/global
 		 */
-		return $this->createSubClient( 'customer/property/' . $type, $name );
+		return $this->createSubClient('customer/property/' . $type, $name);
 	}
 
 
@@ -265,7 +265,7 @@ 
 		 * @since 2018.07
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/customer/property/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/customer/property/standard/subparts', []);
 	}
 
 
@@ -276,8 +276,8 @@ 
 	 */
 	protected function getPropertyTypes()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/property/type' );
-		return $manager->searchItems( $manager->createSearch()->setSlice( 0, 0x7fffffff ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/property/type');
+		return $manager->searchItems($manager->createSearch()->setSlice(0, 0x7fffffff));
 	}
 
 
@@ -287,29 +287,29 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Customer\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Customer\Item\Iface $item, array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/property' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/property');
 
-		$propItems = $item->getPropertyItems( null, false );
+		$propItems = $item->getPropertyItems(null, false);
 
-		foreach( $data as $entry )
+		foreach ($data as $entry)
 		{
-			if( isset( $propItems[$entry['customer.property.id']] ) )
+			if (isset($propItems[$entry['customer.property.id']]))
 			{
 				$propItem = $propItems[$entry['customer.property.id']];
-				unset( $propItems[$entry['customer.property.id']] );
+				unset($propItems[$entry['customer.property.id']]);
 			}
 			else
 			{
 				$propItem = $manager->createItem();
 			}
 
-			$propItem->fromArray( $entry );
-			$item->addPropertyItem( $propItem );
+			$propItem->fromArray($entry);
+			$item->addPropertyItem($propItem);
 		}
 
-		$item->deletePropertyItems( $propItems );
+		$item->deletePropertyItems($propItems);
 	}
 
 
@@ -320,16 +320,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\Customer\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Customer\Item\Iface $item, $copy = false)
 	{
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 		$data = [];
 
-		foreach( $item->getPropertyItems( null, false ) as $item )
+		foreach ($item->getPropertyItems(null, false) as $item)
 		{
-			$list = $item->toArray( true );
+			$list = $item->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['customer.property.siteid'] = $siteId;
 				$list['customer.property.id'] = '';
@@ -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/customer/property/template-item
 		 * Relative path to the HTML body template of the property subpart for customers.
@@ -372,6 +372,6 @@ 
 		$tplconf = 'admin/jqadm/customer/property/template-item';
 		$default = 'customer/item-property-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

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

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', 'customer.address.languageid' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'address', 'idx', 'customer.address.languageid' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $languages ) ); ?>" />
 					<?php endif; ?>
 					<div class="form-group row optional">

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, 'customer.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('customer.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', 'customer.address.id' ) ) ); ?>'.replace('idx', idx)"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.id'))); ?>'.replace('idx', idx)"
 						v-bind:value="items[idx]['customer.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', 'customer.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', 'customer.address.languageid'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('customer.address.siteid', idx)"
 									v-model="items[idx]['customer.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['customer.address.languageid'] == '<?= $enc->attr( $langId ) ?>'" >
-											<?= $enc->html( $langItem->getLabel() ); ?>
+									<?php foreach ($languages as $langId => $langItem) : ?>
+										<option value="<?= $enc->attr($langId); ?>" v-bind:selected="entry['customer.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', 'customer.address.languageid' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $languages ) ); ?>" />
+							v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.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', 'customer.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', 'customer.address.salutation'))); ?>'.replace('idx', idx)"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.salutation']" >
 								<option value="company" v-bind:selected="items[idx]['customer.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]['customer.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]['customer.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]['customer.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 customer is addressed in e-mails' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'How the customer 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', 'customer.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', 'customer.address.title'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Honorary title (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.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', 'customer.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', 'customer.address.lastname'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Last name (required)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.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', 'customer.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', 'customer.address.firstname'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'First name (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.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', 'customer.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', 'customer.address.address1'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Street name (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.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', 'customer.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', 'customer.address.address2'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'House number (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.address2']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Address identifier of the customer\'s house for delivery' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Address identifier of the customer\'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', 'customer.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', 'customer.address.address3'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Floor and/or apartment (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.address3']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Additional information where the customer\'s apartment can be found' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Additional information where the customer\'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', 'customer.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', 'customer.address.postal'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Zip code (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.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 customer is living' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Postal code for delivery if used in the area the customer 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', 'customer.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', 'customer.address.city'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'City or town name (required)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.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', 'customer.address.countryid' ) ) ); ?>'.replace('idx', idx)"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('address', 'idx', 'customer.address.countryid'))); ?>'.replace('idx', idx)"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
-								v-bind:tabindex="'<?= $this->get( 'tabindex' ); ?>'"
+								v-bind:tabindex="'<?= $this->get('tabindex'); ?>'"
 								v-bind:getfcn="getCountries"
 								v-model="items[idx]['customer.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', 'customer.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', 'customer.address.state'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Country state code (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.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 customer is living' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Short state code (e.g. NY) if used in the country the customer 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', 'customer.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', 'customer.address.telephone'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Telephone number (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.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', 'customer.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', 'customer.address.telefax'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Facsimile number (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.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', 'customer.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', 'customer.address.email'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'E-mail address (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.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', 'customer.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', 'customer.address.website'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Web site URL (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.address.website']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'URL of the customer web site' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'URL of the customer 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', 'customer.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', 'customer.address.company'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Company name (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.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', 'customer.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', 'customer.address.vatid'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Value added tax identifier (optional)')); ?>"
 								v-bind:readonly="checkSite('customer.address.siteid', idx)"
 								v-model="items[idx]['customer.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('customer.address.')" >
 			</div>
 		</div>

admin/jqadm/src/Admin/JQAdm/Customer/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( 'customer-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( 'customer-item-address' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -284,8 +282,7 @@ 
 			{
 				$addrItem = $addrItems[$entry['customer.address.id']];
 				unset( $addrItems[$entry['customer.address.id']] );
-			}
-			else
+			} else
 			{
 				$addrItem = $manager->createItem();
 			}

Spacing +38 added lines, -38 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Customer\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]['customer.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( 'customer-item-address' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-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( 'customer-item-address' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-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/customer/address/decorators/excludes
 		 * Excludes decorators added by the "common" option from the customer JQAdm client
@@ -218,7 +218,7 @@ 
 		 * @see admin/jqadm/customer/address/decorators/excludes
 		 * @see admin/jqadm/customer/address/decorators/global
 		 */
-		return $this->createSubClient( 'customer/address/' . $type, $name );
+		return $this->createSubClient('customer/address/' . $type, $name);
 	}
 
 
@@ -262,7 +262,7 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/customer/address/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/customer/address/standard/subparts', []);
 	}
 
 
@@ -272,29 +272,29 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Customer\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Customer\Item\Iface $item, array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
 
 		$addrItems = $item->getAddressItems();
 
-		foreach( $data as $entry )
+		foreach ($data as $entry)
 		{
-			if( isset( $addrItems[$entry['customer.address.id']] ) )
+			if (isset($addrItems[$entry['customer.address.id']]))
 			{
 				$addrItem = $addrItems[$entry['customer.address.id']];
-				unset( $addrItems[$entry['customer.address.id']] );
+				unset($addrItems[$entry['customer.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\Customer\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Customer\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['customer.address.siteid'] = $siteId;
 				$list['customer.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/customer/address/template-item
 		 * Relative path to the HTML body template of the address subpart for customers.
@@ -357,6 +357,6 @@ 
 		$tplconf = 'admin/jqadm/customer/address/template-item';
 		$default = 'customer/item-address-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

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\Factory::createManager( $this->getContext(), 'supplier/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($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));
 	}
 }