aimeos / ai-admin-jqadm

admin/jqadm/tests/Admin/JQAdm/FactoryTest.php

Spacing +11 added lines, -11 removed lines

@@ -17,42 +17,42 @@
 	{
 		$this->templatePaths = \TestHelperJqadm::getTemplatePaths();
 		$this->context = \TestHelperJqadm::getContext();
-		$this->context->setView( \TestHelperJqadm::getView() );
+		$this->context->setView(\TestHelperJqadm::getView());
 	}
 
 
 	public function testCreateClient()
 	{
-		$client = \Aimeos\Admin\JQAdm\Factory::createClient( $this->context, $this->templatePaths, 'product' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JQAdm\\Iface', $client );
+		$client = \Aimeos\Admin\JQAdm\Factory::createClient($this->context, $this->templatePaths, 'product');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JQAdm\\Iface', $client);
 	}
 
 
 	public function testCreateClientName()
 	{
-		$client = \Aimeos\Admin\JQAdm\Factory::createClient( $this->context, $this->templatePaths, 'product', 'Standard' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JQAdm\\Iface', $client );
+		$client = \Aimeos\Admin\JQAdm\Factory::createClient($this->context, $this->templatePaths, 'product', 'Standard');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JQAdm\\Iface', $client);
 	}
 
 
 	public function testCreateClientNameEmpty()
 	{
-		$this->setExpectedException( '\\Aimeos\\Admin\\JQAdm\\Exception' );
-		\Aimeos\Admin\JQAdm\Factory::createClient( $this->context, $this->templatePaths, '' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JQAdm\\Exception');
+		\Aimeos\Admin\JQAdm\Factory::createClient($this->context, $this->templatePaths, '');
 	}
 
 
 	public function testCreateClientNameInvalid()
 	{
-		$this->setExpectedException( '\\Aimeos\\Admin\\JQAdm\\Exception' );
-		\Aimeos\Admin\JQAdm\Factory::createClient( $this->context, $this->templatePaths, '%product' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JQAdm\\Exception');
+		\Aimeos\Admin\JQAdm\Factory::createClient($this->context, $this->templatePaths, '%product');
 	}
 
 
 	public function testCreateClientNameNotFound()
 	{
-		$this->setExpectedException( '\\Aimeos\\Admin\\JQAdm\\Exception' );
-		\Aimeos\Admin\JQAdm\Factory::createClient( $this->context, $this->templatePaths, 'prod' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JQAdm\\Exception');
+		\Aimeos\Admin\JQAdm\Factory::createClient($this->context, $this->templatePaths, 'prod');
 	}
 
 }

admin/jqadm/tests/Admin/JQAdm/Product/Category/Decorator/CacheTest.php

Spacing +15 added lines, -15 removed lines

@@ -19,45 +19,45 @@
 
 	protected function setUp()
 	{
-		$this->cache = $this->getMockBuilder( 'Aimeos\MW\Cache\None' )
-			->setMethods( array( 'deleteByTags' ) )
+		$this->cache = $this->getMockBuilder('Aimeos\MW\Cache\None')
+			->setMethods(array('deleteByTags'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->mock = $this->getMockBuilder( 'Aimeos\Admin\JQAdm\Product\Category\Standard' )
-			->setMethods( array( 'save' ) )
+		$this->mock = $this->getMockBuilder('Aimeos\Admin\JQAdm\Product\Category\Standard')
+			->setMethods(array('save'))
 			->disableOriginalConstructor()
 			->getMock();
 
 		$templatePaths = \TestHelperJqadm::getTemplatePaths();
 		$this->context = \TestHelperJqadm::getContext();
-		$this->context->setCache( $this->cache );
+		$this->context->setCache($this->cache);
 
-		$this->object = new \Aimeos\Admin\JQAdm\Product\Category\Decorator\Cache( $this->mock, $this->context, $templatePaths );
+		$this->object = new \Aimeos\Admin\JQAdm\Product\Category\Decorator\Cache($this->mock, $this->context, $templatePaths);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->mock, $this->context, $this->cache );
+		unset($this->object, $this->mock, $this->context, $this->cache);
 	}
 
 
 	public function testSave()
 	{
 		$view = \TestHelperJqadm::getView();
-		$tags = array( 'catalog', 'catalog-1', 'catalog-2' );
+		$tags = array('catalog', 'catalog-1', 'catalog-2');
 
-		$param = array( 'category' => array( 'catalog.id' => array( '1', '2' ) ) );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $param );
-		$view->addHelper( 'param', $helper );
+		$param = array('category' => array('catalog.id' => array('1', '2')));
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $param);
+		$view->addHelper('param', $helper);
 
-		$this->cache->expects( $this->once() )->method( 'deleteByTags' )->with( $this->equalTo( $tags ) );
-		$this->mock->expects( $this->once() )->method( 'save' )->will( $this->returnValue( 'test' ) );
+		$this->cache->expects($this->once())->method('deleteByTags')->with($this->equalTo($tags));
+		$this->mock->expects($this->once())->method('save')->will($this->returnValue('test'));
 
-		$this->object->setView( $view );
+		$this->object->setView($view);
 		$result = $this->object->save();
 
-		$this->assertEquals( 'test', $result );
+		$this->assertEquals('test', $result);
 	}
 }

admin/jqadm/tests/Admin/JQAdm/Common/Decorator/CacheTest.php

Spacing +13 added lines, -13 removed lines

@@ -19,44 +19,44 @@
 
 	protected function setUp()
 	{
-		$this->cache = $this->getMockBuilder( 'Aimeos\MW\Cache\None' )
-			->setMethods( array( 'deleteByTags' ) )
+		$this->cache = $this->getMockBuilder('Aimeos\MW\Cache\None')
+			->setMethods(array('deleteByTags'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->mock = $this->getMockBuilder( 'Aimeos\Admin\JQAdm\Product\Standard' )
-			->setMethods( array( 'save' ) )
+		$this->mock = $this->getMockBuilder('Aimeos\Admin\JQAdm\Product\Standard')
+			->setMethods(array('save'))
 			->disableOriginalConstructor()
 			->getMock();
 
 		$templatePaths = \TestHelperJqadm::getTemplatePaths();
 		$this->context = \TestHelperJqadm::getContext();
-		$this->context->setCache( $this->cache );
+		$this->context->setCache($this->cache);
 
-		$this->object = new \Aimeos\Admin\JQAdm\Common\Decorator\Cache( $this->mock, $this->context, $templatePaths );
+		$this->object = new \Aimeos\Admin\JQAdm\Common\Decorator\Cache($this->mock, $this->context, $templatePaths);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->mock, $this->context, $this->cache );
+		unset($this->object, $this->mock, $this->context, $this->cache);
 	}
 
 
 	public function testSave()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC' );
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC');
 
-		$tags = array( 'product', 'product-' . $item->getId() );
+		$tags = array('product', 'product-' . $item->getId());
 		$view = \TestHelperJqadm::getView();
 		$view->item = $item;
 
-		$this->cache->expects( $this->once() )->method( 'deleteByTags' )->with( $this->equalTo( $tags ) );
-		$this->mock->expects( $this->once() )->method( 'save' )->will( $this->returnValue( 'test' ) );
+		$this->cache->expects($this->once())->method('deleteByTags')->with($this->equalTo($tags));
+		$this->mock->expects($this->once())->method('save')->will($this->returnValue('test'));
 
-		$this->object->setView( $view );
+		$this->object->setView($view);
 		$result = $this->object->save();
 
-		$this->assertEquals( 'test', $result );
+		$this->assertEquals('test', $result);
 	}
 }

admin/jqadm/tests/Admin/JQAdm/Common/Decorator/PageTest.php

Spacing +6 added lines, -6 removed lines

@@ -20,14 +20,14 @@ 
 		$this->context = \TestHelperJqadm::getContext();
 		$templatePaths = \TestHelperJqadm::getTemplatePaths();
 
-		$client = new \Aimeos\Admin\JQAdm\Product\Standard( $this->context, $templatePaths );
-		$this->object = new \Aimeos\Admin\JQAdm\Common\Decorator\Page( $client, $this->context, $templatePaths );
+		$client = new \Aimeos\Admin\JQAdm\Product\Standard($this->context, $templatePaths);
+		$this->object = new \Aimeos\Admin\JQAdm\Common\Decorator\Page($client, $this->context, $templatePaths);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 	}
 
 
@@ -35,9 +35,9 @@ 
 	{
 		$view = \TestHelperJqadm::getView();
 
-		$this->object->setView( $view );
+		$this->object->setView($view);
 
-		$this->assertInternalType( 'array', $view->pageSites );
-		$this->assertInternalType( 'array', $view->pageLanguages );
+		$this->assertInternalType('array', $view->pageSites);
+		$this->assertInternalType('array', $view->pageLanguages);
 	}
 }

