aimeos / ai-admin-jqadm

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

Braces +2 added lines, -4 removed lines

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

Spacing +21 added lines, -21 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Product\Characteristic;
 
-sprintf( 'characteristic' ); // for translation
+sprintf('characteristic'); // for translation
 
 
 /**
@@ -46,11 +46,11 @@ 
 
 		$view->characteristicBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->characteristicBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -65,11 +65,11 @@ 
 
 		$view->characteristicBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->characteristicBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -84,11 +84,11 @@ 
 
 		$view->characteristicBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->characteristicBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -103,23 +103,23 @@ 
 		{
 			$view->characteristicBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->characteristicBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-characteristic' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-characteristic' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'product-item-characteristic' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-characteristic' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -133,7 +133,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
@@ -208,7 +208,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);
 	}
 
 
@@ -252,7 +252,7 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/product/characteristic/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/product/characteristic/standard/subparts', []);
 	}
 
 
@@ -262,7 +262,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/product/characteristic/template-item
 		 * Relative path to the HTML body template of the characteristic subpart for products.
@@ -286,6 +286,6 @@ 
 		$tplconf = 'admin/jqadm/product/characteristic/template-item';
 		$default = 'product/item-characteristic-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

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

Braces +2 added lines, -4 removed lines

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

Spacing +21 added lines, -21 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Product\Option;
 
-sprintf( 'option' ); // for translation
+sprintf('option'); // for translation
 
 
 /**
@@ -46,11 +46,11 @@ 
 
 		$view->optionBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->optionBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -65,11 +65,11 @@ 
 
 		$view->optionBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->optionBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -84,11 +84,11 @@ 
 
 		$view->optionBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->optionBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -103,23 +103,23 @@ 
 		{
 			$view->optionBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->optionBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-option' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-option' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'product-item-option' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-option' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -133,7 +133,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/option/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -208,7 +208,7 @@ 
 		 * @see admin/jqadm/product/option/decorators/excludes
 		 * @see admin/jqadm/product/option/decorators/global
 		 */
-		return $this->createSubClient( 'product/option/' . $type, $name );
+		return $this->createSubClient('product/option/' . $type, $name);
 	}
 
 
@@ -252,7 +252,7 @@ 
 		 * @since 2017.03
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/product/option/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/product/option/standard/subparts', []);
 	}
 
 
@@ -262,7 +262,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/product/option/template-item
 		 * Relative path to the HTML body template of the option subpart for products.
@@ -286,6 +286,6 @@ 
 		$tplconf = 'admin/jqadm/product/option/template-item';
 		$default = 'product/item-option-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

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

Braces +2 added lines, -4 removed lines

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

Spacing +21 added lines, -21 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Product\Related;
 
-sprintf( 'related' ); // for translation
+sprintf('related'); // for translation
 
 
 /**
@@ -46,11 +46,11 @@ 
 
 		$view->relatedBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->relatedBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -65,11 +65,11 @@ 
 
 		$view->relatedBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->relatedBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -84,11 +84,11 @@ 
 
 		$view->relatedBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->relatedBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -103,23 +103,23 @@ 
 		{
 			$view->relatedBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->relatedBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-related' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-related' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'product-item-related' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-related' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -133,7 +133,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/related/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -208,7 +208,7 @@ 
 		 * @see admin/jqadm/product/related/decorators/excludes
 		 * @see admin/jqadm/product/related/decorators/global
 		 */
-		return $this->createSubClient( 'product/related/' . $type, $name );
+		return $this->createSubClient('product/related/' . $type, $name);
 	}
 
 
@@ -252,7 +252,7 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/product/related/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/product/related/standard/subparts', []);
 	}
 
 
@@ -262,7 +262,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/product/related/template-item
 		 * Relative path to the HTML body template of the related subpart for products.
@@ -286,6 +286,6 @@ 
 		$tplconf = 'admin/jqadm/product/related/template-item';
 		$default = 'product/item-related-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

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

Braces +2 added lines, -4 removed lines

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

Spacing +21 added lines, -21 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Product\Special;
 
