aimeos / ai-admin-jqadm

admin/jqadm/src/Admin/JQAdm/Catalog/Factory.php

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return \Aimeos\Admin\JQAdm\Iface Filter part implementing \Aimeos\Admin\JQAdm\Iface
 	 * @throws \Aimeos\Admin\JQAdm\Exception If requested client implementation couldn't be found or initialisation fails
 	 */
-	public static function create( \Aimeos\MShop\Context\Item\Iface $context, $name = null )
+	public static function create(\Aimeos\MShop\Context\Item\Iface $context, $name = null)
 	{
 		/** admin/jqadm/catalog/name
 		 * Class name of the used account favorite client implementation
@@ -64,22 +64,22 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'admin/jqadm/catalog/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('admin/jqadm/catalog/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Admin\\JQAdm\\Catalog\\' . $name : '<not a string>';
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Admin\\JQAdm\\Catalog\\' . $name : '<not a string>';
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Admin\\JQAdm\\Iface';
 		$classname = '\\Aimeos\\Admin\\JQAdm\\Catalog\\' . $name;
 
-		$client = self::createAdmin( $context, $classname, $iface );
+		$client = self::createAdmin($context, $classname, $iface);
 
-		return self::addClientDecorators( $context, $client, 'catalog' );
+		return self::addClientDecorators($context, $client, 'catalog');
 	}
 
 }
\ No newline at end of file

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

Spacing +42 added lines, -42 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Service\Media\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->mediaData = $this->toArray( $view->item, $view->get( 'mediaData', [] ), true );
+		$view->mediaData = $this->toArray($view->item, $view->get('mediaData', []), 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( 'mediaData', [] );
+		$data = $view->get('mediaData', []);
 
-		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]['service.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->mediaData = $this->toArray( $view->item, $view->get( 'mediaData', [] ) );
+		$view->mediaData = $this->toArray($view->item, $view->get('mediaData', []));
 		$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( 'media', [] ) );
+		$view->item = $this->fromArray($view->item, $view->param('media', []));
 		$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/service/media/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the service JQAdm client
@@ -202,7 +202,7 @@ 
 		 * @see admin/jqadm/service/media/property/decorators/excludes
 		 * @see admin/jqadm/service/media/property/decorators/global
 		 */
-		return $this->createSubClient( 'service/media/property/' . $type, $name );
+		return $this->createSubClient('service/media/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::create( $this->getContext(), 'media/property/type' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'media/property/type');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'media.property.type.domain', 'service' ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->compare('==', 'media.property.type.domain', 'service'));
+		$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/service/media/property/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/service/media/property/standard/subparts', []);
 	}
 
 
@@ -276,32 +276,32 @@ 
 	 * @param \Aimeos\MShop\Service\Item\Iface $item Service item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Service\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Service\Item\Iface $item, array $data)
 	{
-		$propManager = \Aimeos\MShop::create( $this->getContext(), 'media/property' );
+		$propManager = \Aimeos\MShop::create($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\Service\Item\Iface $item, array $data, $copy = false )
+	protected function toArray(\Aimeos\MShop\Service\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/service/media/property/template-item
 		 * Relative path to the HTML body template of the media subpart for services.
@@ -374,6 +374,6 @@ 
 		$tplconf = 'admin/jqadm/service/media/property/template-item';
 		$default = 'service/item-media-property-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

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();
 				}

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

Spacing +87 added lines, -87 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Service\Media;
 
-sprintf( 'media' ); // for translation
+sprintf('media'); // for translation
 
 
 /**
@@ -42,16 +42,16 @@ 
 	 */
 	public function copy()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->mediaData = $this->toArray( $view->item, true );
+		$view->mediaData = $this->toArray($view->item, true);
 		$view->mediaBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->mediaBody .= $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();
 
-		$itemData = $this->toArray( $view->item );
-		$data = array_replace_recursive( $itemData, $view->param( 'media', [] ) );
+		$itemData = $this->toArray($view->item);
+		$data = array_replace_recursive($itemData, $view->param('media', []));
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
 			$data[$idx]['media.siteid'] = $siteid;
 			$data[$idx]['media.url'] = $itemData[$idx]['media.url'];
@@ -79,11 +79,11 @@ 
 		$view->mediaData = $data;
 		$view->mediaBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->mediaBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -95,15 +95,15 @@ 
 		parent::delete();
 
 		$item = $this->getView()->item;
-		$cntl = \Aimeos\Controller\Common\Media\Factory::create( $this->getContext() );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::create($this->getContext());
 
-		foreach( $item->getListItems( 'media', null, null, false ) as $listItem )
+		foreach ($item->getListItems('media', null, null, false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$cntl->delete( $refItem );
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$cntl->delete($refItem);
 			}
 
-			$item->deleteListItem( 'media', $listItem, $refItem );
+			$item->deleteListItem('media', $listItem, $refItem);
 		}
 	}
 
@@ -115,16 +115,16 @@ 
 	 */
 	public function get()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->mediaData = $this->toArray( $view->item );
+		$view->mediaData = $this->toArray($view->item);
 		$view->mediaBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->mediaBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -137,26 +137,26 @@ 
 
 		try
 		{
-			$view->item = $this->fromArray( $view->item, $view->param( 'media', [] ) );
+			$view->item = $this->fromArray($view->item, $view->param('media', []));
 			$view->mediaBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->mediaBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'service-item-media' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item-media' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'service-item-media' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item-media' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -170,7 +170,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/service/media/decorators/excludes
 		 * Excludes decorators added by the "common" option from the service JQAdm client
@@ -245,7 +245,7 @@ 
 		 * @see admin/jqadm/service/media/decorators/excludes
 		 * @see admin/jqadm/service/media/decorators/global
 		 */
-		return $this->createSubClient( 'service/media/' . $type, $name );
+		return $this->createSubClient('service/media/' . $type, $name);
 	}
 
 
@@ -255,23 +255,23 @@ 
 	 * @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)
 	{
 		$context = $this->getContext();
 
-		$typeManager = \Aimeos\MShop::create( $this->getContext(), 'media/type' );
-		$listTypeManager = \Aimeos\MShop::create( $this->getContext(), 'service/lists/type' );
+		$typeManager = \Aimeos\MShop::create($this->getContext(), 'media/type');
+		$listTypeManager = \Aimeos\MShop::create($this->getContext(), 'service/lists/type');
 
-		$search = $typeManager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'media.type.domain', 'service' ) );
-		$search->setSortations( array( $search->sort( '+', 'media.type.label' ) ) );
+		$search = $typeManager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'media.type.domain', 'service'));
+		$search->setSortations(array($search->sort('+', 'media.type.label')));
 