admin/jqadm/tests/Admin/JQAdm/Common/Decorator/IndexTest.php

Spacing +8 added lines, -8 removed lines

@@ -21,31 +21,31 @@
 		$this->context = \TestHelperJqadm::getContext();
 		$templatePaths = \TestHelperJqadm::getTemplatePaths();
 
-		$this->mock = $this->getMockBuilder( 'Aimeos\Admin\JQAdm\Product\Standard' )
-			->setMethods( array( 'save' ) )
+		$this->mock = $this->getMockBuilder('Aimeos\Admin\JQAdm\Product\Standard')
+			->setMethods(array('save'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = new \Aimeos\Admin\JQAdm\Common\Decorator\Index( $this->mock, $this->context, $templatePaths );
+		$this->object = new \Aimeos\Admin\JQAdm\Common\Decorator\Index($this->mock, $this->context, $templatePaths);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->mock, $this->context );
+		unset($this->object, $this->mock, $this->context);
 	}
 
 
 	public function testSave()
 	{
 		$view = \TestHelperJqadm::getView();
-		$view->item = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC' );
+		$view->item = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC');
 
-		$this->mock->expects( $this->once() )->method( 'save' )->will( $this->returnValue( 'test' ) );
-		$this->object->setView( $view );
+		$this->mock->expects($this->once())->method('save')->will($this->returnValue('test'));
+		$this->object->setView($view);
 
 		$result = $this->object->save();
 
-		$this->assertEquals( 'test', $result );
+		$this->assertEquals('test', $result);
 	}
 }

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