-sprintf( 'special' ); // for translation
+sprintf('special'); // for translation
 
 
 /**
@@ -46,11 +46,11 @@ 
 
 		$view->specialBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->specialBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -65,11 +65,11 @@ 
 
 		$view->specialBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->specialBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -84,11 +84,11 @@ 
 
 		$view->specialBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->specialBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -103,23 +103,23 @@ 
 		{
 			$view->specialBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->specialBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-special' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-special' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'product-item-special' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-special' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -133,7 +133,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/special/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -208,7 +208,7 @@ 
 		 * @see admin/jqadm/product/special/decorators/excludes
 		 * @see admin/jqadm/product/special/decorators/global
 		 */
-		return $this->createSubClient( 'product/special/' . $type, $name );
+		return $this->createSubClient('product/special/' . $type, $name);
 	}
 
 
@@ -252,7 +252,7 @@ 
 		 * @since 2016.03
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/product/special/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/product/special/standard/subparts', []);
 	}
 
 
@@ -262,7 +262,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/product/special/template-item
 		 * Relative path to the HTML body template of the special subpart for products.
@@ -286,6 +286,6 @@ 
 		$tplconf = 'admin/jqadm/product/special/template-item';
 		$default = 'product/item-special-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

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

Spacing +11 added lines, -11 removed lines

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

admin/jqadm/src/Admin/JQAdm/Subscription/Standard.php

Braces +15 added lines, -30 removed lines