-		$listSearch = $listTypeManager->createSearch( true )->setSlice( 0, 0x7fffffff );
-		$listSearch->setConditions( $listSearch->compare( '==', 'service.lists.type.domain', 'media' ) );
-		$listSearch->setSortations( array( $listSearch->sort( '+', 'service.lists.type.label' ) ) );
+		$listSearch = $listTypeManager->createSearch(true)->setSlice(0, 0x7fffffff);
+		$listSearch->setConditions($listSearch->compare('==', 'service.lists.type.domain', 'media'));
+		$listSearch->setSortations(array($listSearch->sort('+', 'service.lists.type.label')));
 
-		$view->mediaListTypes = $this->sortType( $listTypeManager->searchItems( $listSearch ) );
-		$view->mediaTypes = $typeManager->searchItems( $search );
+		$view->mediaListTypes = $this->sortType($listTypeManager->searchItems($listSearch));
+		$view->mediaTypes = $typeManager->searchItems($search);
 
 		return $view;
 	}
@@ -284,29 +284,29 @@ 
 	 * @param array $listItems Media list items to be removed
 	 * @return \Aimeos\MShop\Service\Item\Iface Modified service item
 	 */
-	protected function deleteMediaItems( \Aimeos\MShop\Service\Item\Iface $item, array $listItems )
+	protected function deleteMediaItems(\Aimeos\MShop\Service\Item\Iface $item, array $listItems)
 	{
 		$context = $this->getContext();
-		$cntl = \Aimeos\Controller\Common\Media\Factory::create( $context );
-		$manager = \Aimeos\MShop::create( $context, 'service' );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::create($context);
+		$manager = \Aimeos\MShop::create($context, 'service');
 		$search = $manager->createSearch();
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
 			$expr = [
-				$search->compare( '==', 'service.lists.domain', 'media' ),
-				$search->compare( '==', 'service.lists.type', $listItem->getType() ),
-				$search->compare( '==', 'service.lists.refid', $listItem->getRefId() ),
+				$search->compare('==', 'service.lists.domain', 'media'),
+				$search->compare('==', 'service.lists.type', $listItem->getType()),
+				$search->compare('==', 'service.lists.refid', $listItem->getRefId()),
 			];
-			$search->setConditions( $search->combine( '&&', $expr ) );
-			$items = $manager->searchItems( $search );
+			$search->setConditions($search->combine('&&', $expr));
+			$items = $manager->searchItems($search);
 			$refItem = null;
 
-			if( count( $items ) === 1 && ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$cntl->delete( $refItem );
+			if (count($items) === 1 && ($refItem = $listItem->getRefItem()) !== null) {
+				$cntl->delete($refItem);
 			}
 
-			$item->deleteListItem( 'media', $listItem, $refItem );
+			$item->deleteListItem('media', $listItem, $refItem);
 		}
 
 		return $item;
@@ -353,7 +353,7 @@ 
 		 * @since 2017.07
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/service/media/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/service/media/standard/subparts', []);
 	}
 
 
@@ -363,54 +363,54 @@ 
 	 * @param \Aimeos\MShop\Service\Item\Iface $item Service item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Service\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Service\Item\Iface $item, array $data)
 	{
 		$context = $this->getContext();
 
-		$mediaManager = \Aimeos\MShop::create( $context, 'media' );
-		$listManager = \Aimeos\MShop::create( $context, 'service/lists' );
-		$cntl = \Aimeos\Controller\Common\Media\Factory::create( $context );
+		$mediaManager = \Aimeos\MShop::create($context, 'media');
+		$listManager = \Aimeos\MShop::create($context, 'service/lists');
+		$cntl = \Aimeos\Controller\Common\Media\Factory::create($context);
 
-		$listItems = $item->getListItems( 'media', null, null, false );
+		$listItems = $item->getListItems('media', null, null, false);
 		$files = (array) $this->getView()->request()->getUploadedFiles();
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
-			if( ( $listItem = $item->getListItem( 'media', $entry['service.lists.type'], $entry['media.id'], false ) ) === null ) {
+			if (($listItem = $item->getListItem('media', $entry['service.lists.type'], $entry['media.id'], false)) === null) {
 				$listItem = $listManager->createItem();
 			}
 
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				$refItem = $mediaManager->createItem();
 			}
 
-			$refItem->fromArray( $entry );
+			$refItem->fromArray($entry);
 
-			if( ( $file = $this->getValue( $files, 'media/' . $idx . '/file' ) ) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE )
+			if (($file = $this->getValue($files, 'media/' . $idx . '/file')) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE)
 			{
-				$refItem->getId() ?: $refItem->setUrl( '' )->setPreview( '' ); // keep copied media
-				$cntl->add( $refItem, $file );
+				$refItem->getId() ?: $refItem->setUrl('')->setPreview(''); // keep copied media
+				$cntl->add($refItem, $file);
 			}
 
 			$conf = [];
 
-			foreach( (array) $this->getValue( $entry, 'config/key' ) as $num => $key )
+			foreach ((array) $this->getValue($entry, 'config/key') as $num => $key)
 			{
-				if( trim( $key ) !== '' && ( $val = $this->getValue( $entry, 'config/val/' . $num ) ) !== null ) {
-					$conf[$key] = trim( $val );
+				if (trim($key) !== '' && ($val = $this->getValue($entry, 'config/val/' . $num)) !== null) {
+					$conf[$key] = trim($val);
 				}
 			}
 
-			$listItem->fromArray( $entry );
-			$listItem->setPosition( $idx );
-			$listItem->setConfig( $conf );
+			$listItem->fromArray($entry);
+			$listItem->setPosition($idx);
+			$listItem->setConfig($conf);
 
-			$item->addListItem( 'media', $listItem, $refItem );
+			$item->addListItem('media', $listItem, $refItem);
 
-			unset( $listItems[$listItem->getId()] );
+			unset($listItems[$listItem->getId()]);
 		}
 
-		return $this->deleteMediaItems( $item, $listItems );
+		return $this->deleteMediaItems($item, $listItems);
 	}
 
 
