aimeos / ai-admin-jqadm

admin/jqadm/src/Admin/JQAdm/Type/Customer/Property/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 createClient( \Aimeos\MShop\Context\Item\Iface $context, $name = null )
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, $name = null)
 	{
 		/** admin/jqadm/type/customer/property/name
 		 * Class name of the used account favorite client implementation
@@ -64,22 +64,22 @@ 
 		 * @since 2018.01
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'admin/jqadm/type/customer/property/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('admin/jqadm/type/customer/property/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Admin\\JQAdm\\Type\\Customer\\Property\\' . $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\\Type\\Customer\\Property\\' . $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\\Type\\Customer\\Property\\' . $name;
 
-		$client = self::createClientBase( $context, $classname, $iface );
+		$client = self::createClientBase($context, $classname, $iface);
 
-		return self::addClientDecorators( $context, $client, 'type/customer/property' );
+		return self::addClientDecorators($context, $client, 'type/customer/property');
 	}
 
 }
\ No newline at end of file

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

Braces +13 added lines, -26 removed lines

@@ -51,14 +51,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -100,14 +98,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -148,14 +144,12 @@ 
 
 			$this->nextAction( $view, 'search', 'type/customer/property', null, 'delete' );
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -196,14 +190,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -241,18 +233,15 @@ 
 
 			$this->nextAction( $view, $view->param( 'next' ), 'type/customer/property', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -291,14 +280,12 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +102 added lines, -102 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Type\Customer\Property;
 
-sprintf( 'type/customer/property' ); // for translation
+sprintf('type/customer/property'); // for translation
 
 
 /**
@@ -35,37 +35,37 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/property/type' );
-			$view->item = $manager->getItem( $id );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/property/type');
+			$view->item = $manager->getItem($id);
 
-			$view->itemData = $this->toArray( $view->item, true );
+			$view->itemData = $this->toArray($view->item, true);
 			$view->itemSubparts = $this->getSubClientNames();
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -81,10 +81,10 @@ 
 
 		try
 		{
-			$data = $view->param( 'item', [] );
+			$data = $view->param('item', []);
 
-			if( !isset( $view->item ) ) {
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'customer/property/type' )->createItem();
+			if (!isset($view->item)) {
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'customer/property/type')->createItem();
 			}
 
 			$data['customer.property.type.siteid'] = $view->item->getSiteId();
@@ -93,26 +93,26 @@ 
 			$view->itemData = $data;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -126,38 +126,38 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/property/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/property/type');
 		$manager->begin();
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$view->item = $manager->getItem( $id );
+			$view->item = $manager->getItem($id);
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$client->delete();
 			}
 
-			$manager->deleteItem( $id );
+			$manager->deleteItem($id);
 			$manager->commit();
 
-			$this->nextAction( $view, 'search', 'type/customer/property', null, 'delete' );
+			$this->nextAction($view, 'search', 'type/customer/property', null, 'delete');
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -178,37 +178,37 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/property/type' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/property/type');
 
-			$view->item = $manager->getItem( $id );
+			$view->item = $manager->getItem($id);
 			$view->itemSubparts = $this->getSubClientNames();
-			$view->itemData = $this->toArray( $view->item );
+			$view->itemData = $this->toArray($view->item);
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -222,40 +222,40 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/property/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/property/type');
 		$manager->begin();
 
 		try
 		{
-			$item = $this->fromArray( $view->param( 'item', [] ) );
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
+			$item = $this->fromArray($view->param('item', []));
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->save();
 			}
 
-			$manager->saveItem( clone $view->item );
+			$manager->saveItem(clone $view->item);
 			$manager->commit();
 
-			$this->nextAction( $view, $view->param( 'next' ), 'type/customer/property', $view->item->getId(), 'save' );
+			$this->nextAction($view, $view->param('next'), 'type/customer/property', $view->item->getId(), 'save');
 			return;
 		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
 		{
 			// fall through to create
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -277,31 +277,31 @@ 
 		try
 		{
 			$total = 0;
-			$params = $this->storeSearchParams( $view->param(), 'type/customer/property' );
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/property/type' );
-			$search = $this->initCriteria( $manager->createSearch(), $params );
+			$params = $this->storeSearchParams($view->param(), 'type/customer/property');
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/property/type');
+			$search = $this->initCriteria($manager->createSearch(), $params);
 
-			$view->items = $manager->searchItems( $search, [], $total );
-			$view->filterCustomers = $manager->getSearchAttributes( true );
+			$view->items = $manager->searchItems($search, [], $total);
+			$view->filterCustomers = $manager->getSearchAttributes(true);
 			$view->filterOperators = $search->getOperators();
 			$view->total = $total;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->search();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('type-customer-property-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		/** admin/jqadm/type/customer/property/template-list
@@ -326,7 +326,7 @@ 
 		$tplconf = 'admin/jqadm/type/customer/property/template-list';
 		$default = 'type/customer/property/list-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -337,7 +337,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $propertytype, $name = null )
+	public function getSubClient($propertytype, $name = null)
 	{
 		/** admin/jqadm/type/customer/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the list type JQAdm client
@@ -412,7 +412,7 @@ 
 		 * @see admin/jqadm/type/customer/property/decorators/excludes
 		 * @see admin/jqadm/type/customer/property/decorators/global
 		 */
-		return $this->createSubClient( 'type/customer/property' . $propertytype, $name );
+		return $this->createSubClient('type/customer/property' . $propertytype, $name);
 	}
 
 