@@ -88,14 +88,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'subscription-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -137,14 +135,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'subscription-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -185,14 +181,12 @@ 
 
 			$this->nextAction( $view, 'search', 'subscription', null, 'delete' );
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'subscription-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -233,14 +227,12 @@ 
 
 			$msg = $context->getI18n()->dt( 'admin', 'Your export will be available in a few minutes for download' );
 			$view->info = $view->get( 'info', [] ) + ['subscription-item' => $msg];
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'subscription-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -279,14 +271,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'subscription-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -323,18 +313,15 @@ 
 
 			$this->nextAction( $view, $view->param( 'next' ), 'subscription', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'subscription-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -376,14 +363,12 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'subscription-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +135 added lines, -135 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Subscription;
 
-sprintf( 'subscription' ); // for translation
+sprintf('subscription'); // for translation
 
 
 /**
@@ -35,39 +35,39 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
-			$baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
+			$baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 
-			$view->item = $manager->getItem( $id );
-			$view->itemBase = $baseManager->getItem( $view->item->getOrderBaseId(), ['order/base/address', 'order/base/product'] );
-			$view->itemData = $this->toArray( $view->item, true );
+			$view->item = $manager->getItem($id);
+			$view->itemBase = $baseManager->getItem($view->item->getOrderBaseId(), ['order/base/address', 'order/base/product']);
+			$view->itemData = $this->toArray($view->item, true);
 			$view->itemSubparts = $this->getSubClientNames();
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'subscription-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('subscription-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -83,17 +83,17 @@ 
 
 		try
 		{
-			$data = $view->param( 'item', [] );
+			$data = $view->param('item', []);
 
-			if( !isset( $view->item ) ) {
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'subscription' )->createItem();
+			if (!isset($view->item)) {
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'subscription')->createItem();
 			}
 
-			$baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-			$baseId = ( $view->item->getOrderBaseId() ?: $view->param( 'item/subscription.ordbaseid' ) );
+			$baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
+			$baseId = ($view->item->getOrderBaseId() ?: $view->param('item/subscription.ordbaseid'));
 
-			if( $baseId ) {
-				$view->itemBase = $baseManager->getItem( $baseId, ['order/base/address', 'order/base/product'] );
+			if ($baseId) {
+				$view->itemBase = $baseManager->getItem($baseId, ['order/base/address', 'order/base/product']);
 			} else {
 				$view->itemBase = $baseManager->createItem();
 			}
@@ -104,26 +104,26 @@ 
 			$view->itemData = $data;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'subscription-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('subscription-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -137,38 +137,38 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 		$manager->begin();
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$view->item = $manager->getItem( $id );
+			$view->item = $manager->getItem($id);
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$client->delete();
 			}
 
-			$manager->deleteItem( $id );
+			$manager->deleteItem($id);
 			$manager->commit();
 
-			$this->nextAction( $view, 'search', 'subscription', null, 'delete' );
+			$this->nextAction($view, 'search', 'subscription', null, 'delete');
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'subscription-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('subscription-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -189,34 +189,34 @@ 
 
 		try
 		{
-			$params = $this->storeSearchParams( $view->param(), 'subscription' );
+			$params = $this->storeSearchParams($view->param(), 'subscription');
 			$msg = ['sitecode' => $context->getLocale()->getSite()->getCode()];
 
-			if( isset( $params['filter'] ) ) {
-				$msg['filter'] = $this->getCriteriaConditions( $params['filter'] );
+			if (isset($params['filter'])) {
+				$msg['filter'] = $this->getCriteriaConditions($params['filter']);
 			}
 
-			if( isset( $params['sort'] ) ) {
-				$msg['sort'] = $this->getCriteriaSortations( $params['sort'] );
+			if (isset($params['sort'])) {
+				$msg['sort'] = $this->getCriteriaSortations($params['sort']);
 			}
 
-			$mq = $context->getMessageQueueManager()->get( 'mq-admin' )->getQueue( 'subscription-export' );
-			$mq->add( json_encode( $msg ) );
+			$mq = $context->getMessageQueueManager()->get('mq-admin')->getQueue('subscription-export');
+			$mq->add(json_encode($msg));
 
-			$msg = $context->getI18n()->dt( 'admin', 'Your export will be available in a few minutes for download' );
-			$view->info = $view->get( 'info', [] ) + ['subscription-item' => $msg];
+			$msg = $context->getI18n()->dt('admin', 'Your export will be available in a few minutes for download');
+			$view->info = $view->get('info', []) + ['subscription-item' => $msg];
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'subscription-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('subscription-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		return $this->search();
@@ -235,39 +235,39 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
-			$baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
+			$baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 
-			$view->item = $manager->getItem( $id );
-			$view->itemBase = $baseManager->getItem( $view->item->getOrderBaseId(), ['order/base/address', 'order/base/product'] );
+			$view->item = $manager->getItem($id);
+			$view->itemBase = $baseManager->getItem($view->item->getOrderBaseId(), ['order/base/address', 'order/base/product']);
 			$view->itemSubparts = $this->getSubClientNames();
-			$view->itemData = $this->toArray( $view->item );
+			$view->itemData = $this->toArray($view->item);
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'subscription-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('subscription-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -281,40 +281,40 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 		$manager->begin();
 
 		try
 		{
-			$item = $this->fromArray( $view->param( 'item', [] ) );
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
+			$item = $this->fromArray($view->param('item', []));
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->save();
 			}
 
-			$manager->saveItem( clone $view->item );
+			$manager->saveItem(clone $view->item);
 			$manager->commit();
 
-			$this->nextAction( $view, $view->param( 'next' ), 'subscription', $view->item->getId(), 'save' );
+			$this->nextAction($view, $view->param('next'), 'subscription', $view->item->getId(), 'save');
 			return;
 		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
 		{
 			// fall through to create
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'subscription-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('subscription-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -336,35 +336,35 @@ 
 		try
 		{
 			$total = 0;
-			$params = $this->storeSearchParams( $view->param(), 'subscription' );
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+			$params = $this->storeSearchParams($view->param(), 'subscription');
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 
 			$search = $manager->createSearch();
-			$search->setSortations( [$search->sort( '-', 'subscription.ctime' )] );
-			$search = $this->initCriteria( $search, $params );
+			$search->setSortations([$search->sort('-', 'subscription.ctime')]);
+			$search = $this->initCriteria($search, $params);
 
-			$view->items = $manager->searchItems( $search, [], $total );
-			$view->baseItems = $this->getOrderBaseItems( $view->items );
-			$view->filterAttributes = $manager->getSearchAttributes( true );
+			$view->items = $manager->searchItems($search, [], $total);
+			$view->baseItems = $this->getOrderBaseItems($view->items);
+			$view->filterAttributes = $manager->getSearchAttributes(true);
 			$view->filterOperators = $search->getOperators();
 			$view->total = $total;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->search();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'subscription-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('subscription-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('subscription-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		/** admin/jqadm/subscription/template-list
@@ -389,7 +389,7 @@ 
 		$tplconf = 'admin/jqadm/subscription/template-list';
 		$default = 'subscription/list-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -400,7 +400,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/subscription/decorators/excludes
 		 * Excludes decorators added by the "common" option from the subscription JQAdm client
@@ -475,7 +475,7 @@ 
 		 * @see admin/jqadm/subscription/decorators/excludes
 		 * @see admin/jqadm/subscription/decorators/global
 		 */
-		return $this->createSubClient( 'subscription/' . $type, $name );
+		return $this->createSubClient('subscription/' . $type, $name);
 	}
 
 
