aimeos / ai-admin-jqadm

admin/jqadm/tests/bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -11,17 +11,17 @@
  * Set error reporting to maximum
  */
 error_reporting( -1 );
-ini_set( 'display_errors', '1' );
+ini_set('display_errors', '1');
 
-date_default_timezone_set( 'UTC' );
+date_default_timezone_set('UTC');
 
 /*
  * Set locale settings to reasonable defaults
  */
-setlocale( LC_ALL, 'en_US.UTF-8' );
-setlocale( LC_NUMERIC, 'POSIX' );
-setlocale( LC_CTYPE, 'en_US.UTF-8' );
-setlocale( LC_TIME, 'POSIX' );
+setlocale(LC_ALL, 'en_US.UTF-8');
+setlocale(LC_NUMERIC, 'POSIX');
+setlocale(LC_CTYPE, 'en_US.UTF-8');
+setlocale(LC_TIME, 'POSIX');
 
 
 require_once 'TestHelperJqadm.php';

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

Spacing +53 added lines, -53 removed lines

@@ -67,17 +67,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->attributeBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->attributeBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/attribute/template-item';
 		$default = 'product/item-characteristic-attribute-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -90,17 +90,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->attributeBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->attributeBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/attribute/template-item';
 		$default = 'product/item-characteristic-attribute-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,17 +113,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->attributeBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->attributeBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/attribute/template-item';
 		$default = 'product/item-characteristic-attribute-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -137,32 +137,32 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
 		$manager->begin();
 
 		try
 		{
-			$this->updateItems( $view );
+			$this->updateItems($view);
 			$view->attributeBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->attributeBody .= $client->save();
 			}
 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-characteristic-attribute' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-characteristic-attribute' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-characteristic-attribute' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-characteristic-attribute' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
 
@@ -177,7 +177,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/product/characteristic/attribute/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -252,7 +252,7 @@ 
 		 * @see admin/jqadm/product/characteristic/attribute/decorators/excludes
 		 * @see admin/jqadm/product/characteristic/attribute/decorators/global
 		 */
-		return $this->createSubClient( 'product/characteristic/attribute/' . $type, $name );
+		return $this->createSubClient('product/characteristic/attribute/' . $type, $name);
 	}
 
 
@@ -263,7 +263,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -273,20 +273,20 @@ 
 	 * @param string $prodid Unique product ID
 	 * @return array Associative list of attribute product IDs as keys and list items as values
 	 */