@@ -456,7 +456,7 @@ 
 		 * @since 2018.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/type/customer/property/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/type/customer/property/standard/subparts', []);
 	}
 
 
@@ -467,17 +467,17 @@ 
 	 * @param string[] Data array
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface New list type item object
 	 */
-	protected function fromArray( array $data )
+	protected function fromArray(array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/property/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/property/type');
 
-		if( isset( $data['customer.property.type.id'] ) && $data['customer.property.type.id'] != '' ) {
-			$item = $manager->getItem( $data['customer.property.type.id'] );
+		if (isset($data['customer.property.type.id']) && $data['customer.property.type.id'] != '') {
+			$item = $manager->getItem($data['customer.property.type.id']);
 		} else {
 			$item = $manager->createItem();
 		}
 
-		$item->fromArray( $data );
+		$item->fromArray($data);
 
 		return $item;
 	}
@@ -489,11 +489,11 @@ 
 	 * @param \Aimeos\MShop\Common\Item\Type\Iface $item Type item object
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Common\Item\Type\Iface $item, $copy = false)
 	{
-		$data = $item->toArray( true );
+		$data = $item->toArray(true);
 
-		if( $copy === true )
+		if ($copy === true)
 		{
 			$data['customer.property.type.code'] = $data['customer.property.type.code'] . '_copy';
 			$data['customer.property.type.id'] = '';
@@ -509,7 +509,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/type/customer/property/template-item
 		 * Relative path to the HTML body template for the list type item.
@@ -533,6 +533,6 @@ 
 		$tplconf = 'admin/jqadm/type/customer/property/template-item';
 		$default = 'type/customer/property/item-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

admin/jqadm/tests/Admin/JQAdm/Type/Customer/Property/FactoryTest.php

Spacing +11 added lines, -11 removed lines

@@ -17,42 +17,42 @@
 	protected function setUp()
 	{
 		$this->context = \TestHelperJqadm::getContext();
-		$this->context->setView( \TestHelperJqadm::getView() );
+		$this->context->setView(\TestHelperJqadm::getView());
 	}
 
 
 	public function testCreateClient()
 	{
-		$client = \Aimeos\Admin\JQAdm\Type\Customer\Property\Factory::createClient( $this->context );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JQAdm\\Iface', $client );
+		$client = \Aimeos\Admin\JQAdm\Type\Customer\Property\Factory::createClient($this->context);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JQAdm\\Iface', $client);
 	}
 
 
 	public function testCreateClientName()
 	{
-		$client = \Aimeos\Admin\JQAdm\Type\Customer\Property\Factory::createClient( $this->context, 'Standard' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JQAdm\\Iface', $client );
+		$client = \Aimeos\Admin\JQAdm\Type\Customer\Property\Factory::createClient($this->context, 'Standard');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JQAdm\\Iface', $client);
 	}
 
 
 	public function testCreateClientNameEmpty()
 	{
-		$this->setExpectedException( '\\Aimeos\\Admin\\JQAdm\\Exception' );
-		\Aimeos\Admin\JQAdm\Type\Customer\Property\Factory::createClient( $this->context, '' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JQAdm\\Exception');
+		\Aimeos\Admin\JQAdm\Type\Customer\Property\Factory::createClient($this->context, '');
 	}
 
 
 	public function testCreateClientNameInvalid()
 	{
-		$this->setExpectedException( '\\Aimeos\\Admin\\JQAdm\\Exception' );
-		\Aimeos\Admin\JQAdm\Type\Customer\Property\Factory::createClient( $this->context, '%type/customer/property' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JQAdm\\Exception');
+		\Aimeos\Admin\JQAdm\Type\Customer\Property\Factory::createClient($this->context, '%type/customer/property');
 	}
 
 
 	public function testCreateClientNameNotFound()
 	{
-		$this->setExpectedException( '\\Aimeos\\Admin\\JQAdm\\Exception' );
-		\Aimeos\Admin\JQAdm\Type\Customer\Property\Factory::createClient( $this->context, 'test' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JQAdm\\Exception');
+		\Aimeos\Admin\JQAdm\Type\Customer\Property\Factory::createClient($this->context, 'test');
 	}
 
 }

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

Braces +2 added lines, -4 removed lines

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

Spacing +87 added lines, -87 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Attribute\Image;
 
-sprintf( 'image' ); // for translation
+sprintf('image'); // 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, true );
+		$view->imageData = $this->toArray($view->item, true);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $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( 'image', [] ) );
+		$itemData = $this->toArray($view->item);
+		$data = array_replace_recursive($itemData, $view->param('image', []));
 
-		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->imageData = $data;
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $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::createController( $this->getContext() );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($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->imageData = $this->toArray( $view->item );
+		$view->imageData = $this->toArray($view->item);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -137,26 +137,26 @@ 
 
 		try
 		{
-			$view->item = $this->fromArray( $view->item, $view->param( 'image', [] ) );
+			$view->item = $this->fromArray($view->item, $view->param('image', []));
 			$view->imageBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->imageBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'attribute-item-image' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item-image' => $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-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item-image' => $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/attribute/image/decorators/excludes
 		 * Excludes decorators added by the "common" option from the attribute JQAdm client
@@ -245,7 +245,7 @@ 
 		 * @see admin/jqadm/attribute/image/decorators/excludes
 		 * @see admin/jqadm/attribute/image/decorators/global
 		 */
-		return $this->createSubClient( 'attribute/image/' . $type, $name );
+		return $this->createSubClient('attribute/image/' . $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\Factory::createManager( $this->getContext(), 'media/type' );
-		$listTypeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute/lists/type' );
+		$typeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/type');
+		$listTypeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute/lists/type');
 
-		$search = $typeManager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'media.type.domain', 'attribute' ) );
-		$search->setSortations( array( $search->sort( '+', 'media.type.label' ) ) );
+		$search = $typeManager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'media.type.domain', 'attribute'));
+		$search->setSortations(array($search->sort('+', 'media.type.label')));
 
-		$listSearch = $listTypeManager->createSearch()->setSlice( 0, 0x7fffffff );
-		$listSearch->setConditions( $listSearch->compare( '==', 'attribute.lists.type.domain', 'media' ) );
-		$listSearch->setSortations( array( $listSearch->sort( '+', 'attribute.lists.type.label' ) ) );
+		$listSearch = $listTypeManager->createSearch()->setSlice(0, 0x7fffffff);
+		$listSearch->setConditions($listSearch->compare('==', 'attribute.lists.type.domain', 'media'));
+		$listSearch->setSortations(array($listSearch->sort('+', 'attribute.lists.type.label')));
 
-		$view->imageListTypes = $this->sortType( $listTypeManager->searchItems( $listSearch ) );
-		$view->imageTypes = $typeManager->searchItems( $search );
+		$view->imageListTypes = $this->sortType($listTypeManager->searchItems($listSearch));
+		$view->imageTypes = $typeManager->searchItems($search);
 
 		return $view;
 	}
@@ -284,29 +284,29 @@ 
 	 * @param array $listItems Media list items to be removed
 	 * @return \Aimeos\MShop\Attribute\Item\Iface Modified attribute item
 	 */
-	protected function deleteMediaItems( \Aimeos\MShop\Attribute\Item\Iface $item, array $listItems )
+	protected function deleteMediaItems(\Aimeos\MShop\Attribute\Item\Iface $item, array $listItems)
 	{
 		$context = $this->getContext();
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $context );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($context);
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
 		$search = $manager->createSearch();
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
 			$expr = [
-				$search->compare( '==', 'attribute.lists.domain', 'media' ),
-				$search->compare( '==', 'attribute.lists.type', $listItem->getType() ),
-				$search->compare( '==', 'attribute.lists.refid', $listItem->getRefId() ),
+				$search->compare('==', 'attribute.lists.domain', 'media'),
+				$search->compare('==', 'attribute.lists.type', $listItem->getType()),
+				$search->compare('==', 'attribute.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/attribute/image/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/attribute/image/standard/subparts', []);
 	}
 
 
@@ -363,54 +363,54 @@ 
 	 * @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)
 	{
 		$context = $this->getContext();
 
-		$mediaManager = \Aimeos\MShop\Factory::createManager( $context, 'media' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'attribute/lists' );
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $context );
+		$mediaManager = \Aimeos\MShop\Factory::createManager($context, 'media');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'attribute/lists');
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($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['attribute.lists.type'], $entry['media.id'], false ) ) === null ) {
+			if (($listItem = $item->getListItem('media', $entry['attribute.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, 'image/' . $idx . '/file' ) ) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE )
+			if (($file = $this->getValue($files, 'image/' . $idx . '/file')) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE)
 			{
-				$refItem->getId() ?: $refItem->setUrl( '' )->setPreview( '' ); // keep copied image
-				$cntl->add( $refItem, $file );
+				$refItem->getId() ?: $refItem->setUrl('')->setPreview(''); // keep copied image
+				$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\Attribute\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Attribute\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['attribute.lists.siteid'] = $siteId;
 				$list['attribute.lists.id'] = '';
@@ -442,10 +442,10 @@ 
 				$list['media.id'] = null;
 			}
 
-			$list['attribute.lists.datestart'] = str_replace( ' ', 'T', $list['attribute.lists.datestart'] );
-			$list['attribute.lists.dateend'] = str_replace( ' ', 'T', $list['attribute.lists.dateend'] );
+			$list['attribute.lists.datestart'] = str_replace(' ', 'T', $list['attribute.lists.datestart']);
+			$list['attribute.lists.dateend'] = str_replace(' ', 'T', $list['attribute.lists.dateend']);
 
-			foreach( $list['attribute.lists.config'] as $key => $val )
+			foreach ($list['attribute.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/attribute/image/template-item
 		 * Relative path to the HTML body template of the image subpart for attributes.
@@ -488,6 +488,6 @@ 
 		$tplconf = 'admin/jqadm/attribute/image/template-item';
 		$default = 'attribute/item-image-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/Service/Image/Standard.php

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-image' => $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-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +87 added lines, -87 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Service\Image;
 
-sprintf( 'image' ); // for translation
+sprintf('image'); // 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, true );
+		$view->imageData = $this->toArray($view->item, true);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $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( 'image', [] ) );
+		$itemData = $this->toArray($view->item);
+		$data = array_replace_recursive($itemData, $view->param('image', []));
 
-		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->imageData = $data;
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $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::createController( $this->getContext() );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($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->imageData = $this->toArray( $view->item );
+		$view->imageData = $this->toArray($view->item);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -137,26 +137,26 @@ 
 
 		try
 		{
-			$view->item = $this->fromArray( $view->item, $view->param( 'image', [] ) );
+			$view->item = $this->fromArray($view->item, $view->param('image', []));
 			$view->imageBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->imageBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'service-item-image' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item-image' => $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-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item-image' => $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/image/decorators/excludes
 		 * Excludes decorators added by the "common" option from the service JQAdm client
@@ -245,7 +245,7 @@ 
 		 * @see admin/jqadm/service/image/decorators/excludes
 		 * @see admin/jqadm/service/image/decorators/global
 		 */
-		return $this->createSubClient( 'service/image/' . $type, $name );
+		return $this->createSubClient('service/image/' . $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\Factory::createManager( $this->getContext(), 'media/type' );
-		$listTypeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service/lists/type' );
+		$typeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/type');
+		$listTypeManager = \Aimeos\MShop\Factory::createManager($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->imageListTypes = $this->sortType( $listTypeManager->searchItems( $listSearch ) );
-		$view->imageTypes = $typeManager->searchItems( $search );
+		$view->imageListTypes = $this->sortType($listTypeManager->searchItems($listSearch));
+		$view->imageTypes = $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::createController( $context );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($context);
+		$manager = \Aimeos\MShop\Factory::createManager($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/image/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/service/image/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\Factory::createManager( $context, 'media' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'service/lists' );
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $context );
+		$mediaManager = \Aimeos\MShop\Factory::createManager($context, 'media');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'service/lists');
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($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, 'image/' . $idx . '/file' ) ) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE )
+			if (($file = $this->getValue($files, 'image/' . $idx . '/file')) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE)
 			{
-				$refItem->getId() ?: $refItem->setUrl( '' )->setPreview( '' ); // keep copied image
-				$cntl->add( $refItem, $file );
+				$refItem->getId() ?: $refItem->setUrl('')->setPreview(''); // keep copied image
+				$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/image/template-item
 		 * Relative path to the HTML body template of the image subpart for services.
@@ -488,6 +488,6 @@ 
 		$tplconf = 'admin/jqadm/service/image/template-item';
 		$default = 'service/item-image-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/Service/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\Service\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]['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->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/service/image/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the service JQAdm client
@@ -202,7 +202,7 @@ 
 		 * @see admin/jqadm/service/image/property/decorators/excludes
 		 * @see admin/jqadm/service/image/property/decorators/global
 		 */
-		return $this->createSubClient( 'service/image/property/' . $type, $name );
+		return $this->createSubClient('service/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', '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/image/property/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/service/image/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\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\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/image/property/template-item
 		 * Relative path to the HTML body template of the image subpart for services.
@@ -374,6 +374,6 @@ 
 		$tplconf = 'admin/jqadm/service/image/property/template-item';
 		$default = 'service/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/Product/Image/Standard.php

Braces +2 added lines, -4 removed lines

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

Spacing +96 added lines, -96 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Product\Image;
 
-sprintf( 'image' ); // for translation
+sprintf('image'); // 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, true );
+		$view->imageData = $this->toArray($view->item, true);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $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( 'image', [] ) );
+		$itemData = $this->toArray($view->item);
+		$data = array_replace_recursive($itemData, $view->param('image', []));
 
-		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->imageData = $data;
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $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::createController( $this->getContext() );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($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->imageData = $this->toArray( $view->item );
+		$view->imageData = $this->toArray($view->item);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -137,26 +137,26 @@ 
 
 		try
 		{
-			$view->item = $this->fromArray( $view->item, $view->param( 'image', [] ) );
+			$view->item = $this->fromArray($view->item, $view->param('image', []));
 			$view->imageBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->imageBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-image' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-image' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'product-item-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-image' => $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/product/image/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -245,7 +245,7 @@ 
 		 * @see admin/jqadm/product/image/decorators/excludes
 		 * @see admin/jqadm/product/image/decorators/global
 		 */
-		return $this->createSubClient( 'product/image/' . $type, $name );
+		return $this->createSubClient('product/image/' . $type, $name);
 	}
 
 
@@ -257,24 +257,24 @@ 
 	 * @param \Aimeos\MShop\Common\Item\Lists\Iface[] $attrListItems Product list items referencing variant attributes
 	 * @return \Aimeos\MShop\Media\Item\Iface Modified media item
 	 */
-	protected function addMediaAttributes( \Aimeos\MShop\Media\Item\Iface $mediaItem, array $attrListItems )
+	protected function addMediaAttributes(\Aimeos\MShop\Media\Item\Iface $mediaItem, array $attrListItems)
 	{
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/lists' );
-		$listItems = $mediaItem->getListItems( 'attribute', 'variant', null, false );
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/lists');
+		$listItems = $mediaItem->getListItems('attribute', 'variant', null, false);
 
-		foreach( $attrListItems as $listItem )
+		foreach ($attrListItems as $listItem)
 		{
-			if( ( $litem = $mediaItem->getListItem( 'attribute', 'variant', $listItem->getRefId(), false ) ) !== null )
+			if (($litem = $mediaItem->getListItem('attribute', 'variant', $listItem->getRefId(), false)) !== null)
 			{
-				unset( $listItems[$litem->getId()] );
+				unset($listItems[$litem->getId()]);
 				continue;
 			}
 
-			$litem = $listManager->createItem()->setType( 'variant' )->setRefId( $listItem->getRefId() );
-			$mediaItem->addListItem( 'attribute', $litem );
+			$litem = $listManager->createItem()->setType('variant')->setRefId($listItem->getRefId());
+			$mediaItem->addListItem('attribute', $litem);
 		}
 
-		return $mediaItem->deleteListItems( $listItems );
+		return $mediaItem->deleteListItems($listItems);
 	}
 
 
@@ -284,23 +284,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\Factory::createManager( $this->getContext(), 'media/type' );
-		$listTypeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists/type' );
+		$typeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/type');
+		$listTypeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists/type');
 
-		$search = $typeManager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'media.type.domain', 'product' ) );
-		$search->setSortations( array( $search->sort( '+', 'media.type.label' ) ) );
+		$search = $typeManager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'media.type.domain', 'product'));
+		$search->setSortations(array($search->sort('+', 'media.type.label')));
 
-		$listSearch = $listTypeManager->createSearch( true )->setSlice( 0, 0x7fffffff );
-		$listSearch->setConditions( $listSearch->compare( '==', 'product.lists.type.domain', 'media' ) );
-		$listSearch->setSortations( array( $listSearch->sort( '+', 'product.lists.type.label' ) ) );
+		$listSearch = $listTypeManager->createSearch(true)->setSlice(0, 0x7fffffff);
+		$listSearch->setConditions($listSearch->compare('==', 'product.lists.type.domain', 'media'));
+		$listSearch->setSortations(array($listSearch->sort('+', 'product.lists.type.label')));
 
-		$view->imageListTypes = $this->sortType( $listTypeManager->searchItems( $listSearch ) );
-		$view->imageTypes = $typeManager->searchItems( $search );
+		$view->imageListTypes = $this->sortType($listTypeManager->searchItems($listSearch));
+		$view->imageTypes = $typeManager->searchItems($search);
 
 		return $view;
 	}
@@ -313,25 +313,25 @@ 
 	 * @param array $listItems Media list items to be removed
 	 * @return \Aimeos\MShop\Product\Item\Iface Modified product item
 	 */
-	protected function deleteMediaItems( \Aimeos\MShop\Product\Item\Iface $item, array $listItems )
+	protected function deleteMediaItems(\Aimeos\MShop\Product\Item\Iface $item, array $listItems)
 	{
 		$context = $this->getContext();
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $context );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($context);
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
 		$search = $manager->createSearch();
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$func = $search->createFunction( 'product:has', ['media', $listItem->getType(), $listItem->getRefId()] );
-			$search->setConditions( $search->compare( '!=', $func, null ) );
-			$items = $manager->searchItems( $search );
+			$func = $search->createFunction('product:has', ['media', $listItem->getType(), $listItem->getRefId()]);
+			$search->setConditions($search->compare('!=', $func, null));
+			$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;
@@ -378,7 +378,7 @@ 
 		 * @since 2017.07
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/product/image/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/product/image/standard/subparts', []);
 	}
 
 
@@ -388,58 +388,58 @@ 
 	 * @param \Aimeos\MShop\Product\Item\Iface $item Product item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Product\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Product\Item\Iface $item, array $data)
 	{
 		$context = $this->getContext();
 
-		$mediaManager = \Aimeos\MShop\Factory::createManager( $context, 'media' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $context );
+		$mediaManager = \Aimeos\MShop\Factory::createManager($context, 'media');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($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)
 		{
 			$listType = $entry['product.lists.type'];
 
-			if( ( $listItem = $item->getListItem( 'media', $listType, $entry['media.id'], false ) ) === null ) {
+			if (($listItem = $item->getListItem('media', $listType, $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, 'image/' . $idx . '/file' ) ) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE )
+			if (($file = $this->getValue($files, 'image/' . $idx . '/file')) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE)
 			{
-				$refItem->getId() ?: $refItem->setUrl( '' )->setPreview( '' ); // keep copied image
-				$cntl->add( $refItem, $file );
+				$refItem->getId() ?: $refItem->setUrl('')->setPreview(''); // keep copied image
+				$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);
 
-			$attrListItems = $item->getListItems( 'attribute', 'variant', null, false );
-			$refItem = $this->addMediaAttributes( $refItem, $attrListItems );
-			$item->addListItem( 'media', $listItem, $refItem );
+			$attrListItems = $item->getListItems('attribute', 'variant', null, false);
+			$refItem = $this->addMediaAttributes($refItem, $attrListItems);
+			$item->addListItem('media', $listItem, $refItem);
 
-			unset( $listItems[$listItem->getId()] );
+			unset($listItems[$listItem->getId()]);
 		}
 
-		return $this->deleteMediaItems( $item, $listItems );
+		return $this->deleteMediaItems($item, $listItems);
 	}
 
 
@@ -450,20 +450,20 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Product\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Product\Item\Iface $item, $copy = false)
 	{
 		$data = [];
 		$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['product.lists.siteid'] = $siteId;
 				$list['product.lists.id'] = '';
@@ -471,10 +471,10 @@ 
 				$list['media.id'] = null;
 			}
 
-			$list['product.lists.datestart'] = str_replace( ' ', 'T', $list['product.lists.datestart'] );
-			$list['product.lists.dateend'] = str_replace( ' ', 'T', $list['product.lists.dateend'] );
+			$list['product.lists.datestart'] = str_replace(' ', 'T', $list['product.lists.datestart']);
+			$list['product.lists.dateend'] = str_replace(' ', 'T', $list['product.lists.dateend']);
 
-			foreach( $list['product.lists.config'] as $key => $val )
+			foreach ($list['product.lists.config'] as $key => $val)
 			{
 				$list['config']['key'][] = $key;
 				$list['config']['val'][] = $val;
@@ -493,7 +493,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/image/template-item
 		 * Relative path to the HTML body template of the image subpart for products.
@@ -517,6 +517,6 @@ 
 		$tplconf = 'admin/jqadm/product/image/template-item';
 		$default = 'product/item-image-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/Standard.php

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-image' => $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-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +87 added lines, -87 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Supplier\Image;
 
-sprintf( 'image' ); // for translation
+sprintf('image'); // 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, true );
+		$view->imageData = $this->toArray($view->item, true);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $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( 'image', [] ) );
+		$itemData = $this->toArray($view->item);
+		$data = array_replace_recursive($itemData, $view->param('image', []));
 
-		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->imageData = $data;
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $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::createController( $this->getContext() );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($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->imageData = $this->toArray( $view->item );
+		$view->imageData = $this->toArray($view->item);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -137,26 +137,26 @@ 
 
 		try
 		{
-			$view->item = $this->fromArray( $view->item, $view->param( 'image', [] ) );
+			$view->item = $this->fromArray($view->item, $view->param('image', []));
 			$view->imageBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->imageBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'supplier-item-image' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item-image' => $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-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('supplier-item-image' => $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/image/decorators/excludes
 		 * Excludes decorators added by the "common" option from the supplier JQAdm client
@@ -245,7 +245,7 @@ 
 		 * @see admin/jqadm/supplier/image/decorators/excludes
 		 * @see admin/jqadm/supplier/image/decorators/global
 		 */
-		return $this->createSubClient( 'supplier/image/' . $type, $name );
+		return $this->createSubClient('supplier/image/' . $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\Factory::createManager( $this->getContext(), 'media/type' );
-		$listTypeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'supplier/lists/type' );
+		$typeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/type');
+		$listTypeManager = \Aimeos\MShop\Factory::createManager($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->imageListTypes = $this->sortType( $listTypeManager->searchItems( $listSearch ) );
-		$view->imageTypes = $typeManager->searchItems( $search );
+		$view->imageListTypes = $this->sortType($listTypeManager->searchItems($listSearch));
+		$view->imageTypes = $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::createController( $context );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'supplier' );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($context);
+		$manager = \Aimeos\MShop\Factory::createManager($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/image/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/supplier/image/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\Factory::createManager( $context, 'media' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'supplier/lists' );
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $context );
+		$mediaManager = \Aimeos\MShop\Factory::createManager($context, 'media');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'supplier/lists');
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($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, 'image/' . $idx . '/file' ) ) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE )
+			if (($file = $this->getValue($files, 'image/' . $idx . '/file')) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE)
 			{
-				$refItem->getId() ?: $refItem->setUrl( '' )->setPreview( '' ); // keep copied image
-				$cntl->add( $refItem, $file );
+				$refItem->getId() ?: $refItem->setUrl('')->setPreview(''); // keep copied image
+				$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/image/template-item
 		 * Relative path to the HTML body template of the image subpart for suppliers.
@@ -488,6 +488,6 @@ 
 		$tplconf = 'admin/jqadm/supplier/image/template-item';
 		$default = 'supplier/item-image-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/Standard.php

Braces +2 added lines, -4 removed lines

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

Spacing +87 added lines, -87 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Catalog\Image;
 
-sprintf( 'image' ); // for translation
+sprintf('image'); // 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, true );
+		$view->imageData = $this->toArray($view->item, true);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $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( 'image', [] ) );
+		$itemData = $this->toArray($view->item);
+		$data = array_replace_recursive($itemData, $view->param('image', []));
 
-		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->imageData = $data;
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $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::createController( $this->getContext() );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($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->imageData = $this->toArray( $view->item );
+		$view->imageData = $this->toArray($view->item);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -137,26 +137,26 @@ 
 
 		try
 		{
-			$view->item = $this->fromArray( $view->item, $view->param( 'image', [] ) );
+			$view->item = $this->fromArray($view->item, $view->param('image', []));
 			$view->imageBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->imageBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'catalog-item-image' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('catalog-item-image' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'catalog-item-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('catalog-item-image' => $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/catalog/image/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog JQAdm client
@@ -245,7 +245,7 @@ 
 		 * @see admin/jqadm/catalog/image/decorators/excludes
 		 * @see admin/jqadm/catalog/image/decorators/global
 		 */
-		return $this->createSubClient( 'catalog/image/' . $type, $name );
+		return $this->createSubClient('catalog/image/' . $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\Factory::createManager( $this->getContext(), 'media/type' );
-		$listTypeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists/type' );
+		$typeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/type');
+		$listTypeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists/type');
 
-		$search = $typeManager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'media.type.domain', 'catalog' ) );
-		$search->setSortations( array( $search->sort( '+', 'media.type.label' ) ) );
+		$search = $typeManager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'media.type.domain', 'catalog'));
+		$search->setSortations(array($search->sort('+', 'media.type.label')));
 
-		$listSearch = $listTypeManager->createSearch( true )->setSlice( 0, 0x7fffffff );
-		$listSearch->setConditions( $listSearch->compare( '==', 'catalog.lists.type.domain', 'media' ) );
-		$listSearch->setSortations( array( $listSearch->sort( '+', 'catalog.lists.type.label' ) ) );
+		$listSearch = $listTypeManager->createSearch(true)->setSlice(0, 0x7fffffff);
+		$listSearch->setConditions($listSearch->compare('==', 'catalog.lists.type.domain', 'media'));
+		$listSearch->setSortations(array($listSearch->sort('+', 'catalog.lists.type.label')));
 
-		$view->imageListTypes = $this->sortType( $listTypeManager->searchItems( $listSearch ) );
-		$view->imageTypes = $typeManager->searchItems( $search );
+		$view->imageListTypes = $this->sortType($listTypeManager->searchItems($listSearch));
+		$view->imageTypes = $typeManager->searchItems($search);
 
 		return $view;
 	}