@@ -485,19 +485,19 @@ 
 	 * @param \Aimeos\MShop\Subscription\Item\Iface[] $items List of subscription items
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface[] List of order base items
 	 */
-	protected function getOrderBaseItems( array $items )
+	protected function getOrderBaseItems(array $items)
 	{
 		$baseIds = [];
-		foreach( $items as $item ) {
+		foreach ($items as $item) {
 			$baseIds[] = $item->getOrderBaseId();
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base');
 
-		$search = $manager->createSearch()->setSlice( 0, count( $baseIds ) );
-		$search->setConditions( $search->compare( '==', 'order.base.id', $baseIds ) );
+		$search = $manager->createSearch()->setSlice(0, count($baseIds));
+		$search->setConditions($search->compare('==', 'order.base.id', $baseIds));
 
-		return $manager->searchItems( $search, ['order/base/address', 'order/base/product'] );
+		return $manager->searchItems($search, ['order/base/address', 'order/base/product']);
 	}
 
 
@@ -541,7 +541,7 @@ 
 		 * @since 2018.04
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/subscription/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/subscription/standard/subparts', []);
 	}
 
 
@@ -551,17 +551,17 @@ 
 	 * @param string[] Data array
 	 * @return \Aimeos\MShop\Subscription\Item\Iface New subscription item object
 	 */
-	protected function fromArray( array $data )
+	protected function fromArray(array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'subscription');
 
-		if( isset( $data['subscription.id'] ) && $data['subscription.id'] != '' ) {
-			$item = $manager->getItem( $data['subscription.id'] );
+		if (isset($data['subscription.id']) && $data['subscription.id'] != '') {
+			$item = $manager->getItem($data['subscription.id']);
 		} else {
 			$item = $manager->createItem();
 		}
 
-		$item->fromArray( $data );
+		$item->fromArray($data);
 
 		return $item;
 	}
@@ -573,12 +573,12 @@ 
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $item Subscription item object
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Subscription\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Subscription\Item\Iface $item, $copy = false)
 	{
 		$siteId = $this->getContext()->getLocale()->getSiteId();
-		$data = $item->toArray( true );
+		$data = $item->toArray(true);
 
-		if( $copy === true )
+		if ($copy === true)
 		{
 			$data['subscription.siteid'] = $siteId;
 			$data['subscription.id'] = '';
@@ -594,7 +594,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/subscription/template-item
 		 * Relative path to the HTML body template for the subscription item.
@@ -618,6 +618,6 @@ 
 		$tplconf = 'admin/jqadm/subscription/template-item';
 		$default = 'subscription/item-standard';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

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

Spacing +8 added lines, -8 removed lines

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

admin/jqadm/templates/product/item-physical-standard.php

Spacing +26 added lines, -26 removed lines

@@ -10,48 +10,48 @@
 
 ?>
 <div id="physical" class="row item-physical tab-pane fade" role="tabpanel" aria-labelledby="physical">
-	<div class="col-xl-6 content-block <?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ) ?>">
+	<div class="col-xl-6 content-block <?= $this->site()->readonly($this->get('itemData/product.siteid')) ?>">
 		<div class="form-group row optional">
-			<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Length' ) ); ?></label>
+			<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Length')); ?></label>
 			<div class="col-sm-8">
-				<input class="form-control item-package-length" type="number" step="any" min="0" tabindex="<?= $this->get( 'tabindex' ); ?>"
-					name="<?= $enc->attr( $this->formparam( array( 'physical', 'package-length' ) ) ); ?>"
-					placeholder="<?= $enc->attr( $this->translate( 'admin', 'Product length, e.g. 30.0 (in yard, inch, etc.)' ) ); ?>"
-					value="<?= $enc->attr( $this->get( 'physicalData/package-length' ) ); ?>"
-					<?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ) ?> >
+				<input class="form-control item-package-length" type="number" step="any" min="0" tabindex="<?= $this->get('tabindex'); ?>"
+					name="<?= $enc->attr($this->formparam(array('physical', 'package-length'))); ?>"
+					placeholder="<?= $enc->attr($this->translate('admin', 'Product length, e.g. 30.0 (in yard, inch, etc.)')); ?>"
+					value="<?= $enc->attr($this->get('physicalData/package-length')); ?>"
+					<?= $this->site()->readonly($this->get('itemData/product.siteid')) ?> >
 			</div>
 		</div>
 		<div class="form-group row optional">
-			<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Width' ) ); ?></label>
+			<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Width')); ?></label>
 			<div class="col-sm-8">
-				<input class="form-control item-package-width" type="number" step="any" min="0" tabindex="<?= $this->get( 'tabindex' ); ?>"
-					name="<?= $enc->attr( $this->formparam( array( 'physical', 'package-width' ) ) ); ?>"
-					placeholder="<?= $enc->attr( $this->translate( 'admin', 'Product width, e.g. 17.5 (in yard, inch etc.)' ) ); ?>"
-					value="<?= $enc->attr( $this->get( 'physicalData/package-width' ) ); ?>"
-					<?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ) ?> >
+				<input class="form-control item-package-width" type="number" step="any" min="0" tabindex="<?= $this->get('tabindex'); ?>"
+					name="<?= $enc->attr($this->formparam(array('physical', 'package-width'))); ?>"
+					placeholder="<?= $enc->attr($this->translate('admin', 'Product width, e.g. 17.5 (in yard, inch etc.)')); ?>"
+					value="<?= $enc->attr($this->get('physicalData/package-width')); ?>"
+					<?= $this->site()->readonly($this->get('itemData/product.siteid')) ?> >
 			</div>
 		</div>
 		<div class="form-group row optional">