@@ -421,20 +421,20 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Service\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Service\Item\Iface $item, $copy = false)
 	{
 		$data = [];
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $item->getListItems( 'media', null, null, false ) as $listItem )
+		foreach ($item->getListItems('media', null, null, false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				continue;
 			}
 
-			$list = $listItem->toArray( true ) + $refItem->toArray( true );
+			$list = $listItem->toArray(true) + $refItem->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['service.lists.siteid'] = $siteId;
 				$list['service.lists.id'] = '';
@@ -442,10 +442,10 @@ 
 				$list['media.id'] = null;
 			}
 
-			$list['service.lists.datestart'] = str_replace( ' ', 'T', $list['service.lists.datestart'] );
-			$list['service.lists.dateend'] = str_replace( ' ', 'T', $list['service.lists.dateend'] );
+			$list['service.lists.datestart'] = str_replace(' ', 'T', $list['service.lists.datestart']);
+			$list['service.lists.dateend'] = str_replace(' ', 'T', $list['service.lists.dateend']);
 
-			foreach( $list['service.lists.config'] as $key => $val )
+			foreach ($list['service.lists.config'] as $key => $val)
 			{
 				$list['config']['key'][] = $key;
 				$list['config']['val'][] = $val;
@@ -464,7 +464,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/service/media/template-item
 		 * Relative path to the HTML body template of the media subpart for services.
@@ -488,6 +488,6 @@ 
 		$tplconf = 'admin/jqadm/service/media/template-item';
 		$default = 'service/item-media-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

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

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

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return \Aimeos\Admin\JQAdm\Iface Filter part implementing \Aimeos\Admin\JQAdm\Iface
 	 * @throws \Aimeos\Admin\JQAdm\Exception If requested client implementation couldn't be found or initialisation fails
 	 */
-	public static function create( \Aimeos\MShop\Context\Item\Iface $context, $name = null )
+	public static function create(\Aimeos\MShop\Context\Item\Iface $context, $name = null)
 	{
 		/** admin/jqadm/service/name
 		 * Class name of the used account favorite client implementation
@@ -64,22 +64,22 @@ 
 		 * @since 2017.07
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'admin/jqadm/service/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('admin/jqadm/service/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Admin\\JQAdm\\Service\\' . $name : '<not a string>';
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Admin\\JQAdm\\Service\\' . $name : '<not a string>';
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Admin\\JQAdm\\Iface';
 		$classname = '\\Aimeos\\Admin\\JQAdm\\Service\\' . $name;
 
-		$client = self::createAdmin( $context, $classname, $iface );
+		$client = self::createAdmin($context, $classname, $iface);
 
-		return self::addClientDecorators( $context, $client, 'service' );
+		return self::addClientDecorators($context, $client, 'service');
 	}
 
 }
\ No newline at end of file

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

Spacing +104 added lines, -104 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Customer\Product;
 
-sprintf( 'product' ); // for translation
+sprintf('product'); // for translation
 
 
 /**
@@ -49,24 +49,24 @@ 
 			$view->productListTypes = $this->getListTypes();
 			$view->productBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->productBody .= $client->copy();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'customer-product' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-product' => $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-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -84,24 +84,24 @@ 
 			$view->productListTypes = $this->getListTypes();
 			$view->productBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->productBody .= $client->create();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'customer-product' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-product' => $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-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -117,33 +117,33 @@ 
 		try
 		{
 			$total = 0;
-			$params = $this->storeSearchParams( $view->param( 'up', [] ), 'customerproduct' );
-			$listItems = $this->getListItems( $view->item, $params, $total );
+			$params = $this->storeSearchParams($view->param('up', []), 'customerproduct');
+			$listItems = $this->getListItems($view->item, $params, $total);
 
-			$view->productItems = $this->getProductItems( $listItems );
-			$view->productData = $this->toArray( $listItems );
+			$view->productItems = $this->getProductItems($listItems);
+			$view->productData = $this->toArray($listItems);
 			$view->productListTypes = $this->getListTypes();
 			$view->productTotal = $total;
 			$view->productBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->productBody .= $client->search();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'customer-product' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-product' => $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-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -155,34 +155,34 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop::create( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop::create($context, 'customer/lists');
 
 		$manager->begin();
 
 		try
 		{
-			$this->storeSearchParams( $view->param( 'up', [] ), 'customerproduct' );
-			$this->fromArray( $view->item, $view->param( 'product', [] ) );
+			$this->storeSearchParams($view->param('up', []), 'customerproduct');
+			$this->fromArray($view->item, $view->param('product', []));
 			$view->productBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->productBody .= $client->save();
 			}
 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'customer-item-media' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item-media' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'customer-item-media' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('customer-item-media' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -198,7 +198,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/product/decorators/excludes
 		 * Excludes decorators added by the "common" option from the customer JQAdm client
@@ -273,7 +273,7 @@ 
 		 * @see admin/jqadm/customer/product/decorators/excludes
 		 * @see admin/jqadm/customer/product/decorators/global
 		 */
-		return $this->createSubClient( 'customer/product/' . $type, $name );
+		return $this->createSubClient('customer/product/' . $type, $name);
 	}
 
 
@@ -285,22 +285,22 @@ 
 	 * @param integer $total Value/result parameter that will contain the item total afterwards
 	 * @return \Aimeos\MShop\Common\Item\List\Iface[] Customer list items referencing the products
 	 */
-	protected function getListItems( \Aimeos\MShop\Customer\Item\Iface $item, array $params = [], &$total )
+	protected function getListItems(\Aimeos\MShop\Customer\Item\Iface $item, array $params = [], &$total)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer/lists' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/lists');
 
 		$search = $manager->createSearch();
-		$search->setSortations( [$search->sort( '-', 'customer.lists.ctime' )] );
+		$search->setSortations([$search->sort('-', 'customer.lists.ctime')]);
 
-		$search = $this->initCriteria( $search, $params );
+		$search = $this->initCriteria($search, $params);
 		$expr = [
 			$search->getConditions(),
-			$search->compare( '==', 'customer.lists.parentid', $item->getId() ),
-			$search->compare( '==', 'customer.lists.domain', 'product' ),
+			$search->compare('==', 'customer.lists.parentid', $item->getId()),
+			$search->compare('==', 'customer.lists.domain', 'product'),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search, [], $total );
+		return $manager->searchItems($search, [], $total);
 	}
 
 
@@ -312,13 +312,13 @@ 
 	protected function getListTypes()
 	{
 		$list = [];
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer/lists/type' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/lists/type');
 
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'customer.lists.type.domain', 'product' ) );
-		$search->setSortations( [$search->sort( '+', 'customer.lists.type.code' )] );
+		$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'customer.lists.type.domain', 'product'));
+		$search->setSortations([$search->sort('+', 'customer.lists.type.code')]);
 