-	protected function getListItems( $prodid )
+	protected function getListItems($prodid)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'product.lists.parentid', $prodid ),
-			$search->compare( '==', 'product.lists.domain', 'attribute' ),
-			$search->compare( '==', 'product.lists.type.domain', 'attribute' ),
-			$search->compare( '==', 'product.lists.type.code', 'default' ),
+			$search->compare('==', 'product.lists.parentid', $prodid),
+			$search->compare('==', 'product.lists.domain', 'attribute'),
+			$search->compare('==', 'product.lists.type.domain', 'attribute'),
+			$search->compare('==', 'product.lists.type.code', 'default'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -295,18 +295,18 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view )
+	protected function setData(\Aimeos\MW\View\Iface $view)
 	{
-		$data = (array) $view->param( 'characteristic/attribute', array() );
+		$data = (array) $view->param('characteristic/attribute', array());
 
-		if( empty( $data ) )
+		if (empty($data))
 		{
-			foreach( $view->item->getListItems( 'attribute', 'default' ) as $listItem )
+			foreach ($view->item->getListItems('attribute', 'default') as $listItem)
 			{
 				$refItem = $listItem->getRefItem();
-				$data['attribute.label'][] = ( $refItem ? $refItem->getLabel() : '' );
+				$data['attribute.label'][] = ($refItem ? $refItem->getLabel() : '');
 
-				foreach( $listItem->toArray() as $key => $value ) {
+				foreach ($listItem->toArray() as $key => $value) {
 					$data[$key][] = $value;
 				}
 			}
@@ -321,39 +321,39 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function updateItems( \Aimeos\MW\View\Iface $view )
+	protected function updateItems(\Aimeos\MW\View\Iface $view)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$typeManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
 
 		$id = $view->item->getId();
-		$map = $this->getListItems( $id );
-		$listIds = (array) $view->param( 'characteristic/attribute/product.lists.id', array() );
+		$map = $this->getListItems($id);
+		$listIds = (array) $view->param('characteristic/attribute/product.lists.id', array());
 
 
-		foreach( $listIds as $pos => $listid )
+		foreach ($listIds as $pos => $listid)
 		{
-			if( isset( $map[$listid] ) ) {
-				unset( $map[$listid], $listIds[$pos] );
+			if (isset($map[$listid])) {
+				unset($map[$listid], $listIds[$pos]);
 			}
 		}
 
-		$manager->deleteItems( array_keys( $map ) );
+		$manager->deleteItems(array_keys($map));
 
 
 		$item = $manager->createItem();
-		$item->setTypeId( $typeManager->findItem( 'default', array(), 'attribute' )->getId() );
-		$item->setDomain( 'attribute' );
-		$item->setParentId( $id );
+		$item->setTypeId($typeManager->findItem('default', array(), 'attribute')->getId());
+		$item->setDomain('attribute');
+		$item->setParentId($id);
 
-		foreach( $listIds as $pos => $listid )
+		foreach ($listIds as $pos => $listid)
 		{
-			$item->setId( null );
-			$item->setRefId( $view->param( 'characteristic/attribute/product.lists.refid/' . $pos ) );
-			$item->setPosition( $pos );
+			$item->setId(null);
+			$item->setRefId($view->param('characteristic/attribute/product.lists.refid/' . $pos));
+			$item->setPosition($pos);
 
-			$manager->saveItem( $item, false );
+			$manager->saveItem($item, false);
 		}
 	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -151,14 +151,12 @@
 
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-category' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-category' => $e->getMessage() );

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

Spacing +55 added lines, -55 removed lines

@@ -67,17 +67,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/property/template-item';
 		$default = 'product/item-characteristic-property-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -90,17 +90,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/property/template-item';
 		$default = 'product/item-characteristic-property-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,17 +113,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/property/template-item';
 		$default = 'product/item-characteristic-property-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -137,32 +137,32 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
 		$manager->begin();
 
 		try
 		{
-			$this->updateItems( $view );
+			$this->updateItems($view);
 			$view->propertyBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->propertyBody .= $client->save();
 			}
 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-characteristic-property' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-characteristic-property' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-characteristic-property' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-characteristic-property' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
 
@@ -177,7 +177,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/product/characteristic/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -252,7 +252,7 @@ 
 		 * @see admin/jqadm/product/characteristic/property/decorators/excludes
 		 * @see admin/jqadm/product/characteristic/property/decorators/global
 		 */
-		return $this->createSubClient( 'product/characteristic/property/' . $type, $name );
+		return $this->createSubClient('product/characteristic/property/' . $type, $name);
 	}
 
 
@@ -263,7 +263,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -273,20 +273,20 @@ 
 	 * @param string $prodid Unique product ID
 	 * @return array Associative list of property IDs as keys and property items as values
 	 */
-	protected function getProperties( $prodid )
+	protected function getProperties($prodid)
 	{
-		$excludes = array( 'package-length', 'package-height', 'package-width', 'package-weight' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property' );
+		$excludes = array('package-length', 'package-height', 'package-width', 'package-weight');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'product.property.parentid', $prodid ),
-			$search->compare( '!=', 'product.property.type.code', $excludes ),
+			$search->compare('==', 'product.property.parentid', $prodid),
+			$search->compare('!=', 'product.property.type.code', $excludes),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0x7fffffff);
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -297,14 +297,14 @@ 
 	 */
 	protected function getPropertyTypes()
 	{
-		$excludes = array( 'package-length', 'package-height', 'package-width', 'package-weight' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property/type' );
+		$excludes = array('package-length', 'package-height', 'package-width', 'package-weight');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property/type');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '!=', 'product.property.type.code', $excludes ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->compare('!=', 'product.property.type.code', $excludes));
+		$search->setSlice(0, 0x7fffffff);
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -313,15 +313,15 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view )
+	protected function setData(\Aimeos\MW\View\Iface $view)
 	{
-		$data = (array) $view->param( 'characteristic/property', array() );
+		$data = (array) $view->param('characteristic/property', array());
 
-		if( empty( $data ) )
+		if (empty($data))
 		{
-			foreach( $this->getProperties( $view->item->getId() ) as $item )
+			foreach ($this->getProperties($view->item->getId()) as $item)
 			{
-				foreach( $item->toArray() as $key => $value ) {
+				foreach ($item->toArray() as $key => $value) {
 					$data[$key][] = $value;
 				}
 			}
@@ -337,38 +337,38 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function updateItems( \Aimeos\MW\View\Iface $view )
+	protected function updateItems(\Aimeos\MW\View\Iface $view)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property');
 
 		$id = $view->item->getId();
-		$map = $this->getProperties( $id );
-		$ids = (array) $view->param( 'characteristic/property/product.property.id', array() );
+		$map = $this->getProperties($id);
+		$ids = (array) $view->param('characteristic/property/product.property.id', array());
 
 		$item = $manager->createItem();
 
-		foreach( $ids as $pos => $propertyId )
+		foreach ($ids as $pos => $propertyId)
 		{
-			if( isset( $map[$propertyId] ) )
+			if (isset($map[$propertyId]))
 			{
 				$item = $map[$propertyId];
-				unset( $map[$propertyId] );
+				unset($map[$propertyId]);
 			}
 			else
 			{
-				$item->setId( null );
-				$item->setParentId( $id );
+				$item->setId(null);
+				$item->setParentId($id);
 			}
 
-			$lang = $view->param( 'characteristic/property/product.property.languageid/' . $pos, null );
+			$lang = $view->param('characteristic/property/product.property.languageid/' . $pos, null);
 
-			$item->setLanguageId( ( $lang ? $lang : null ) );
-			$item->setTypeId( $view->param( 'characteristic/property/product.property.typeid/' . $pos, null ) );
-			$item->setValue( $view->param( 'characteristic/property/product.property.value/' . $pos, '' ) );
+			$item->setLanguageId(($lang ? $lang : null));
+			$item->setTypeId($view->param('characteristic/property/product.property.typeid/' . $pos, null));
+			$item->setValue($view->param('characteristic/property/product.property.value/' . $pos, ''));
 
-			$manager->saveItem( $item, false );
+			$manager->saveItem($item, false);
 		}
 
-		$manager->deleteItems( array_keys( $map ) );
+		$manager->deleteItems(array_keys($map));
 	}
 }

Braces +3 added lines, -6 removed lines

@@ -155,16 +155,14 @@ 
 			$textManager->commit();
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-price' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 
 			$textManager->rollback();
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-price' => $e->getMessage() );
@@ -365,8 +363,7 @@ 
 
 				$item = $priceItem;
 				$item->setId( null );
-			}
-			else
+			} else
 			{
 				$litem = $listItems[$listid];
 				$item = $litem->getRefItem();

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

Spacing +24 added lines, -24 removed lines

@@ -55,7 +55,7 @@ 
 	 * @category Developer
 	 */
 	private $subPartPath = 'admin/jqadm/product/characteristic/standard/subparts';
-	private $subPartNames = array( 'attribute', 'property' );
+	private $subPartNames = array('attribute', 'property');
 
 
 	/**
@@ -67,17 +67,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->characteristicBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->characteristicBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/template-item';
 		$default = 'product/item-characteristic-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -90,17 +90,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->characteristicBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->characteristicBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/template-item';
 		$default = 'product/item-characteristic-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,17 +113,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->characteristicBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->characteristicBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/template-item';
 		$default = 'product/item-characteristic-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -137,31 +137,31 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
 		$manager->begin();
 
 		try
 		{
 			$view->characteristicBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->characteristicBody .= $client->save();
 			}
 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-characteristic' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-characteristic' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-characteristic' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-characteristic' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
 
@@ -176,7 +176,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/product/characteristic/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -251,7 +251,7 @@ 
 		 * @see admin/jqadm/product/characteristic/decorators/excludes
 		 * @see admin/jqadm/product/characteristic/decorators/global
 		 */
-		return $this->createSubClient( 'product/characteristic/' . $type, $name );
+		return $this->createSubClient('product/characteristic/' . $type, $name);
 	}
 
 
@@ -262,7 +262,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -271,8 +271,8 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view )
+	protected function setData(\Aimeos\MW\View\Iface $view)
 	{
-		$view->characteristicData = (array) $view->param( 'characteristic', array() );;
+		$view->characteristicData = (array) $view->param('characteristic', array()); ;
 	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -151,14 +151,12 @@
 
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-category' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-category' => $e->getMessage() );

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

Spacing +67 added lines, -67 removed lines

@@ -67,17 +67,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->priceBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->priceBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/price/template-item';
 		$default = 'product/item-price-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -90,17 +90,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->priceBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->priceBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/price/template-item';
 		$default = 'product/item-price-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,17 +113,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->priceBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->priceBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/price/template-item';
 		$default = 'product/item-price-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -137,18 +137,18 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$textManager = \Aimeos\MShop\Factory::createManager( $context, 'text' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$textManager = \Aimeos\MShop\Factory::createManager($context, 'text');
 
 		$manager->begin();
 		$textManager->begin();
 
 		try
 		{
-			$this->updateItems( $view );
+			$this->updateItems($view);
 			$view->priceBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->priceBody .= $client->save();
 			}
 
@@ -156,19 +156,19 @@ 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-price' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-price' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 
 			$textManager->rollback();
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-price' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-price' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 
 			$textManager->rollback();
 			$manager->rollback();
@@ -185,7 +185,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/price/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -260,7 +260,7 @@ 
 		 * @see admin/jqadm/product/price/decorators/excludes
 		 * @see admin/jqadm/product/price/decorators/global
 		 */
-		return $this->createSubClient( 'product/price/' . $type, $name );
+		return $this->createSubClient('product/price/' . $type, $name);
 	}
 
 