-			<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Height' ) ); ?></label>
+			<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Height')); ?></label>
 			<div class="col-sm-8">
-				<input class="form-control item-package-height" type="number" step="any" min="0" tabindex="<?= $this->get( 'tabindex' ); ?>"
-					name="<?= $enc->attr( $this->formparam( array( 'physical', 'package-height' ) ) ); ?>"
-					placeholder="<?= $enc->attr( $this->translate( 'admin', 'Product height, e.g. 20.0 (in yard, inch, etc.)' ) ); ?>"
-					value="<?= $enc->attr( $this->get( 'physicalData/package-height' ) ); ?>"
-					<?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ) ?> >
+				<input class="form-control item-package-height" type="number" step="any" min="0" tabindex="<?= $this->get('tabindex'); ?>"
+					name="<?= $enc->attr($this->formparam(array('physical', 'package-height'))); ?>"
+					placeholder="<?= $enc->attr($this->translate('admin', 'Product height, e.g. 20.0 (in yard, inch, etc.)')); ?>"
+					value="<?= $enc->attr($this->get('physicalData/package-height')); ?>"
+					<?= $this->site()->readonly($this->get('itemData/product.siteid')) ?> >
 			</div>
 		</div>
 		<div class="form-group row optional">
-			<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Weight' ) ); ?></label>
+			<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Weight')); ?></label>
 			<div class="col-sm-8">
-				<input class="form-control item-package-weight" type="number" step="any" min="0" tabindex="<?= $this->get( 'tabindex' ); ?>"
-					name="<?= $enc->attr( $this->formparam( array( 'physical', 'package-weight' ) ) ); ?>"
-					placeholder="<?= $enc->attr( $this->translate( 'admin', 'Product weight, e.g. 1.25 (in pound, ounce, etc.)' ) ); ?>"
-					value="<?= $enc->attr( $this->get( 'physicalData/package-weight' ) ); ?>"
-					<?= $this->site()->readonly( $this->get( 'itemData/product.siteid' ) ) ?> >
+				<input class="form-control item-package-weight" type="number" step="any" min="0" tabindex="<?= $this->get('tabindex'); ?>"
+					name="<?= $enc->attr($this->formparam(array('physical', 'package-weight'))); ?>"
+					placeholder="<?= $enc->attr($this->translate('admin', 'Product weight, e.g. 1.25 (in pound, ounce, etc.)')); ?>"
+					value="<?= $enc->attr($this->get('physicalData/package-weight')); ?>"
+					<?= $this->site()->readonly($this->get('itemData/product.siteid')) ?> >
 			</div>
 		</div>
 	</div>
 
-	<?= $this->get( 'physicalBody' ); ?>
+	<?= $this->get('physicalBody'); ?>
 </div>

admin/jqadm/templates/common/partials/navsearch-standard.php

Spacing +21 added lines, -21 removed lines

@@ -17,49 +17,49 @@
  */
 
 