-		foreach( $manager->searchItems( $search ) as $id => $item ) {
+		foreach ($manager->searchItems($search) as $id => $item) {
 			$list[$id] = $item->getCode();
 		}
 
@@ -332,20 +332,20 @@ 
 	 * @param \Aimeos\MShop\Common\Item\List\Iface[] $listItems Customer list items referencing the products
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Associative list of product IDs as keys and items as values
 	 */
-	protected function getProductItems( array $listItems )
+	protected function getProductItems(array $listItems)
 	{
 		$list = [];
 
-		foreach( $listItems as $listItem ) {
+		foreach ($listItems as $listItem) {
 			$list[] = $listItem->getRefId();
 		}
 
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'product' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'product');
 
-		$search = $manager->createSearch()->setSlice( 0, count( $list ) );
-		$search->setConditions( $search->compare( '==', 'product.id', $list ) );
+		$search = $manager->createSearch()->setSlice(0, count($list));
+		$search->setConditions($search->compare('==', 'product.id', $list));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -389,7 +389,7 @@ 
 		 * @since 2017.07
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/customer/product/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/customer/product/standard/subparts', []);
 	}
 
 
@@ -399,75 +399,75 @@ 
 	 * @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)
 	{
 		$context = $this->getContext();
-		$listIds = $this->getValue( $data, 'customer.lists.id', [] );
+		$listIds = $this->getValue($data, 'customer.lists.id', []);
 
-		$listManager = \Aimeos\MShop::create( $context, 'customer/lists' );
+		$listManager = \Aimeos\MShop::create($context, 'customer/lists');
 
-		$search = $listManager->createSearch()->setSlice( 0, count( $listIds ) );
-		$search->setConditions( $search->compare( '==', 'customer.lists.id', $listIds ) );
+		$search = $listManager->createSearch()->setSlice(0, count($listIds));
+		$search->setConditions($search->compare('==', 'customer.lists.id', $listIds));
 
-		$listItems = $listManager->searchItems( $search );
+		$listItems = $listManager->searchItems($search);
 
 
-		foreach( (array) $listIds as $idx => $listid )
+		foreach ((array) $listIds as $idx => $listid)
 		{
-			if( isset( $listItems[$listid] ) ) {
+			if (isset($listItems[$listid])) {
 				$litem = $listItems[$listid];
 			} else {
 				$litem = $listManager->createItem();
 			}
 
-			$litem->setParentId( $item->getId() );
-			$litem->setDomain( 'product' );
+			$litem->setParentId($item->getId());
+			$litem->setDomain('product');
 
-			if( isset( $data['customer.lists.refid'][$idx] ) ) {
-				$litem->setRefId( $this->getValue( $data, 'customer.lists.refid/' . $idx ) );
+			if (isset($data['customer.lists.refid'][$idx])) {
+				$litem->setRefId($this->getValue($data, 'customer.lists.refid/' . $idx));
 			}
 
-			if( isset( $data['customer.lists.status'][$idx] ) ) {
-				$litem->setStatus( $this->getValue( $data, 'customer.lists.status/' . $idx ) );
+			if (isset($data['customer.lists.status'][$idx])) {
+				$litem->setStatus($this->getValue($data, 'customer.lists.status/' . $idx));
 			}
 
-			if( isset( $data['customer.lists.type'][$idx] ) ) {
-				$litem->setType( $this->getValue( $data, 'customer.lists.type/' . $idx ) );
+			if (isset($data['customer.lists.type'][$idx])) {
+				$litem->setType($this->getValue($data, 'customer.lists.type/' . $idx));
 			}
 
-			if( isset( $data['customer.lists.position'][$idx] ) ) {
-				$litem->setPosition( $this->getValue( $data, 'customer.lists.position/' . $idx ) );
+			if (isset($data['customer.lists.position'][$idx])) {
+				$litem->setPosition($this->getValue($data, 'customer.lists.position/' . $idx));
 			}
 
-			if( isset( $data['customer.lists.datestart'][$idx] ) ) {
-				$litem->setDateStart( $this->getValue( $data, 'customer.lists.datestart/' . $idx ) );
+			if (isset($data['customer.lists.datestart'][$idx])) {
+				$litem->setDateStart($this->getValue($data, 'customer.lists.datestart/' . $idx));
 			}
 
-			if( isset( $data['customer.lists.dateend'][$idx] ) ) {
-				$litem->setDateEnd( $this->getValue( $data, 'customer.lists.dateend/' . $idx ) );
+			if (isset($data['customer.lists.dateend'][$idx])) {
+				$litem->setDateEnd($this->getValue($data, 'customer.lists.dateend/' . $idx));
 			}
 
-			if( isset( $data['customer.lists.config'][$idx] )
-				&& ( $conf = json_decode( $this->getValue( $data, 'customer.lists.config/' . $idx ), true ) ) !== null
+			if (isset($data['customer.lists.config'][$idx])
+				&& ($conf = json_decode($this->getValue($data, 'customer.lists.config/' . $idx), true)) !== null
 			) {
-				$litem->setConfig( $conf );
+				$litem->setConfig($conf);
 			}
 
-			if( $litem->getId() === null && isset( $data['config'][$idx]['key'] ) )
+			if ($litem->getId() === null && isset($data['config'][$idx]['key']))
 			{
 				$conf = [];
 
-				foreach( (array) $data['config'][$idx]['key'] as $pos => $key )
+				foreach ((array) $data['config'][$idx]['key'] as $pos => $key)
 				{
-					if( trim( $key ) !== '' && isset( $data['config'][$idx]['val'][$pos] ) ) {
+					if (trim($key) !== '' && isset($data['config'][$idx]['val'][$pos])) {
 						$conf[$key] = $data['config'][$idx]['val'][$pos];
 					}
 				}
 
-				$litem->setConfig( $conf );
+				$litem->setConfig($conf);
 			}
 
-			$listManager->saveItem( $litem, false );
+			$listManager->saveItem($litem, false);
 		}
 	}
 
@@ -478,13 +478,13 @@ 
 	 * @param \Aimeos\MShop\Common\Item\Lists\Iface[] $listItems Customer list items referencing the products
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( array $listItems )
+	protected function toArray(array $listItems)
 	{
 		$data = [];
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			foreach( $listItem->toArray( true ) as $key => $value ) {
+			foreach ($listItem->toArray(true) as $key => $value) {
 				$data[$key][] = $value;
 			}
 		}
@@ -499,7 +499,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/product/template-item
 		 * Relative path to the HTML body template of the product subpart for customers.
@@ -523,6 +523,6 @@ 
 		$tplconf = 'admin/jqadm/customer/product/template-item';
 		$default = 'customer/item-product-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

Braces +8 added lines, -16 removed lines

@@ -52,14 +52,12 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->productBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-product' => $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-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -87,14 +85,12 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->productBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-product' => $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-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -129,14 +125,12 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->productBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-product' => $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-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -171,14 +165,12 @@ 
 
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-item-media' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'customer-item-media' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

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

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return \Aimeos\Admin\JQAdm\Iface Filter part implementing \Aimeos\Admin\JQAdm\Iface
 	 * @throws \Aimeos\Admin\JQAdm\Exception If requested client implementation couldn't be found or initialisation fails
 	 */
-	public static function create( \Aimeos\MShop\Context\Item\Iface $context, $name = null )
+	public static function create(\Aimeos\MShop\Context\Item\Iface $context, $name = null)
 	{
 		/** admin/jqadm/customer/name
 		 * Class name of the used account favorite client implementation
@@ -64,22 +64,22 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'admin/jqadm/customer/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('admin/jqadm/customer/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Admin\\JQAdm\\Customer\\' . $name : '<not a string>';
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Admin\\JQAdm\\Customer\\' . $name : '<not a string>';
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Admin\\JQAdm\\Iface';
 		$classname = '\\Aimeos\\Admin\\JQAdm\\Customer\\' . $name;
 
-		$client = self::createAdmin( $context, $classname, $iface );
+		$client = self::createAdmin($context, $classname, $iface);
 
-		return self::addClientDecorators( $context, $client, 'customer' );
+		return self::addClientDecorators($context, $client, 'customer');
 	}
 
 }
\ No newline at end of file

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

Spacing +42 added lines, -42 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Supplier\Media\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->mediaData = $this->toArray( $view->item, $view->get( 'mediaData', [] ), true );
+		$view->mediaData = $this->toArray($view->item, $view->get('mediaData', []), 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( 'mediaData', [] );
+		$data = $view->get('mediaData', []);
 
-		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->mediaData = $this->toArray( $view->item, $view->get( 'mediaData', [] ) );
+		$view->mediaData = $this->toArray($view->item, $view->get('mediaData', []));
 		$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( 'media', [] ) );
+		$view->item = $this->fromArray($view->item, $view->param('media', []));
 		$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/media/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the supplier JQAdm client
@@ -202,7 +202,7 @@ 
 		 * @see admin/jqadm/supplier/media/property/decorators/excludes
 		 * @see admin/jqadm/supplier/media/property/decorators/global
 		 */
-		return $this->createSubClient( 'supplier/media/property/' . $type, $name );
+		return $this->createSubClient('supplier/media/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::create( $this->getContext(), 'media/property/type' );
+		$manager = \Aimeos\MShop::create($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/media/property/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/supplier/media/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::create( $this->getContext(), 'media/property' );
+		$propManager = \Aimeos\MShop::create($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/media/property/template-item
 		 * Relative path to the HTML body template of the media subpart for suppliers.
@@ -374,6 +374,6 @@ 
 		$tplconf = 'admin/jqadm/supplier/media/property/template-item';
 		$default = 'supplier/item-media-property-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

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();
 				}

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

Spacing +87 added lines, -87 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Supplier\Media;
 
-sprintf( 'media' ); // for translation
+sprintf('media'); // for translation
 
 
 /**
@@ -42,16 +42,16 @@ 
 	 */
 	public function copy()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->mediaData = $this->toArray( $view->item, true );
+		$view->mediaData = $this->toArray($view->item, true);
 		$view->mediaBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->mediaBody .= $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();
 
-		$itemData = $this->toArray( $view->item );
-		$data = array_replace_recursive( $itemData, $view->param( 'media', [] ) );
+		$itemData = $this->toArray($view->item);
+		$data = array_replace_recursive($itemData, $view->param('media', []));
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
 			$data[$idx]['media.siteid'] = $siteid;
 			$data[$idx]['media.url'] = $itemData[$idx]['media.url'];
@@ -79,11 +79,11 @@ 
 		$view->mediaData = $data;
 		$view->mediaBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->mediaBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -95,15 +95,15 @@ 
 		parent::delete();
 
 		$item = $this->getView()->item;
-		$cntl = \Aimeos\Controller\Common\Media\Factory::create( $this->getContext() );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::create($this->getContext());
 
-		foreach( $item->getListItems( 'media', null, null, false ) as $listItem )
+		foreach ($item->getListItems('media', null, null, false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$cntl->delete( $refItem );
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$cntl->delete($refItem);
 			}
 
-			$item->deleteListItem( 'media', $listItem, $refItem );
+			$item->deleteListItem('media', $listItem, $refItem);
 		}
 	}
 
@@ -115,16 +115,16 @@ 
 	 */
 	public function get()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->mediaData = $this->toArray( $view->item );
+		$view->mediaData = $this->toArray($view->item);
 		$view->mediaBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->mediaBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -137,26 +137,26 @@ 
 
 		try
 		{
-			$view->item = $this->fromArray( $view->item, $view->param( 'media', [] ) );
+			$view->item = $this->fromArray($view->item, $view->param('media', []));
 			$view->mediaBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->mediaBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'supplier-item-media' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item-media' => $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-media' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item-media' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -170,7 +170,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/media/decorators/excludes
 		 * Excludes decorators added by the "common" option from the supplier JQAdm client
@@ -245,7 +245,7 @@ 
 		 * @see admin/jqadm/supplier/media/decorators/excludes
 		 * @see admin/jqadm/supplier/media/decorators/global
 		 */
-		return $this->createSubClient( 'supplier/media/' . $type, $name );
+		return $this->createSubClient('supplier/media/' . $type, $name);
 	}
 
 
@@ -255,23 +255,23 @@ 
 	 * @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)
 	{
 		$context = $this->getContext();
 
-		$typeManager = \Aimeos\MShop::create( $this->getContext(), 'media/type' );
-		$listTypeManager = \Aimeos\MShop::create( $this->getContext(), 'supplier/lists/type' );
+		$typeManager = \Aimeos\MShop::create($this->getContext(), 'media/type');
+		$listTypeManager = \Aimeos\MShop::create($this->getContext(), 'supplier/lists/type');
 
-		$search = $typeManager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'media.type.domain', 'supplier' ) );
-		$search->setSortations( array( $search->sort( '+', 'media.type.label' ) ) );
+		$search = $typeManager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'media.type.domain', 'supplier'));
+		$search->setSortations(array($search->sort('+', 'media.type.label')));
 
-		$listSearch = $listTypeManager->createSearch( true )->setSlice( 0, 0x7fffffff );
-		$listSearch->setConditions( $listSearch->compare( '==', 'supplier.lists.type.domain', 'media' ) );
-		$listSearch->setSortations( array( $listSearch->sort( '+', 'supplier.lists.type.label' ) ) );
+		$listSearch = $listTypeManager->createSearch(true)->setSlice(0, 0x7fffffff);
+		$listSearch->setConditions($listSearch->compare('==', 'supplier.lists.type.domain', 'media'));
+		$listSearch->setSortations(array($listSearch->sort('+', 'supplier.lists.type.label')));
 
-		$view->mediaListTypes = $this->sortType( $listTypeManager->searchItems( $listSearch ) );
-		$view->mediaTypes = $typeManager->searchItems( $search );
+		$view->mediaListTypes = $this->sortType($listTypeManager->searchItems($listSearch));
+		$view->mediaTypes = $typeManager->searchItems($search);
 
 		return $view;
 	}
@@ -284,29 +284,29 @@ 
 	 * @param array $listItems Media list items to be removed
 	 * @return \Aimeos\MShop\Supplier\Item\Iface Modified supplier item
 	 */
-	protected function deleteMediaItems( \Aimeos\MShop\Supplier\Item\Iface $item, array $listItems )
+	protected function deleteMediaItems(\Aimeos\MShop\Supplier\Item\Iface $item, array $listItems)
 	{
 		$context = $this->getContext();
-		$cntl = \Aimeos\Controller\Common\Media\Factory::create( $context );
-		$manager = \Aimeos\MShop::create( $context, 'supplier' );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::create($context);
+		$manager = \Aimeos\MShop::create($context, 'supplier');
 		$search = $manager->createSearch();
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
 			$expr = [
-				$search->compare( '==', 'supplier.lists.domain', 'media' ),
-				$search->compare( '==', 'supplier.lists.type', $listItem->getType() ),
-				$search->compare( '==', 'supplier.lists.refid', $listItem->getRefId() ),
+				$search->compare('==', 'supplier.lists.domain', 'media'),
+				$search->compare('==', 'supplier.lists.type', $listItem->getType()),
+				$search->compare('==', 'supplier.lists.refid', $listItem->getRefId()),
 			];
-			$search->setConditions( $search->combine( '&&', $expr ) );
-			$items = $manager->searchItems( $search );
+			$search->setConditions($search->combine('&&', $expr));
+			$items = $manager->searchItems($search);
 			$refItem = null;
 
-			if( count( $items ) === 1 && ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$cntl->delete( $refItem );
+			if (count($items) === 1 && ($refItem = $listItem->getRefItem()) !== null) {
+				$cntl->delete($refItem);
 			}
 
-			$item->deleteListItem( 'media', $listItem, $refItem );
+			$item->deleteListItem('media', $listItem, $refItem);
 		}
 
 		return $item;
@@ -353,7 +353,7 @@ 
 		 * @since 2017.07
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/supplier/media/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/supplier/media/standard/subparts', []);
 	}
 
 
@@ -363,54 +363,54 @@ 
 	 * @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)
 	{
 		$context = $this->getContext();
 
-		$mediaManager = \Aimeos\MShop::create( $context, 'media' );
-		$listManager = \Aimeos\MShop::create( $context, 'supplier/lists' );
-		$cntl = \Aimeos\Controller\Common\Media\Factory::create( $context );
+		$mediaManager = \Aimeos\MShop::create($context, 'media');
+		$listManager = \Aimeos\MShop::create($context, 'supplier/lists');
+		$cntl = \Aimeos\Controller\Common\Media\Factory::create($context);
 
-		$listItems = $item->getListItems( 'media', null, null, false );
+		$listItems = $item->getListItems('media', null, null, false);
 		$files = (array) $this->getView()->request()->getUploadedFiles();
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
-			if( ( $listItem = $item->getListItem( 'media', $entry['supplier.lists.type'], $entry['media.id'], false ) ) === null ) {
+			if (($listItem = $item->getListItem('media', $entry['supplier.lists.type'], $entry['media.id'], false)) === null) {
 				$listItem = $listManager->createItem();
 			}
 
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				$refItem = $mediaManager->createItem();
 			}
 
-			$refItem->fromArray( $entry );
+			$refItem->fromArray($entry);
 
-			if( ( $file = $this->getValue( $files, 'media/' . $idx . '/file' ) ) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE )
+			if (($file = $this->getValue($files, 'media/' . $idx . '/file')) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE)
 			{
-				$refItem->getId() ?: $refItem->setUrl( '' )->setPreview( '' ); // keep copied media
-				$cntl->add( $refItem, $file );
+				$refItem->getId() ?: $refItem->setUrl('')->setPreview(''); // keep copied media
+				$cntl->add($refItem, $file);
 			}
 
 			$conf = [];
 
-			foreach( (array) $this->getValue( $entry, 'config/key' ) as $num => $key )
+			foreach ((array) $this->getValue($entry, 'config/key') as $num => $key)
 			{
-				if( trim( $key ) !== '' && ( $val = $this->getValue( $entry, 'config/val/' . $num ) ) !== null ) {
-					$conf[$key] = trim( $val );
+				if (trim($key) !== '' && ($val = $this->getValue($entry, 'config/val/' . $num)) !== null) {
+					$conf[$key] = trim($val);
 				}
 			}
 
-			$listItem->fromArray( $entry );
-			$listItem->setPosition( $idx );
-			$listItem->setConfig( $conf );
+			$listItem->fromArray($entry);
+			$listItem->setPosition($idx);
+			$listItem->setConfig($conf);
 
-			$item->addListItem( 'media', $listItem, $refItem );
+			$item->addListItem('media', $listItem, $refItem);
 
-			unset( $listItems[$listItem->getId()] );
+			unset($listItems[$listItem->getId()]);
 		}
 
-		return $this->deleteMediaItems( $item, $listItems );
+		return $this->deleteMediaItems($item, $listItems);
 	}
 
 
@@ -421,20 +421,20 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Supplier\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Supplier\Item\Iface $item, $copy = false)
 	{
 		$data = [];
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $item->getListItems( 'media', null, null, false ) as $listItem )
+		foreach ($item->getListItems('media', null, null, false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				continue;
 			}
 
-			$list = $listItem->toArray( true ) + $refItem->toArray( true );
+			$list = $listItem->toArray(true) + $refItem->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['supplier.lists.siteid'] = $siteId;
 				$list['supplier.lists.id'] = '';
@@ -442,10 +442,10 @@ 
 				$list['media.id'] = null;
 			}
 
-			$list['supplier.lists.datestart'] = str_replace( ' ', 'T', $list['supplier.lists.datestart'] );
-			$list['supplier.lists.dateend'] = str_replace( ' ', 'T', $list['supplier.lists.dateend'] );
+			$list['supplier.lists.datestart'] = str_replace(' ', 'T', $list['supplier.lists.datestart']);
+			$list['supplier.lists.dateend'] = str_replace(' ', 'T', $list['supplier.lists.dateend']);
 
-			foreach( $list['supplier.lists.config'] as $key => $val )
+			foreach ($list['supplier.lists.config'] as $key => $val)
 			{
 				$list['config']['key'][] = $key;
 				$list['config']['val'][] = $val;
@@ -464,7 +464,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/media/template-item
 		 * Relative path to the HTML body template of the media subpart for suppliers.
@@ -488,6 +488,6 @@ 
 		$tplconf = 'admin/jqadm/supplier/media/template-item';
 		$default = 'supplier/item-media-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -145,14 +145,12 @@
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item-media' => $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-media' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

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

Spacing +104 added lines, -104 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Supplier\Product;
 
-sprintf( 'product' ); // for translation
+sprintf('product'); // for translation
 
 
 /**
@@ -49,24 +49,24 @@ 
 			$view->productListTypes = $this->getListTypes();
 			$view->productBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->productBody .= $client->copy();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'supplier-product' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-product' => $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-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -84,24 +84,24 @@ 
 			$view->productListTypes = $this->getListTypes();
 			$view->productBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->productBody .= $client->create();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'supplier-product' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-product' => $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-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -117,33 +117,33 @@ 
 		try
 		{
 			$total = 0;
-			$params = $this->storeSearchParams( $view->param( 'sp', [] ), 'supplierproduct' );
-			$listItems = $this->getListItems( $view->item, $params, $total );
+			$params = $this->storeSearchParams($view->param('sp', []), 'supplierproduct');
+			$listItems = $this->getListItems($view->item, $params, $total);
 
-			$view->productItems = $this->getProductItems( $listItems );
-			$view->productData = $this->toArray( $listItems );
+			$view->productItems = $this->getProductItems($listItems);
+			$view->productData = $this->toArray($listItems);
 			$view->productListTypes = $this->getListTypes();
 			$view->productTotal = $total;
 			$view->productBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->productBody .= $client->search();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'supplier-product' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-product' => $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-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -155,34 +155,34 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop::create( $context, 'supplier/lists' );
+		$manager = \Aimeos\MShop::create($context, 'supplier/lists');
 
 		$manager->begin();
 
 		try
 		{
-			$this->storeSearchParams( $view->param( 'sp', [] ), 'supplierproduct' );
-			$this->fromArray( $view->item, $view->param( 'product', [] ) );
+			$this->storeSearchParams($view->param('sp', []), 'supplierproduct');
+			$this->fromArray($view->item, $view->param('product', []));
 			$view->productBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->productBody .= $client->save();
 			}
 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'supplier-item-media' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item-media' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'supplier-item-media' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item-media' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -198,7 +198,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/product/decorators/excludes
 		 * Excludes decorators added by the "common" option from the supplier JQAdm client
@@ -273,7 +273,7 @@ 
 		 * @see admin/jqadm/supplier/product/decorators/excludes
 		 * @see admin/jqadm/supplier/product/decorators/global
 		 */
-		return $this->createSubClient( 'supplier/product/' . $type, $name );
+		return $this->createSubClient('supplier/product/' . $type, $name);
 	}
 
 
@@ -285,22 +285,22 @@ 
 	 * @param integer $total Value/result parameter that will contain the item total afterwards
 	 * @return \Aimeos\MShop\Common\Item\List\Iface[] Supplier list items referencing the products
 	 */
-	protected function getListItems( \Aimeos\MShop\Supplier\Item\Iface $item, array $params = [], &$total )
+	protected function getListItems(\Aimeos\MShop\Supplier\Item\Iface $item, array $params = [], &$total)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'supplier/lists' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'supplier/lists');
 
 		$search = $manager->createSearch();
-		$search->setSortations( [$search->sort( '-', 'supplier.lists.ctime' )] );
+		$search->setSortations([$search->sort('-', 'supplier.lists.ctime')]);
 
-		$search = $this->initCriteria( $search, $params );
+		$search = $this->initCriteria($search, $params);
 		$expr = [
 			$search->getConditions(),
-			$search->compare( '==', 'supplier.lists.parentid', $item->getId() ),
-			$search->compare( '==', 'supplier.lists.domain', 'product' ),
+			$search->compare('==', 'supplier.lists.parentid', $item->getId()),
+			$search->compare('==', 'supplier.lists.domain', 'product'),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search, [], $total );
+		return $manager->searchItems($search, [], $total);
 	}
 
 
@@ -312,13 +312,13 @@ 
 	protected function getListTypes()
 	{
 		$list = [];
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'supplier/lists/type' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'supplier/lists/type');
 
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'supplier.lists.type.domain', 'product' ) );
-		$search->setSortations( [$search->sort( '+', 'supplier.lists.type.code' )] );
+		$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'supplier.lists.type.domain', 'product'));
+		$search->setSortations([$search->sort('+', 'supplier.lists.type.code')]);
 