@@ -271,7 +271,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -282,13 +282,13 @@ 
 	 */
 	protected function getPriceTypes()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'price/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'price/type');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'price.type.domain', 'product' ) );
-		$search->setSortations( array( $search->sort( '+', 'price.type.label' ) ) );
+		$search->setConditions($search->compare('==', 'price.type.domain', 'product'));
+		$search->setSortations(array($search->sort('+', 'price.type.label')));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -297,27 +297,27 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view )
+	protected function setData(\Aimeos\MW\View\Iface $view)
 	{
-		$data = (array) $view->param( 'price', array() );
+		$data = (array) $view->param('price', array());
 
-		if( empty( $view->priceData ) && ( $id = $view->item->getId() ) !== null )
+		if (empty($view->priceData) && ($id = $view->item->getId()) !== null)
 		{
-			foreach( $view->item->getListItems( 'price' ) as $id => $listItem )
+			foreach ($view->item->getListItems('price') as $id => $listItem)
 			{
-				if( ( $refItem = $listItem->getRefItem() ) === null ) {
+				if (($refItem = $listItem->getRefItem()) === null) {
 					continue;
 				}
 
 				$data['product.lists.id'][] = $id;
 
-				foreach( $refItem->toArray() as $key => $value ) {
+				foreach ($refItem->toArray() as $key => $value) {
 					$data[$key][] = $value;
 				}
 			}
 		}
 
-		if( !isset( $data['price.currencyid'] ) ) { // show at least one block
+		if (!isset($data['price.currencyid'])) { // show at least one block
 			$data['price.currencyid'][] = $this->getContext()->getLocale()->getCurrencyId();
 		}
 
@@ -331,40 +331,40 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function updateItems( \Aimeos\MW\View\Iface $view )
+	protected function updateItems(\Aimeos\MW\View\Iface $view)
 	{
 		$id = $view->item->getId();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$listTypeManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$listTypeManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
 
-		$listIds = (array) $view->param( 'price/product.lists.id', array() );
-		$listItems = $manager->getItem( $id, array( 'price' ) )->getListItems( 'price' );
+		$listIds = (array) $view->param('price/product.lists.id', array());
+		$listItems = $manager->getItem($id, array('price'))->getListItems('price');
 
 
 		$listItem = $listManager->createItem();
-		$listItem->setTypeId( $listTypeManager->findItem( 'default', array(), 'price' )->getId() );
-		$listItem->setDomain( 'price' );
-		$listItem->setParentId( $id );
-		$listItem->setStatus( 1 );
+		$listItem->setTypeId($listTypeManager->findItem('default', array(), 'price')->getId());
+		$listItem->setDomain('price');
+		$listItem->setParentId($id);
+		$listItem->setStatus(1);
 
 		$priceItem = $priceManager->createItem();
-		$priceItem->setDomain( 'product' );
-		$priceItem->setStatus( 1 );
+		$priceItem->setDomain('product');
+		$priceItem->setStatus(1);
 
 
-		foreach( $listIds as $idx => $listid )
+		foreach ($listIds as $idx => $listid)
 		{
-			if( !isset( $listItems[$listid] ) )
+			if (!isset($listItems[$listid]))
 			{
 				$litem = $listItem;
-				$litem->setId( null );
+				$litem->setId(null);
 
 				$item = $priceItem;
-				$item->setId( null );
+				$item->setId(null);
 			}
 			else
 			{
@@ -372,32 +372,32 @@ 
 				$item = $litem->getRefItem();
 			}
 
-			$item->setLabel( $view->param( 'price/price.label/' . $idx ) );
-			$item->setTypeId( $view->param( 'price/price.typeid/' . $idx ) );
-			$item->setCurrencyId( $view->param( 'price/price.currencyid/' . $idx ) );
-			$item->setQuantity( $view->param( 'price/price.quantity/' . $idx ) );
-			$item->setValue( $view->param( 'price/price.value/' . $idx ) );
-			$item->setCosts( $view->param( 'price/price.costs/' . $idx ) );
-			$item->setRebate( $view->param( 'price/price.rebate/' . $idx ) );
-			$item->setTaxRate( $view->param( 'price/price.taxrate/' . $idx ) );
+			$item->setLabel($view->param('price/price.label/' . $idx));
+			$item->setTypeId($view->param('price/price.typeid/' . $idx));
+			$item->setCurrencyId($view->param('price/price.currencyid/' . $idx));
+			$item->setQuantity($view->param('price/price.quantity/' . $idx));
+			$item->setValue($view->param('price/price.value/' . $idx));
+			$item->setCosts($view->param('price/price.costs/' . $idx));
+			$item->setRebate($view->param('price/price.rebate/' . $idx));
+			$item->setTaxRate($view->param('price/price.taxrate/' . $idx));
 
-			$priceManager->saveItem( $item );
+			$priceManager->saveItem($item);
 
-			$litem->setPosition( $idx );
-			$litem->setRefId( $item->getId() );
+			$litem->setPosition($idx);
+			$litem->setRefId($item->getId());
 
-			$listManager->saveItem( $litem, false );
+			$listManager->saveItem($litem, false);
 		}
 
 
 		$rmIds = array();
-		$rmListIds = array_diff( array_keys( $listItems ), $listIds );
+		$rmListIds = array_diff(array_keys($listItems), $listIds);
 
-		foreach( $rmListIds as $id ) {
+		foreach ($rmListIds as $id) {
 			$rmIds[] = $listItems[$id]->getRefId();
 		}
 
-		$listManager->deleteItems( $rmListIds  );
-		$priceManager->deleteItems( $rmIds  );
+		$listManager->deleteItems($rmListIds);
+		$priceManager->deleteItems($rmIds);
 	}
 }
\ No newline at end of file

Braces +3 added lines, -6 removed lines

@@ -155,16 +155,14 @@ 
 			$textManager->commit();
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-price' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 
 			$textManager->rollback();
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-price' => $e->getMessage() );
@@ -365,8 +363,7 @@ 
 
 				$item = $priceItem;
 				$item->setId( null );
-			}
-			else
+			} else
 			{
 				$litem = $listItems[$listid];
 				$item = $litem->getRefItem();

Doc Comments +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 	/**
 	 * Copies a resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function copy()
 	{
@@ -86,7 +86,7 @@ 
 	/**
 	 * Creates a new resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function create()
 	{
@@ -109,7 +109,7 @@ 
 	/**
 	 * Returns a single resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function get()
 	{

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

Spacing +54 added lines, -54 removed lines

@@ -67,17 +67,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->bundleBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->bundleBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/bundle/template-item';
 		$default = 'product/item-bundle-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -90,17 +90,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->bundleBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->bundleBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/bundle/template-item';
 		$default = 'product/item-bundle-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,17 +113,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->bundleBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->bundleBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/bundle/template-item';
 		$default = 'product/item-bundle-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -137,32 +137,32 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
 		$manager->begin();
 
 		try
 		{
-			$this->updateItems( $view );
+			$this->updateItems($view);
 			$view->bundleBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->bundleBody .= $client->save();
 			}
 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-bundle' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-bundle' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-bundle' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-bundle' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
 
@@ -177,7 +177,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/product/bundle/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -252,7 +252,7 @@ 
 		 * @see admin/jqadm/product/bundle/decorators/excludes
 		 * @see admin/jqadm/product/bundle/decorators/global
 		 */
-		return $this->createSubClient( 'product/bundle/' . $type, $name );
+		return $this->createSubClient('product/bundle/' . $type, $name);
 	}
 
 
@@ -263,7 +263,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -273,20 +273,20 @@ 
 	 * @param string $prodid Unique product ID
 	 * @return array Associative list of bundle product IDs as keys and list items as values
 	 */
-	protected function getListItems( $prodid )
+	protected function getListItems($prodid)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'product.lists.parentid', $prodid ),
-			$search->compare( '==', 'product.lists.domain', 'product' ),
-			$search->compare( '==', 'product.lists.type.domain', 'product' ),
-			$search->compare( '==', 'product.lists.type.code', 'default' ),
+			$search->compare('==', 'product.lists.parentid', $prodid),
+			$search->compare('==', 'product.lists.domain', 'product'),
+			$search->compare('==', 'product.lists.type.domain', 'product'),
+			$search->compare('==', 'product.lists.type.code', 'default'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -295,18 +295,18 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view )
+	protected function setData(\Aimeos\MW\View\Iface $view)
 	{
-		$data = (array) $view->param( 'bundle', array() );
+		$data = (array) $view->param('bundle', array());
 
-		if( empty( $data ) )
+		if (empty($data))
 		{
-			foreach( $view->item->getListItems( 'product', 'default' ) as $listItem )
+			foreach ($view->item->getListItems('product', 'default') as $listItem)
 			{
 				$refItem = $listItem->getRefItem();
-				$data['product.label'][] = ( $refItem ? $refItem->getLabel() : '' );
+				$data['product.label'][] = ($refItem ? $refItem->getLabel() : '');
 
-				foreach( $listItem->toArray() as $key => $value ) {
+				foreach ($listItem->toArray() as $key => $value) {
 					$data[$key][] = $value;
 				}
 			}
@@ -321,43 +321,43 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function updateItems( \Aimeos\MW\View\Iface $view )
+	protected function updateItems(\Aimeos\MW\View\Iface $view)
 	{
-		if( $view->item->getType() !== 'bundle' ) {
+		if ($view->item->getType() !== 'bundle') {
 			return;
 		}
 
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$typeManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
 
 		$id = $view->item->getId();
-		$map = $this->getListItems( $id );
-		$listIds = (array) $view->param( 'bundle/product.lists.id', array() );
+		$map = $this->getListItems($id);
+		$listIds = (array) $view->param('bundle/product.lists.id', array());
 
 
-		foreach( $listIds as $pos => $listid )
+		foreach ($listIds as $pos => $listid)
 		{
-			if( isset( $map[$listid] ) ) {
-				unset( $map[$listid], $listIds[$pos] );
+			if (isset($map[$listid])) {
+				unset($map[$listid], $listIds[$pos]);
 			}
 		}
 
-		$manager->deleteItems( array_keys( $map ) );
+		$manager->deleteItems(array_keys($map));
 
 
 		$item = $manager->createItem();
-		$item->setTypeId( $typeManager->findItem( 'default', array(), 'product' )->getId() );
-		$item->setDomain( 'product' );
-		$item->setParentId( $id );
+		$item->setTypeId($typeManager->findItem('default', array(), 'product')->getId());
+		$item->setDomain('product');
+		$item->setParentId($id);
 
-		foreach( $listIds as $pos => $listid )
+		foreach ($listIds as $pos => $listid)
 		{
-			$item->setId( null );
-			$item->setRefId( $view->param( 'bundle/product.lists.refid/' . $pos ) );
-			$item->setPosition( $pos );
+			$item->setId(null);
+			$item->setRefId($view->param('bundle/product.lists.refid/' . $pos));
+			$item->setPosition($pos);
 
-			$manager->saveItem( $item, false );
+			$manager->saveItem($item, false);
 		}
 	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -151,14 +151,12 @@
 
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-category' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-category' => $e->getMessage() );

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

Spacing +45 added lines, -45 removed lines

@@ -67,17 +67,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->stockBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->stockBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/stock/template-item';
 		$default = 'product/item-stock-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -90,17 +90,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->stockBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->stockBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/stock/template-item';
 		$default = 'product/item-stock-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,17 +113,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->stockBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->stockBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/stock/template-item';
 		$default = 'product/item-stock-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -137,32 +137,32 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/stock');
 		$manager->begin();
 
 		try
 		{
-			$this->updateItems( $view );
+			$this->updateItems($view);
 			$view->stockBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->stockBody .= $client->save();
 			}
 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-stock' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-stock' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-stock' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-stock' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
 
@@ -177,7 +177,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/stock/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -252,7 +252,7 @@ 
 		 * @see admin/jqadm/product/stock/decorators/excludes
 		 * @see admin/jqadm/product/stock/decorators/global
 		 */
-		return $this->createSubClient( 'product/stock/' . $type, $name );
+		return $this->createSubClient('product/stock/' . $type, $name);
 	}
 
 
@@ -263,7 +263,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -272,28 +272,28 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view )
+	protected function setData(\Aimeos\MW\View\Iface $view)
 	{
 		$context = $this->getContext();
-		$whManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/stock/warehouse' );
+		$whManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/stock/warehouse');
 
-		$view->stockWarehouses = $whManager->searchItems( $whManager->createSearch() );
-		$view->stockData = (array) $view->param( 'stock', array() );
+		$view->stockWarehouses = $whManager->searchItems($whManager->createSearch());
+		$view->stockData = (array) $view->param('stock', array());
 
-		if( !empty( $view->stockData ) || ( $id = $view->item->getId() ) === null ) {
+		if (!empty($view->stockData) || ($id = $view->item->getId()) === null) {
 			return;
 		}
 
 		$data = array();
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/stock');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.stock.parentid', $id ) );
-		$search->setSortations( array( $search->sort( '+', 'product.stock.warehouse.code' ) ) );
+		$search->setConditions($search->compare('==', 'product.stock.parentid', $id));
+		$search->setSortations(array($search->sort('+', 'product.stock.warehouse.code')));
 
-		foreach( $manager->searchItems( $search ) as $item )
+		foreach ($manager->searchItems($search) as $item)
 		{
-			foreach( $item->toArray() as $key => $value ) {
+			foreach ($item->toArray() as $key => $value) {
 				$data[$key][] = $value;
 			}
 		}
@@ -307,32 +307,32 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function updateItems( \Aimeos\MW\View\Iface $view )
+	protected function updateItems(\Aimeos\MW\View\Iface $view)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/stock');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.stock.parentid', $view->item->getId() ) );
-		$items = $manager->searchitems( $search );
+		$search->setConditions($search->compare('==', 'product.stock.parentid', $view->item->getId()));
+		$items = $manager->searchitems($search);
 
-		$list = (array) $view->param( 'stock/product.stock.id', array() );
+		$list = (array) $view->param('stock/product.stock.id', array());
 
-		foreach( $list as $idx => $id )
+		foreach ($list as $idx => $id)
 		{
-			if( !isset( $items[$id] ) ) {
+			if (!isset($items[$id])) {
 				$item = $manager->createItem();
 			} else {
 				$item = $items[$id];
 			}
 
-			$item->setParentId( $view->item->getId() );
-			$item->setWarehouseId( $view->param( 'stock/product.stock.warehouseid/' . $idx ) );
-			$item->setStocklevel( $view->param( 'stock/product.stock.stocklevel/' . $idx ) );
-			$item->setDateBack( $view->param( 'stock/product.stock.dateback/' . $idx ) );
+			$item->setParentId($view->item->getId());
+			$item->setWarehouseId($view->param('stock/product.stock.warehouseid/' . $idx));
+			$item->setStocklevel($view->param('stock/product.stock.stocklevel/' . $idx));
+			$item->setDateBack($view->param('stock/product.stock.dateback/' . $idx));
 
-			$manager->saveItem( $item, false );
+			$manager->saveItem($item, false);
 		}
 
-		$manager->deleteItems( array_diff( array_keys( $items ), $list ) );
+		$manager->deleteItems(array_diff(array_keys($items), $list));
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -151,14 +151,12 @@
 
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-category' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-category' => $e->getMessage() );

Doc Comments +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 	/**
 	 * Copies a resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function copy()
 	{
@@ -86,7 +86,7 @@ 
 	/**
 	 * Creates a new resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function create()
 	{
@@ -109,7 +109,7 @@ 
 	/**
 	 * Returns a single resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function get()
 	{

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

Spacing +75 added lines, -75 removed lines

@@ -57,7 +57,7 @@ 
 	private $subPartPath = 'admin/jqadm/product/text/standard/subparts';
 	private $subPartNames = array();
 	private $types;
-	private $typelist = array( 'name', 'short', 'long', 'url', 'meta-keyword', 'meta-description' );
+	private $typelist = array('name', 'short', 'long', 'url', 'meta-keyword', 'meta-description');
 
 
 	/**
@@ -69,17 +69,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->textBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->textBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/text/template-item';
 		$default = 'product/item-text-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -92,17 +92,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->textBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->textBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/text/template-item';
 		$default = 'product/item-text-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -115,17 +115,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->textBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->textBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/text/template-item';
 		$default = 'product/item-text-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -139,18 +139,18 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$textManager = \Aimeos\MShop\Factory::createManager( $context, 'text' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$textManager = \Aimeos\MShop\Factory::createManager($context, 'text');
 
 		$manager->begin();
 		$textManager->begin();
 
 		try
 		{
-			$this->updateItems( $view );
+			$this->updateItems($view);
 			$view->textBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->textBody .= $client->save();
 			}
 
@@ -158,19 +158,19 @@ 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-text' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-text' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 
 			$textManager->rollback();
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-text' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-text' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 
 			$textManager->rollback();
 			$manager->rollback();
@@ -187,7 +187,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/text/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -262,7 +262,7 @@ 
 		 * @see admin/jqadm/product/text/decorators/excludes
 		 * @see admin/jqadm/product/text/decorators/global
 		 */
-		return $this->createSubClient( 'product/text/' . $type, $name );
+		return $this->createSubClient('product/text/' . $type, $name);
 	}
 
 
@@ -273,7 +273,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -284,26 +284,26 @@ 
 	 * @return integer Type ID for the given type
 	 * @throws \Aimeos\Admin\JQAdm\Exception If the given type is unknown
 	 */
-	protected function getTypeId( $type )
+	protected function getTypeId($type)
 	{
-		if( $this->types === null )
+		if ($this->types === null)
 		{
 			$this->types = array();
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'text/type' );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'text/type');
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', 'text.type.domain', 'product' ) );
+			$search->setConditions($search->compare('==', 'text.type.domain', 'product'));
 
-			foreach( $manager->searchItems( $search ) as $id => $typeItem ) {
+			foreach ($manager->searchItems($search) as $id => $typeItem) {
 				$this->types[$typeItem->getCode()] = $id;
 			}
 		}
 
-		if( isset( $this->types[$type] ) ) {
+		if (isset($this->types[$type])) {
 			return $this->types[$type];
 		}
 
-		throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Unknown type "%1$s"', $type ) );
+		throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Unknown type "%1$s"', $type));
 	}
 
 
@@ -312,29 +312,29 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view )
+	protected function setData(\Aimeos\MW\View\Iface $view)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'text/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'text/type');
 