-$selected = function( array $filter, $key, $code ) {
-	return ( isset( $filter[$key][0] ) && $filter[$key][0] == $code ? 'selected="selected"' : '' );
+$selected = function(array $filter, $key, $code) {
+	return (isset($filter[$key][0]) && $filter[$key][0] == $code ? 'selected="selected"' : '');
 };
 
 
-$target = $this->config( 'admin/jqadm/url/search/target' );
-$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
-$action = $this->config( 'admin/jqadm/url/search/action', 'search' );
-$config = $this->config( 'admin/jqadm/url/search/config', [] );
+$target = $this->config('admin/jqadm/url/search/target');
+$controller = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
+$action = $this->config('admin/jqadm/url/search/action', 'search');
+$config = $this->config('admin/jqadm/url/search/config', []);
 
-$filter = $this->get( 'filter', [] );
-$params = $this->get( 'params', [] );
+$filter = $this->get('filter', []);
+$params = $this->get('params', []);
 $params['page']['start'] = 0;
-unset( $params['filter'] );
+unset($params['filter']);
 
 $enc = $this->encoder();
 
 
 ?>
-<form class="form-inline" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $params, [], $config ) ); ?>">
+<form class="form-inline" method="POST" action="<?= $enc->attr($this->url($target, $controller, $action, $params, [], $config)); ?>">
 	<?= $this->csrf()->formfield(); ?>
 
 	<i class="fa more"></i>
 
 	<div class="input-group">
-		<select class="custom-select filter-key" name="<?= $this->formparam( ['filter', 'key', '0'] ); ?>">
-			<?php foreach( $this->get( 'filterAttributes', [] ) as $code => $attrItem ) : ?>
-				<?php if( $attrItem->isPublic() ) : ?>
-					<option value="<?= $enc->attr( $code ); ?>" data-type="<?= $enc->attr( $attrItem->getType() ); ?>" <?= $selected( $filter, 'key', $code ); ?> >
-						<?= $enc->html( $this->translate( 'admin/ext', $attrItem->getLabel() ) ); ?>
+		<select class="custom-select filter-key" name="<?= $this->formparam(['filter', 'key', '0']); ?>">
+			<?php foreach ($this->get('filterAttributes', []) as $code => $attrItem) : ?>
+				<?php if ($attrItem->isPublic()) : ?>
+					<option value="<?= $enc->attr($code); ?>" data-type="<?= $enc->attr($attrItem->getType()); ?>" <?= $selected($filter, 'key', $code); ?> >
+						<?= $enc->html($this->translate('admin/ext', $attrItem->getLabel())); ?>
 					</option>
 				<?php endif; ?>
 			<?php endforeach; ?>
 		</select>
-		<select class="custom-select filter-operator" name="<?= $this->formparam( ['filter', 'op', '0'] ); ?>">
-			<?php foreach( $this->get( 'filterOperators/compare', [] ) as $code ) : ?>
-				<option value="<?= $enc->attr( $code ); ?>" <?= $selected( $filter, 'op', $code ); ?> >
-					<?= $enc->html( $code ) . ( strlen( $code ) === 1 ? '&nbsp;' : '' ); ?>&nbsp;&nbsp;<?= $enc->html( $this->translate( 'admin/ext', $code ) ); ?>
+		<select class="custom-select filter-operator" name="<?= $this->formparam(['filter', 'op', '0']); ?>">
+			<?php foreach ($this->get('filterOperators/compare', []) as $code) : ?>
+				<option value="<?= $enc->attr($code); ?>" <?= $selected($filter, 'op', $code); ?> >
+					<?= $enc->html($code) . (strlen($code) === 1 ? '&nbsp;' : ''); ?>&nbsp;&nbsp;<?= $enc->html($this->translate('admin/ext', $code)); ?>
 				</option>
 			<?php endforeach; ?>
 		</select>
-		<input type="text" class="form-control filter-value" name="<?= $this->formparam( ['filter', 'val', '0'] ); ?>"
-			 value="<?= $enc->attr( ( isset( $filter['val'][0] ) ? $filter['val'][0] : '' ) ); ?>" >
+		<input type="text" class="form-control filter-value" name="<?= $this->formparam(['filter', 'val', '0']); ?>"
+			 value="<?= $enc->attr((isset($filter['val'][0]) ? $filter['val'][0] : '')); ?>" >
 		<div class="input-group-append">
 			<button class="btn btn-primary fa fa-search"></button>
 		</div>