@@ -284,29 +284,29 @@ 
 	 * @param array $listItems Media list items to be removed
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Modified catalog item
 	 */
-	protected function deleteMediaItems( \Aimeos\MShop\Catalog\Item\Iface $item, array $listItems )
+	protected function deleteMediaItems(\Aimeos\MShop\Catalog\Item\Iface $item, array $listItems)
 	{
 		$context = $this->getContext();
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $context );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'catalog' );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($context);
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'catalog');
 		$search = $manager->createSearch();
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
 			$expr = [
-				$search->compare( '==', 'catalog.lists.domain', 'media' ),
-				$search->compare( '==', 'catalog.lists.type', $listItem->getType() ),
-				$search->compare( '==', 'catalog.lists.refid', $listItem->getRefId() ),
+				$search->compare('==', 'catalog.lists.domain', 'media'),
+				$search->compare('==', 'catalog.lists.type', $listItem->getType()),
+				$search->compare('==', 'catalog.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/catalog/image/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/catalog/image/standard/subparts', []);
 	}
 
 
@@ -363,54 +363,54 @@ 
 	 * @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)
 	{
 		$context = $this->getContext();
 
-		$mediaManager = \Aimeos\MShop\Factory::createManager( $context, 'media' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'catalog/lists' );
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $context );
+		$mediaManager = \Aimeos\MShop\Factory::createManager($context, 'media');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'catalog/lists');
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($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['catalog.lists.type'], $entry['media.id'], false ) ) === null ) {
+			if (($listItem = $item->getListItem('media', $entry['catalog.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, 'image/' . $idx . '/file' ) ) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE )
+			if (($file = $this->getValue($files, 'image/' . $idx . '/file')) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE)
 			{
-				$refItem->getId() ?: $refItem->setUrl( '' )->setPreview( '' ); // keep copied image
-				$cntl->add( $refItem, $file );
+				$refItem->getId() ?: $refItem->setUrl('')->setPreview(''); // keep copied image
+				$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\Catalog\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Catalog\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['catalog.lists.siteid'] = $siteId;
 				$list['catalog.lists.id'] = '';
@@ -442,10 +442,10 @@ 
 				$list['media.id'] = null;
 			}
 
-			$list['catalog.lists.datestart'] = str_replace( ' ', 'T', $list['catalog.lists.datestart'] );
-			$list['catalog.lists.dateend'] = str_replace( ' ', 'T', $list['catalog.lists.dateend'] );
+			$list['catalog.lists.datestart'] = str_replace(' ', 'T', $list['catalog.lists.datestart']);
+			$list['catalog.lists.dateend'] = str_replace(' ', 'T', $list['catalog.lists.dateend']);
 
-			foreach( $list['catalog.lists.config'] as $key => $val )
+			foreach ($list['catalog.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/catalog/image/template-item
 		 * Relative path to the HTML body template of the image subpart for catalogs.
@@ -488,6 +488,6 @@ 
 		$tplconf = 'admin/jqadm/catalog/image/template-item';
 		$default = 'catalog/item-image-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file