-		$data = (array) $view->param( 'text', array() );
+		$data = (array) $view->param('text', array());
 
-		if( empty( $data ) && ( $id = $view->item->getId() ) !== null )
+		if (empty($data) && ($id = $view->item->getId()) !== null)
 		{
-			if( !isset( $data['langid'] ) ) {
+			if (!isset($data['langid'])) {
 				$data['langid'] = array();
 			}
 
-			foreach( $view->item->getListItems( 'text', 'default' ) as $listItem )
+			foreach ($view->item->getListItems('text', 'default') as $listItem)
 			{
-				if( ( $refItem = $listItem->getRefItem() ) === null ) {
+				if (($refItem = $listItem->getRefItem()) === null) {
 					continue;
 				}
 
 				$type = $refItem->getType();
 				$langid = $refItem->getLanguageId();
 
-				if( in_array( $type, $this->typelist ) )
+				if (in_array($type, $this->typelist))
 				{
 					$data['langid'][$langid] = $langid;
 					$data[$type]['listid'][$langid] = $listItem->getId();
@@ -343,11 +343,11 @@ 
 			}
 		}
 
-		if( !isset( $data['langid'] ) || empty( $data['langid'] ) ) { // show at least one block
+		if (!isset($data['langid']) || empty($data['langid'])) { // show at least one block
 			$data['langid'][] = $context->getLocale()->getLanguageId();
 		}
 
-		$view->textTypes = $manager->searchItems( $manager->createSearch() );
+		$view->textTypes = $manager->searchItems($manager->createSearch());
 		$view->textData = $data;
 	}
 
@@ -357,50 +357,50 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function updateItems( \Aimeos\MW\View\Iface $view )
+	protected function updateItems(\Aimeos\MW\View\Iface $view)
 	{
 		$id = $view->item->getId();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$textManager = \Aimeos\MShop\Factory::createManager( $context, 'text' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$listTypeManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$textManager = \Aimeos\MShop\Factory::createManager($context, 'text');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$listTypeManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
 
 		$listIds = array();
-		$langIds = (array) $view->param( 'text/langid', array() );
-		$listItems = $manager->getItem( $id, array( 'text' ) )->getListItems( 'text', 'default' );
+		$langIds = (array) $view->param('text/langid', array());
+		$listItems = $manager->getItem($id, array('text'))->getListItems('text', 'default');
 
 
 		$listItem = $listManager->createItem();
-		$listItem->setTypeId( $listTypeManager->findItem( 'default', array(), 'text' )->getId() );
-		$listItem->setDomain( 'text' );
-		$listItem->setParentId( $id );
-		$listItem->setStatus( 1 );
+		$listItem->setTypeId($listTypeManager->findItem('default', array(), 'text')->getId());
+		$listItem->setDomain('text');
+		$listItem->setParentId($id);
+		$listItem->setStatus(1);
 
 		$textItem = $textManager->createItem();
-		$textItem->setDomain( 'product' );
-		$textItem->setStatus( 1 );
+		$textItem->setDomain('product');
+		$textItem->setStatus(1);
 
 
-		foreach( $langIds as $idx => $langid )
+		foreach ($langIds as $idx => $langid)
 		{
-			foreach( $this->typelist as $type )
+			foreach ($this->typelist as $type)
 			{
-				if( ( $content = trim( $view->param( 'text/' . $type . '/content/' . $idx ) ) ) === '' ) {
+				if (($content = trim($view->param('text/' . $type . '/content/' . $idx))) === '') {
 					continue;
 				}
 
-				$listid = $view->param( 'text/' . $type . '/listid/' . $idx );
+				$listid = $view->param('text/' . $type . '/listid/' . $idx);
 				$listIds[] = $listid;
 
-				if( !isset( $listItems[$listid] ) )
+				if (!isset($listItems[$listid]))
 				{
 					$litem = $listItem;
-					$litem->setId( null );
+					$litem->setId(null);
 
 					$item = $textItem;
-					$item->setId( null );
+					$item->setId(null);
 				}
 				else
 				{
@@ -408,37 +408,37 @@ 
 					$item = $litem->getRefItem();
 				}
 
-				$item->setContent( $content );
-				$item->setLabel( mb_strcut( $item->getContent(), 0, 255 ) );
-				$item->setTypeId( $this->getTypeId( $type ) );
-				$item->setLanguageId( $langid );
+				$item->setContent($content);
+				$item->setLabel(mb_strcut($item->getContent(), 0, 255));
+				$item->setTypeId($this->getTypeId($type));
+				$item->setLanguageId($langid);
 
-				$textManager->saveItem( $item );
+				$textManager->saveItem($item);
 
-				$litem->setPosition( $idx );
-				$litem->setRefId( $item->getId() );
+				$litem->setPosition($idx);
+				$litem->setRefId($item->getId());
 
-				$listManager->saveItem( $litem, false );
+				$listManager->saveItem($litem, false);
 			}
 		}
 
 
 		$rmIds = $allListIds = array();
 
-		foreach( $listItems as $id => $listItem )
+		foreach ($listItems as $id => $listItem)
 		{
-			if( in_array( $listItem->getType(), $this->typelist ) ) {
+			if (in_array($listItem->getType(), $this->typelist)) {
 				$allListIds[] = $id;
 			}
 		}
 
-		$rmListIds = array_diff( $allListIds, $listIds );
+		$rmListIds = array_diff($allListIds, $listIds);
 
-		foreach( $rmListIds as $id ) {
+		foreach ($rmListIds as $id) {
 			$rmIds[] = $listItems[$id]->getRefId();
 		}
 
-		$listManager->deleteItems( $rmListIds  );
-		$textManager->deleteItems( $rmIds  );
+		$listManager->deleteItems($rmListIds);
+		$textManager->deleteItems($rmIds);
 	}
 }

Braces +3 added lines, -6 removed lines

@@ -157,16 +157,14 @@ 
 			$textManager->commit();
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-text' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 
 			$textManager->rollback();
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-text' => $e->getMessage() );
@@ -401,8 +399,7 @@ 
 
 					$item = $textItem;
 					$item->setId( null );
-				}
-				else
+				} else
 				{
 					$litem = $listItems[$listid];
 					$item = $litem->getRefItem();

Doc Comments +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 	/**
 	 * Copies a resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function copy()
 	{
@@ -86,7 +86,7 @@ 
 	/**
 	 * Creates a new resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function create()
 	{
@@ -109,7 +109,7 @@ 
 	/**
 	 * Returns a single resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function get()
 	{

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

Spacing +109 added lines, -109 removed lines

@@ -67,17 +67,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view, true );
+		$this->setData($view, true);
 		$view->selectionBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->selectionBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/selection/template-item';
 		$default = 'product/item-selection-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -90,17 +90,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->selectionBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->selectionBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/selection/template-item';
 		$default = 'product/item-selection-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,17 +113,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->selectionBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->selectionBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/selection/template-item';
 		$default = 'product/item-selection-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -137,32 +137,32 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
 		$manager->begin();
 
 		try
 		{
-			$this->updateItems( $view );
+			$this->updateItems($view);
 			$view->selectionBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->selectionBody .= $client->save();
 			}
 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-selection' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-selection' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-selection' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-selection' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
 
@@ -177,7 +177,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/product/selection/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -252,7 +252,7 @@ 
 		 * @see admin/jqadm/product/selection/decorators/excludes
 		 * @see admin/jqadm/product/selection/decorators/global
 		 */
-		return $this->createSubClient( 'product/selection/' . $type, $name );
+		return $this->createSubClient('product/selection/' . $type, $name);
 	}
 
 
@@ -262,38 +262,38 @@ 
 	 * @param array $listItems List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 * @param array $listIds List of IDs of the still used list items
 	 */
-	protected function cleanupItems( array $listItems, array $listIds )
+	protected function cleanupItems(array $listItems, array $listIds)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
 
 		$rmIds = array();
-		$rmListIds = array_diff( array_keys( $listItems ), $listIds );
+		$rmListIds = array_diff(array_keys($listItems), $listIds);
 
-		foreach( $rmListIds as $rmListId ) {
+		foreach ($rmListIds as $rmListId) {
 			$rmIds[] = $listItems[$rmListId]->getRefId();
 		}
 
 		$search = $listManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'product.lists.refid', $rmIds ),
-			$search->compare( '==', 'product.lists.domain', 'product' ),
-			$search->compare( '==', 'product.lists.type.code', 'default' ),
-			$search->compare( '==', 'product.lists.type.domain', 'product' ),
+			$search->compare('==', 'product.lists.refid', $rmIds),
+			$search->compare('==', 'product.lists.domain', 'product'),
+			$search->compare('==', 'product.lists.type.code', 'default'),
+			$search->compare('==', 'product.lists.type.domain', 'product'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0x7fffffff);
 
-		foreach( $listManager->aggregate( $search, 'product.lists.refid' ) as $key => $count )
+		foreach ($listManager->aggregate($search, 'product.lists.refid') as $key => $count)
 		{
-			if( $count > 1 ) {
-				unset( $rmIds[$key] );
+			if ($count > 1) {
+				unset($rmIds[$key]);
 			}
 		}
 
-		$listManager->deleteItems( $rmListIds  );
-		$manager->deleteItems( $rmIds  );
+		$listManager->deleteItems($rmListIds);
+		$manager->deleteItems($rmIds);
 	}
 
 
@@ -305,12 +305,12 @@ 
 	protected function createItem()
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'product/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$typeManager = \Aimeos\MShop\Factory::createManager($context, 'product/type');
 
 		$item = $manager->createItem();
-		$item->setTypeId( $typeManager->findItem( 'default', array(), 'product' )->getId() );
-		$item->setStatus( 1 );
+		$item->setTypeId($typeManager->findItem('default', array(), 'product')->getId());
+		$item->setStatus(1);
 
 		return $item;
 	}
@@ -322,17 +322,17 @@ 
 	 * @param string $id Parent ID for the new list item
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface New list item object
 	 */
-	protected function createListItem( $id )
+	protected function createListItem($id)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$typeManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
 
 		$item = $manager->createItem();
-		$item->setTypeId( $typeManager->findItem( 'default', array(), 'product' )->getId() );
-		$item->setDomain( 'product' );
-		$item->setParentId( $id );
-		$item->setStatus( 1 );
+		$item->setTypeId($typeManager->findItem('default', array(), 'product')->getId());
+		$item->setDomain('product');
+		$item->setParentId($id);
+		$item->setStatus(1);
 
 		return $item;
 	}
@@ -345,19 +345,19 @@ 
 	 * @param array $ids List of product IDs
 	 * @return array List of products with ID as key and items implementing \Aimeos\MShop\Product\Item\Iface as values
 	 */
-	protected function getProductItems( array $codes, array $ids )
+	protected function getProductItems(array $codes, array $ids)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'product.id', $ids ),
-			$search->compare( '==', 'product.code', $codes ),
+			$search->compare('==', 'product.id', $ids),
+			$search->compare('==', 'product.code', $codes),
 		);