-		foreach( $manager->searchItems( $search ) as $id => $item ) {
+		foreach ($manager->searchItems($search) as $id => $item) {
 			$list[$id] = $item->getCode();
 		}
 
@@ -332,20 +332,20 @@ 
 	 * @param \Aimeos\MShop\Common\Item\List\Iface[] $listItems Supplier list items referencing the products
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Associative list of product IDs as keys and items as values
 	 */
-	protected function getProductItems( array $listItems )
+	protected function getProductItems(array $listItems)
 	{
 		$list = [];
 
-		foreach( $listItems as $listItem ) {
+		foreach ($listItems as $listItem) {
 			$list[] = $listItem->getRefId();
 		}
 
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'product' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'product');
 
-		$search = $manager->createSearch()->setSlice( 0, count( $list ) );
-		$search->setConditions( $search->compare( '==', 'product.id', $list ) );
+		$search = $manager->createSearch()->setSlice(0, count($list));
+		$search->setConditions($search->compare('==', 'product.id', $list));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -389,7 +389,7 @@ 
 		 * @since 2017.07
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/supplier/product/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/supplier/product/standard/subparts', []);
 	}
 
 
@@ -399,75 +399,75 @@ 
 	 * @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)
 	{
 		$context = $this->getContext();
-		$listIds = $this->getValue( $data, 'supplier.lists.id', [] );
+		$listIds = $this->getValue($data, 'supplier.lists.id', []);
 
-		$listManager = \Aimeos\MShop::create( $context, 'supplier/lists' );
+		$listManager = \Aimeos\MShop::create($context, 'supplier/lists');
 
-		$search = $listManager->createSearch()->setSlice( 0, count( $listIds ) );
-		$search->setConditions( $search->compare( '==', 'supplier.lists.id', $listIds ) );
+		$search = $listManager->createSearch()->setSlice(0, count($listIds));
+		$search->setConditions($search->compare('==', 'supplier.lists.id', $listIds));
 
-		$listItems = $listManager->searchItems( $search );
+		$listItems = $listManager->searchItems($search);
 
 
-		foreach( (array) $listIds as $idx => $listid )
+		foreach ((array) $listIds as $idx => $listid)
 		{
-			if( isset( $listItems[$listid] ) ) {
+			if (isset($listItems[$listid])) {
 				$litem = $listItems[$listid];
 			} else {
 				$litem = $listManager->createItem();
 			}
 
-			$litem->setParentId( $item->getId() );
-			$litem->setDomain( 'product' );
+			$litem->setParentId($item->getId());
+			$litem->setDomain('product');
 
-			if( isset( $data['supplier.lists.refid'][$idx] ) ) {
-				$litem->setRefId( $this->getValue( $data, 'supplier.lists.refid/' . $idx ) );
+			if (isset($data['supplier.lists.refid'][$idx])) {
+				$litem->setRefId($this->getValue($data, 'supplier.lists.refid/' . $idx));
 			}
 
-			if( isset( $data['supplier.lists.status'][$idx] ) ) {
-				$litem->setStatus( $this->getValue( $data, 'supplier.lists.status/' . $idx ) );
+			if (isset($data['supplier.lists.status'][$idx])) {
+				$litem->setStatus($this->getValue($data, 'supplier.lists.status/' . $idx));
 			}
 
-			if( isset( $data['supplier.lists.type'][$idx] ) ) {
-				$litem->setType( $this->getValue( $data, 'supplier.lists.type/' . $idx ) );
+			if (isset($data['supplier.lists.type'][$idx])) {
+				$litem->setType($this->getValue($data, 'supplier.lists.type/' . $idx));
 			}
 
-			if( isset( $data['supplier.lists.position'][$idx] ) ) {
-				$litem->setPosition( $this->getValue( $data, 'supplier.lists.position/' . $idx ) );
+			if (isset($data['supplier.lists.position'][$idx])) {
+				$litem->setPosition($this->getValue($data, 'supplier.lists.position/' . $idx));
 			}
 
-			if( isset( $data['supplier.lists.datestart'][$idx] ) ) {
-				$litem->setDateStart( $this->getValue( $data, 'supplier.lists.datestart/' . $idx ) );
+			if (isset($data['supplier.lists.datestart'][$idx])) {
+				$litem->setDateStart($this->getValue($data, 'supplier.lists.datestart/' . $idx));
 			}
 
-			if( isset( $data['supplier.lists.dateend'][$idx] ) ) {
-				$litem->setDateEnd( $this->getValue( $data, 'supplier.lists.dateend/' . $idx ) );
+			if (isset($data['supplier.lists.dateend'][$idx])) {
+				$litem->setDateEnd($this->getValue($data, 'supplier.lists.dateend/' . $idx));
 			}
 
-			if( isset( $data['supplier.lists.config'][$idx] )
-				&& ( $conf = json_decode( $this->getValue( $data, 'supplier.lists.config/' . $idx ), true ) ) !== null
+			if (isset($data['supplier.lists.config'][$idx])
+				&& ($conf = json_decode($this->getValue($data, 'supplier.lists.config/' . $idx), true)) !== null
 			) {
-				$litem->setConfig( $conf );
+				$litem->setConfig($conf);
 			}
 
-			if( $litem->getId() === null && isset( $data['config'][$idx]['key'] ) )
+			if ($litem->getId() === null && isset($data['config'][$idx]['key']))
 			{
 				$conf = [];
 
-				foreach( (array) $data['config'][$idx]['key'] as $pos => $key )
+				foreach ((array) $data['config'][$idx]['key'] as $pos => $key)
 				{
-					if( trim( $key ) !== '' && isset( $data['config'][$idx]['val'][$pos] ) ) {
+					if (trim($key) !== '' && isset($data['config'][$idx]['val'][$pos])) {
 						$conf[$key] = $data['config'][$idx]['val'][$pos];
 					}
 				}
 
-				$litem->setConfig( $conf );
+				$litem->setConfig($conf);
 			}
 
-			$listManager->saveItem( $litem, false );
+			$listManager->saveItem($litem, false);
 		}
 	}
 
@@ -478,13 +478,13 @@ 
 	 * @param \Aimeos\MShop\Common\Item\Lists\Iface[] $listItems Supplier list items referencing the products
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( array $listItems )
+	protected function toArray(array $listItems)
 	{
 		$data = [];
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			foreach( $listItem->toArray( true ) as $key => $value ) {
+			foreach ($listItem->toArray(true) as $key => $value) {
 				$data[$key][] = $value;
 			}
 		}
@@ -499,7 +499,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/product/template-item
 		 * Relative path to the HTML body template of the product subpart for suppliers.
@@ -523,6 +523,6 @@ 
 		$tplconf = 'admin/jqadm/supplier/product/template-item';
 		$default = 'supplier/item-product-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

Braces +8 added lines, -16 removed lines

@@ -52,14 +52,12 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->productBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-product' => $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-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -87,14 +85,12 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->productBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-product' => $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-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -129,14 +125,12 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->productBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-product' => $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-product' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -171,14 +165,12 @@ 
 
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item-media' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'supplier-item-media' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;