-		$search->setConditions( $search->combine( '||', $expr ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->combine('||', $expr));
+		$search->setSlice(0, 0x7fffffff);
 
-		return $manager->searchItems( $search, array( 'attribute' ) );
+		return $manager->searchItems($search, array('attribute'));
 	}
 
 
@@ -368,25 +368,25 @@ 
 	 * @param boolean $copy True if items should be copied
 	 * @return array Multi-dimensional associative array
 	 */
-	protected function getDataExisting( \Aimeos\MW\View\Iface $view, $copy = false )
+	protected function getDataExisting(\Aimeos\MW\View\Iface $view, $copy = false)
 	{
 		$data = array();
-		$variants = $view->item->getRefItems( 'product', null, 'default' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
+		$variants = $view->item->getRefItems('product', null, 'default');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.id', array_keys( $variants ) ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->compare('==', 'product.id', array_keys($variants)));
+		$search->setSlice(0, 0x7fffffff);
 
-		$products = $manager->searchItems( $search, array( 'attribute' ) );
+		$products = $manager->searchItems($search, array('attribute'));
 
-		foreach( $view->item->getListItems( 'product', 'default' ) as $listid => $listItem )
+		foreach ($view->item->getListItems('product', 'default') as $listid => $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				continue;
 			}
 
-			if( $copy === false )
+			if ($copy === false)
 			{
 				$code = $refItem->getCode();
 				$data[$code]['product.lists.id'] = $listid;
@@ -401,11 +401,11 @@ 
 
 			$data[$code]['product.label'] = $refItem->getLabel();
 
-			if( isset( $products[$refItem->getId()] ) )
+			if (isset($products[$refItem->getId()]))
 			{
-				$attributes = $products[$refItem->getId()]->getRefItems( 'attribute', null, 'variant' );
+				$attributes = $products[$refItem->getId()]->getRefItems('attribute', null, 'variant');
 
-				foreach( $attributes as $attrid => $attrItem )
+				foreach ($attributes as $attrid => $attrItem)
 				{
 					$data[$code]['attr'][$attrid]['ref'] = $code;
 					$data[$code]['attr'][$attrid]['label'] = $attrItem->getLabel();
@@ -423,28 +423,28 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 * @return array Multi-dimensional associative array
 	 */
-	protected function getDataParams( \Aimeos\MW\View\Iface $view )
+	protected function getDataParams(\Aimeos\MW\View\Iface $view)
 	{
 		$data = array();
 
-		foreach( (array) $view->param( 'selection/product.code', array() ) as $pos => $code )
+		foreach ((array) $view->param('selection/product.code', array()) as $pos => $code)
 		{
-			if( !empty( $code ) )
+			if (!empty($code))
 			{
-				$data[$code]['product.lists.id'] = $view->param( 'selection/product.lists.id/' . $pos );
-				$data[$code]['product.id'] = $view->param( 'selection/product.id/' . $pos );
-				$data[$code]['product.label'] = $view->param( 'selection/product.label/' . $pos );
+				$data[$code]['product.lists.id'] = $view->param('selection/product.lists.id/' . $pos);
+				$data[$code]['product.id'] = $view->param('selection/product.id/' . $pos);
+				$data[$code]['product.label'] = $view->param('selection/product.label/' . $pos);
 			}
 		}
 
-		foreach( (array) $view->param( 'selection/attr/ref', array() ) as $pos => $code )
+		foreach ((array) $view->param('selection/attr/ref', array()) as $pos => $code)
 		{
-			if( !empty( $code ) )
+			if (!empty($code))
 			{
-				$id = $view->param( 'selection/attr/id/' . $pos );
+				$id = $view->param('selection/attr/id/' . $pos);
 
 				$data[$code]['attr'][$id]['ref'] = $code;
-				$data[$code]['attr'][$id]['label'] = $view->param( 'selection/attr/label/' . $pos );
+				$data[$code]['attr'][$id]['label'] = $view->param('selection/attr/label/' . $pos);
 			}
 		}
 
@@ -459,7 +459,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -469,15 +469,15 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 * @param boolean $copy True if items should be copied
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view, $copy = false )
+	protected function setData(\Aimeos\MW\View\Iface $view, $copy = false)
 	{
-		$data = $this->getDataParams( $view );
+		$data = $this->getDataParams($view);
 
-		if( empty( $data ) ) {
-			$data = $this->getDataExisting( $view, $copy );
+		if (empty($data)) {
+			$data = $this->getDataExisting($view, $copy);
 		}
 
-		if( empty( $data ) ) { // show at least one block
+		if (empty($data)) { // show at least one block
 			$data['']['product.lists.id'] = '';
 		}
 
@@ -490,39 +490,39 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function updateItems( \Aimeos\MW\View\Iface $view )
+	protected function updateItems(\Aimeos\MW\View\Iface $view)
 	{
-		if( $view->item->getType() !== 'select' ) {
+		if ($view->item->getType() !== 'select') {
 			return;
 		}
 
 		$id = $view->item->getId();
 		$context = $this->getContext();
-		$data = $this->getDataParams( $view );
+		$data = $this->getDataParams($view);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
 
-		$product = $manager->getItem( $id, array( 'product' ) );
-		$listItems = $product->getListItems( 'product', 'default' );
-		$refItems = $product->getRefItems( 'product', null, 'default' );
+		$product = $manager->getItem($id, array('product'));
+		$listItems = $product->getListItems('product', 'default');
+		$refItems = $product->getRefItems('product', null, 'default');
 
-		$products = $this->getProductItems( array_keys( $data ), array_keys( $refItems ) );
-		$listIds = (array) $view->param( 'selection/product.lists.id', array() );
+		$products = $this->getProductItems(array_keys($data), array_keys($refItems));
+		$listIds = (array) $view->param('selection/product.lists.id', array());
 
-		$listItem = $this->createListItem( $id );
+		$listItem = $this->createListItem($id);
 		$prodItem = $this->createItem();
 
 
-		foreach( $listIds as $idx => $listid )
+		foreach ($listIds as $idx => $listid)
 		{
-			if( !isset( $listItems[$listid] ) )
+			if (!isset($listItems[$listid]))
 			{
 				$litem = $listItem;
-				$litem->setId( null );
+				$litem->setId(null);
 
 				$item = $prodItem;
-				$item->setId( null );
+				$item->setId(null);
 			}
 			else
 			{
@@ -530,26 +530,26 @@ 
 				$item = $litem->getRefItem();
 			}
 
-			if( ( $code = $view->param( 'selection/product.code/' . $idx ) ) === '' ) {
+			if (($code = $view->param('selection/product.code/' . $idx)) === '') {
 				continue;
 			}
 
-			$item->setCode( $code );
-			$item->setLabel( $view->param( 'selection/product.label/' . $idx ) );
+			$item->setCode($code);
+			$item->setLabel($view->param('selection/product.label/' . $idx));
 
-			$manager->saveItem( $item );
+			$manager->saveItem($item);
 
-			$litem->setPosition( $idx );
-			$litem->setRefId( $item->getId() );
+			$litem->setPosition($idx);
+			$litem->setRefId($item->getId());
 
-			$listManager->saveItem( $litem, false );
+			$listManager->saveItem($litem, false);
 
-			$variant = ( isset( $products[$item->getId()] ) ? $products[$item->getId()] : $item );
-			$attr = ( isset( $data[$code]['attr'] ) ? (array) $data[$code]['attr'] : array() );
+			$variant = (isset($products[$item->getId()]) ? $products[$item->getId()] : $item);
+			$attr = (isset($data[$code]['attr']) ? (array) $data[$code]['attr'] : array());
 
-			$manager->updateListItems( $variant, $attr, 'attribute', 'variant' );
+			$manager->updateListItems($variant, $attr, 'attribute', 'variant');
 		}
 
-		$this->cleanupItems( $listItems, $listIds );
+		$this->cleanupItems($listItems, $listIds);
 	}
 }
\ No newline at end of file

Braces +4 added lines, -8 removed lines

@@ -151,14 +151,12 @@ 
 
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-selection' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-selection' => $e->getMessage() );
@@ -391,8 +389,7 @@ 
 				$code = $refItem->getCode();
 				$data[$code]['product.lists.id'] = $listid;
 				$data[$code]['product.id'] = $listItem->getRefId();
-			}
-			else
+			} else
 			{
 				$code = $refItem->getCode() . '_copy';
 				$data[$code]['product.lists.id'] = '';
@@ -523,8 +520,7 @@ 
 
 				$item = $prodItem;
 				$item->setId( null );
-			}
-			else
+			} else
 			{
 				$litem = $listItems[$listid];
 				$item = $litem->getRefItem();

Doc Comments +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 	/**
 	 * Copies a resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function copy()
 	{
@@ -86,7 +86,7 @@ 
 	/**
 	 * Creates a new resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function create()
 	{
@@ -109,7 +109,7 @@ 
 	/**
 	 * Returns a single resource
 	 *
-	 * @return string|null admin output to display or null for redirecting to the list
+	 * @return string admin output to display or null for redirecting to the list
 	 */
 	public function get()
 	{