aimeos / ai-admin-jqadm

admin/jqadm/src/Admin/JQAdm/Common/Factory/Iface.php

Spacing +1 added lines, -1 removed lines

@@ -27,5 +27,5 @@
 	 * @param string $name Admin name (from configuration or "Standard" if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface New client object
 	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null );
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null);
 }

admin/jqadm/src/Admin/JQAdm/Common/Decorator/Base.php

Indentation +5 added lines, -5 removed lines

@@ -74,7 +74,7 @@ 
 	 * Creates a new resource
 	 *
 	 * @return string|null admin output to display or null for redirecting to the list
-	*/
+	 */
 	public function create()
 	{
 		return $this->client->create();
@@ -85,7 +85,7 @@ 
 	 * Deletes a resource
 	 *
 	 * @return string|null admin output to display or null for redirecting to the list
-	*/
+	 */
 	public function delete()
 	{
 		return $this->client->delete();
@@ -96,7 +96,7 @@ 
 	 * Returns a single resource
 	 *
 	 * @return string|null admin output to display or null for redirecting to the list
-	*/
+	 */
 	public function get()
 	{
 		return $this->client->get();
@@ -107,7 +107,7 @@ 
 	 * Saves the data
 	 *
 	 * @return string|null admin output to display or null for redirecting to the list
-	*/
+	 */
 	public function save()
 	{
 		return $this->client->save();
@@ -118,7 +118,7 @@ 
 	 * Returns a list of resource according to the conditions
 	 *
 	 * @return string admin output to display
-	*/
+	 */
 	public function search()
 	{
 		return $this->client->search();

Spacing +10 added lines, -10 removed lines

@@ -32,10 +32,10 @@ 
 	 * @param array $templatePaths Associative list of the file system paths to the core or the extensions as key
 	 * 	and a list of relative paths inside the core or the extension as values
 	 */
-	public function __construct( \Aimeos\Admin\JQAdm\Iface $client,
-		\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths )
+	public function __construct(\Aimeos\Admin\JQAdm\Iface $client,
+		\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths)
 	{
-		parent::__construct( $context, $templatePaths );
+		parent::__construct($context, $templatePaths);
 
 		$this->client = $client;
 	}
@@ -49,10 +49,10 @@ 
 	 * @return mixed Returns the value of the called method
 	 * @throws \Aimeos\Admin\JQAdm\Exception If method call failed
 	 */
-	public function __call( $name, array $param )
+	public function __call($name, array $param)
 	{
-		if( ( $result = @call_user_func_array( array( $this->client, $name ), $param ) ) === false ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Unable to call method "%1$s"', $name ) );
+		if (($result = @call_user_func_array(array($this->client, $name), $param)) === false) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Unable to call method "%1$s"', $name));
 		}
 
 		return $result;
@@ -132,9 +132,9 @@ 
 	 * @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)
 	{
-		return $this->client->getSubClient( $type, $name );
+		return $this->client->getSubClient($type, $name);
 	}
 
 
@@ -155,9 +155,9 @@ 
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the admin output
 	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
 	 */
-	public function setView( \Aimeos\MW\View\Iface $view )
+	public function setView(\Aimeos\MW\View\Iface $view)
 	{
-		$this->client->setView( $view );
+		$this->client->setView($view);
 		return $this;
 	}
 

admin/jqadm/src/Admin/JQAdm/Common/Decorator/Cache.php

Spacing +2 added lines, -2 removed lines

@@ -29,10 +29,10 @@
 		$result = $this->getClient()->save();
 		$item = $this->getView()->item;
 
-		if( $item->getId() !== null )
+		if ($item->getId() !== null)
 		{
 			$idtag = $item->getResourceType() . '-' . $item->getId();
-			$this->getContext()->getCache()->deleteByTags( array( $item->getResourceType(), $idtag ) );
+			$this->getContext()->getCache()->deleteByTags(array($item->getResourceType(), $idtag));
 		}
 
 		return $result;

admin/jqadm/src/Admin/JQAdm/Common/Decorator/Index.php

Spacing +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
 		$result = $this->getClient()->save();
 		$item = $this->getView()->item;
 
-		if( $item->getId() !== null ) {
-			\Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->saveItem( $item );
+		if ($item->getId() !== null) {
+			\Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->saveItem($item);
 		}
 
 		return $result;

admin/jqadm/src/Admin/JQAdm/Common/Decorator/Iface.php

Spacing +2 added lines, -2 removed lines

@@ -28,6 +28,6 @@
 	 * @param array $templatePaths Associative list of the file system paths to the core or the extensions as key
 	 * 	and a list of relative paths inside the core or the extension as values
 	 */
-	public function __construct( \Aimeos\Admin\JQAdm\Iface $client,
-		\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths );
+	public function __construct(\Aimeos\Admin\JQAdm\Iface $client,
+		\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths);
 }
\ No newline at end of file

admin/jqadm/src/Admin/JQAdm/Iface.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,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);
 
 	/**
 	 * Returns the view object that will generate the admin output.
@@ -41,7 +41,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the admin output
 	 * @return \Aimeos\Admin\Html\Iface Reference to this object for fluent calls
 	 */
-	public function setView( \Aimeos\MW\View\Iface $view );
+	public function setView(\Aimeos\MW\View\Iface $view);
 
 	/**
 	 * Copies a resource

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

Spacing +12 added lines, -12 removed lines

@@ -29,29 +29,29 @@
 	 * @return \Aimeos\Admin\JQAdm\Iface admin client 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, array $templatePaths, $type, $name = null )
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $type, $name = null)
 	{
-		if( empty( $type ) ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Admin JQAdm type is empty' ) );
+		if (empty($type)) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Admin JQAdm type is empty'));
 		}
 
-		if( ctype_alnum( $type ) === false ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Invalid characters in client name "%1$s"', $type ) );
+		if (ctype_alnum($type) === false) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Invalid characters in client name "%1$s"', $type));
 		}
 
-		$factory = '\\Aimeos\\Admin\\JQAdm\\' . ucwords( $type ) . '\\Factory';
+		$factory = '\\Aimeos\\Admin\\JQAdm\\' . ucwords($type) . '\\Factory';
 
-		if( class_exists( $factory ) === false ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Class "%1$s" not available', $factory ) );
+		if (class_exists($factory) === false) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Class "%1$s" not available', $factory));
 		}
 
-		$client = @call_user_func_array( array( $factory, 'createClient' ), array( $context, $templatePaths, $name ) );
+		$client = @call_user_func_array(array($factory, 'createClient'), array($context, $templatePaths, $name));
 
-		if( $client === false ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Invalid factory "%1$s"', $factory ) );
+		if ($client === false) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Invalid factory "%1$s"', $factory));
 		}
 
-		$client->setView( $context->getView() );
+		$client->setView($context->getView());
 
 		return $client;
 	}

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

Spacing +121 added lines, -121 removed lines

@@ -67,17 +67,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->downloadBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->downloadBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/download/template-item';
 		$default = 'product/item-download-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->downloadBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->downloadBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/download/template-item';
 		$default = 'product/item-download-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -112,35 +112,35 @@ 
 	public function delete()
 	{
 		$view = $this->getView();
-		$listManager = \Aimeos\MShop\Factory::createManager( $context = $this->getContext(), 'product/lists' );
+		$listManager = \Aimeos\MShop\Factory::createManager($context = $this->getContext(), 'product/lists');
 		$search = $listManager->createSearch();
 
-		foreach( (array) $view->param( 'id' ) as $id )
+		foreach ((array) $view->param('id') as $id)
 		{
-			$listItems = $this->getListItems( $id );
-			$items = $this->getAttributeItems( $listItems );
+			$listItems = $this->getListItems($id);
+			$items = $this->getAttributeItems($listItems);
 
-			foreach( $listItems as $listid => $listItem )
+			foreach ($listItems as $listid => $listItem)
 			{
 				$refId = $listItem->getRefId();
 
 				$expr = array(
-					$search->compare( '==', 'product.lists.refid', $refId ),
-					$search->compare( '==', 'product.lists.domain', 'attribute' ),
-					$search->compare( '==', 'product.lists.type.code', 'hidden' ),
-					$search->compare( '==', 'product.lists.type.domain', 'attribute' ),
+					$search->compare('==', 'product.lists.refid', $refId),
+					$search->compare('==', 'product.lists.domain', 'attribute'),
+					$search->compare('==', 'product.lists.type.code', 'hidden'),
+					$search->compare('==', 'product.lists.type.domain', 'attribute'),
 				);
-				$search->setConditions( $search->combine( '&&', $expr ) );
-				$result = $listManager->aggregate( $search, 'product.lists.refid' );
+				$search->setConditions($search->combine('&&', $expr));
+				$result = $listManager->aggregate($search, 'product.lists.refid');
 
-				if( isset( $items[$refId] ) && $result[$refId] == 1 ) {
-					$listItem->setRefItem( $items[$refId] );
+				if (isset($items[$refId]) && $result[$refId] == 1) {
+					$listItem->setRefItem($items[$refId]);
 				} else {
-					unset( $listItems[$id] );
+					unset($listItems[$id]);
 				}
 			}
 
-			$this->cleanupItems( $listItems, array() );
+			$this->cleanupItems($listItems, array());
 		}
 	}
 
@@ -154,17 +154,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->downloadBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->downloadBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/download/template-item';
 		$default = 'product/item-download-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -178,18 +178,18 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$attrManager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$attrManager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
 
 		$manager->begin();
 		$attrManager->begin();
 
 		try
 		{
-			$this->updateItems( $view );
+			$this->updateItems($view);
 			$view->downloadBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->downloadBody .= $client->save();
 			}
 
@@ -197,19 +197,19 @@ 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-download' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-download' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 
 			$attrManager->rollback();
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-download' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-download' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 
 			$attrManager->rollback();
 			$manager->rollback();
@@ -226,7 +226,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/download/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -301,7 +301,7 @@ 
 		 * @see admin/jqadm/product/download/decorators/excludes
 		 * @see admin/jqadm/product/download/decorators/global
 		 */
-		return $this->createSubClient( 'product/download/' . $type, $name );
+		return $this->createSubClient('product/download/' . $type, $name);
 	}
 
 
@@ -311,29 +311,29 @@ 
 	 * @param array $listItems List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 * @param array $listIds List of IDs of the still used list items
 	 */
-	protected function cleanupItems( array $listItems, array $listIds )
+	protected function cleanupItems(array $listItems, array $listIds)
 	{
 		$context = $this->getContext();
-		$fs = $context->getFilesystemManager()->get( 'fs-secure' );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
+		$fs = $context->getFilesystemManager()->get('fs-secure');
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
 
 		$rmItems = array();
-		$rmListIds = array_diff( array_keys( $listItems ), $listIds );
+		$rmListIds = array_diff(array_keys($listItems), $listIds);
 
-		foreach( $rmListIds as $rmListId )
+		foreach ($rmListIds as $rmListId)
 		{
-			if( ( $item = $listItems[$rmListId]->getRefItem() ) !== null )
+			if (($item = $listItems[$rmListId]->getRefItem()) !== null)
 			{
-				if( $item->getCode() != '' && $fs->has( $item->getCode() ) ) {
-					$fs->rm( $item->getCode() );
+				if ($item->getCode() != '' && $fs->has($item->getCode())) {
+					$fs->rm($item->getCode());
 				}
 				$rmItems[] = $item->getId();
 			}
 		}
 
-		$listManager->deleteItems( $rmListIds  );
-		$manager->deleteItems( $rmItems  );
+		$listManager->deleteItems($rmListIds);
+		$manager->deleteItems($rmItems);
 	}
 
 
@@ -345,13 +345,13 @@ 
 	protected function createItem()
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
-		$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'attribute/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
+		$typeManager = \Aimeos\MShop\Factory::createManager($context, 'attribute/type');
 
 		$item = $manager->createItem();
-		$item->setTypeId( $typeManager->findItem( 'download', array(), 'product' )->getId() );
-		$item->setDomain( 'product' );
-		$item->setStatus( 1 );
+		$item->setTypeId($typeManager->findItem('download', array(), 'product')->getId());
+		$item->setDomain('product');
+		$item->setStatus(1);
 
 		return $item;
 	}
@@ -363,17 +363,17 @@ 
 	 * @param string $id Parent ID for the new list item
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface New list item object
 	 */
-	protected function createListItem( $id )
+	protected function createListItem($id)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$typeManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
 
 		$item = $manager->createItem();
-		$item->setTypeId( $typeManager->findItem( 'hidden', array(), 'attribute' )->getId() );
-		$item->setDomain( 'attribute' );
-		$item->setParentId( $id );
-		$item->setStatus( 1 );
+		$item->setTypeId($typeManager->findItem('hidden', array(), 'attribute')->getId());
+		$item->setDomain('attribute');
+		$item->setParentId($id);
+		$item->setStatus(1);
 
 		return $item;
 	}
@@ -385,27 +385,27 @@ 
 	 * @param array $listItems List of list items with IDs as key and items implementing \Aimeos\MShop\Common\Item\List\Iface as values
 	 * @return array List of attribute items with ID as key and items implementing \Aimeos\MShop\Attribute\Item\Iface as values
 	 */
-	protected function getAttributeItems( array $listItems )
+	protected function getAttributeItems(array $listItems)
 	{
 		$refIds = array();
 
-		foreach( $listItems as $item ) {
+		foreach ($listItems as $item) {
 			$refIds[] = $item->getRefId();
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.id', $refIds ),
-			$search->compare( '==', 'attribute.domain', 'product' ),
-			$search->compare( '==', 'attribute.type.domain', 'product' ),
-			$search->compare( '==', 'attribute.type.code', 'download' ),
+			$search->compare('==', 'attribute.id', $refIds),
+			$search->compare('==', 'attribute.domain', 'product'),
+			$search->compare('==', 'attribute.type.domain', 'product'),
+			$search->compare('==', 'attribute.type.code', 'download'),
 		);
-		$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);
 	}
 
 
@@ -415,20 +415,20 @@ 
 	 * @param string $prodid Unique product ID
 	 * @return array Associative list of bundle product IDs as keys and list items as values
 	 */
-	protected function getListItems( $prodid )
+	protected function getListItems($prodid)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'product.lists.parentid', $prodid ),
-			$search->compare( '==', 'product.lists.domain', 'attribute' ),
-			$search->compare( '==', 'product.lists.type.domain', 'attribute' ),
-			$search->compare( '==', 'product.lists.type.code', 'hidden' ),
+			$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', 'hidden'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -439,7 +439,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -448,29 +448,29 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view )
+	protected function setData(\Aimeos\MW\View\Iface $view)
 	{
-		$view->downloadData = (array) $view->param( 'download', array() );
+		$view->downloadData = (array) $view->param('download', array());
 
-		if( !empty( $view->downloadData ) ) {
+		if (!empty($view->downloadData)) {
 			return;
 		}
 
 		$data = array();
-		$listItems = $this->getListItems( $view->item->getId() );
-		$attrItems = $this->getAttributeItems( $listItems );
+		$listItems = $this->getListItems($view->item->getId());
+		$attrItems = $this->getAttributeItems($listItems);
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			if( !isset( $attrItems[$listItem->getRefId()] ) ) {
+			if (!isset($attrItems[$listItem->getRefId()])) {
 				continue;
 			}
 
-			foreach( $listItem->toArray() as $key => $value ) {
+			foreach ($listItem->toArray() as $key => $value) {
 				$data[$key] = $value;
 			}
 
-			foreach( $attrItems[$listItem->getRefId()]->toArray() as $key => $value ) {
+			foreach ($attrItems[$listItem->getRefId()]->toArray() as $key => $value) {
 				$data[$key] = $value;
 			}
 
@@ -478,12 +478,12 @@ 
 
 			try
 			{
-				$fs = $this->getContext()->getFilesystemManager()->get( 'fs-secure' );
+				$fs = $this->getContext()->getFilesystemManager()->get('fs-secure');
 
-				$data['time'] = $fs->time( $data['path'] );
-				$data['size'] = $fs->size( $data['path'] );
+				$data['time'] = $fs->time($data['path']);
+				$data['size'] = $fs->size($data['path']);
 			}
-			catch( \Exception $e ) { ; } // Show product even if file isn't available any more
+			catch (\Exception $e) {; } // Show product even if file isn't available any more
 		}
 
 		$view->downloadData = $data;
@@ -497,22 +497,22 @@ 
 	 * @param string $path Path the file should be stored at
 	 * @return string Path to the uploaded file
 	 */
-	protected function storeFile( \Psr\Http\Message\UploadedFileInterface $file, $path )
+	protected function storeFile(\Psr\Http\Message\UploadedFileInterface $file, $path)
 	{
-		$fs = $this->getContext()->getFilesystemManager()->get( 'fs-secure' );
+		$fs = $this->getContext()->getFilesystemManager()->get('fs-secure');
 
-		if( $path == null )
+		if ($path == null)
 		{
-			$ext = pathinfo( $file->getClientFilename(), PATHINFO_EXTENSION );
-			$hash = md5( $file->getClientFilename() . microtime( true ) );
-			$path = sprintf( '%s/%s/%s.%s', $hash[0], $hash[1], $hash, $ext );
+			$ext = pathinfo($file->getClientFilename(), PATHINFO_EXTENSION);
+			$hash = md5($file->getClientFilename() . microtime(true));
+			$path = sprintf('%s/%s/%s.%s', $hash[0], $hash[1], $hash, $ext);
 
-			if( !$fs->isdir( $hash[0] . '/' . $hash[1] ) ) {
-				$fs->mkdir( $hash[0] . '/' . $hash[1] );
+			if (!$fs->isdir($hash[0] . '/' . $hash[1])) {
+				$fs->mkdir($hash[0] . '/' . $hash[1]);
 			}
 		}
 
-		$fs->writes( $path, $file->getStream()->detach() );
+		$fs->writes($path, $file->getStream()->detach());
 
 		return $path;
 	}
@@ -523,47 +523,47 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function updateItems( \Aimeos\MW\View\Iface $view )
+	protected function updateItems(\Aimeos\MW\View\Iface $view)
 	{
 		$id = $view->item->getId();
 		$context = $this->getContext();
 
-		$attrManager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
+		$attrManager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
 
-		$listItems = $this->getListItems( $id );
-		$listId = $view->param( 'download/product.lists.id' );
+		$listItems = $this->getListItems($id);
+		$listId = $view->param('download/product.lists.id');
 
-		if( isset( $listItems[$listId] ) ) {
+		if (isset($listItems[$listId])) {
 			$litem = $listItems[$listId];
 		} else {
-			$litem = $this->createListItem( $id );
+			$litem = $this->createListItem($id);
 		}
 
-		if( ( $attrId = $view->param( 'download/attribute.id' ) ) != '' ) {
-			$item = $attrManager->getItem( $attrId );
+		if (($attrId = $view->param('download/attribute.id')) != '') {
+			$item = $attrManager->getItem($attrId);
 		} else {
 			$item = $this->createItem();
 		}
 
-		if( ( $file = $view->value( (array) $view->request()->getUploadedFiles(), 'download/file' ) ) !== null
+		if (($file = $view->value((array) $view->request()->getUploadedFiles(), 'download/file')) !== null
 			&& $file->getError() === UPLOAD_ERR_OK
 		) {
-			$path = ( $view->param( 'download/overwrite' ) == 1 ? $item->getCode() : null );
-			$item->setCode( $this->storeFile( $file, $path ) );
+			$path = ($view->param('download/overwrite') == 1 ? $item->getCode() : null);
+			$item->setCode($this->storeFile($file, $path));
 		}
 
-		if( ( $label = $view->param( 'download/attribute.label' ) ) != '' )
+		if (($label = $view->param('download/attribute.label')) != '')
 		{
-			$item->setLabel( $label );
-			$attrManager->saveItem( $item );
+			$item->setLabel($label);
+			$attrManager->saveItem($item);
 
-			$litem->setPosition( 0 );
-			$litem->setRefId( $item->getId() );
-			$litem->setStatus( $view->param( 'download/product.lists.status' ) );
-			$listManager->saveItem( $litem );
+			$litem->setPosition(0);
+			$litem->setRefId($item->getId());
+			$litem->setStatus($view->param('download/product.lists.status'));
+			$listManager->saveItem($litem);
 		}
 
-		$this->cleanupItems( $listItems, array( $listId ) );
+		$this->cleanupItems($listItems, array($listId));
 	}
 }
\ No newline at end of file

Braces +3 added lines, -6 removed lines

@@ -196,16 +196,14 @@ 
 			$attrManager->commit();
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-download' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 
 			$attrManager->rollback();
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-download' => $e->getMessage() );
@@ -482,8 +480,7 @@ 
 
 				$data['time'] = $fs->time( $data['path'] );
 				$data['size'] = $fs->size( $data['path'] );
-			}
-			catch( \Exception $e ) { ; } // Show product even if file isn't available any more
+			} catch( \Exception $e ) { ; } // Show product even if file isn't available any more
 		}
 
 		$view->downloadData = $data;

admin/jqadm/src/Admin/JQAdm/Base.php

Spacing +72 added lines, -72 removed lines

@@ -33,7 +33,7 @@ 
 	 * @param array $templatePaths Associative list of the file system paths to the core or the extensions as key
 	 * 	and a list of relative paths inside the core or the extension as values
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths)
 	{
 		$this->context = $context;
 		$this->templatePaths = $templatePaths;
@@ -47,7 +47,7 @@ 
 	 * @param array $param List of method parameter
 	 * @return boolean False for every call
 	 */
-	public function __call( $name, array $param )
+	public function __call($name, array $param)
 	{
 		return false;
 	}
@@ -60,8 +60,8 @@ 
 	 */
 	public function getView()
 	{
-		if( !isset( $this->view ) ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'No view available' ) );
+		if (!isset($this->view)) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('No view available'));
 		}
 
 		return $this->view;
@@ -74,7 +74,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the admin output
 	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
 	 */
-	public function setView( \Aimeos\MW\View\Iface $view )
+	public function setView(\Aimeos\MW\View\Iface $view)
 	{
 		$this->view = $view;
 		return $this;
@@ -110,29 +110,29 @@ 
 	 * @param string $classprefix Decorator class prefix, e.g. "\Aimeos\Admin\JQAdm\Catalog\Decorator\"
 	 * @return \Aimeos\Admin\JQAdm\Iface Admin object
 	 */
-	protected function addDecorators( \Aimeos\Admin\JQAdm\Iface $client, array $templatePaths,
-		array $decorators, $classprefix )
+	protected function addDecorators(\Aimeos\Admin\JQAdm\Iface $client, array $templatePaths,
+		array $decorators, $classprefix)
 	{
 		$iface = '\\Aimeos\\Admin\\JQAdm\\Common\\Decorator\\Iface';
 
-		foreach( $decorators as $name )
+		foreach ($decorators as $name)
 		{
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
-				$classname = is_string( $name ) ? $classprefix . $name : '<not a string>';
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
+				$classname = is_string($name) ? $classprefix . $name : '<not a string>';
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Invalid class name "%1$s"', $classname));
 			}
 
 			$classname = $classprefix . $name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Class "%1$s" not found', $classname));
 			}
 
-			$client = new $classname( $client, $this->context, $this->templatePaths );
+			$client = new $classname($client, $this->context, $this->templatePaths);
 
-			if( !( $client instanceof $iface ) ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $iface ) );
+			if (!($client instanceof $iface)) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Class "%1$s" does not implement "%2$s"', $classname, $iface));
 			}
 		}
 
@@ -148,35 +148,35 @@ 
 	 * @param string $path Admin string in lower case, e.g. "catalog/detail/basic"
 	 * @return \Aimeos\Admin\JQAdm\Iface Admin object
 	 */
-	protected function addClientDecorators( \Aimeos\Admin\JQAdm\Iface $client, array $templatePaths, $path )
+	protected function addClientDecorators(\Aimeos\Admin\JQAdm\Iface $client, array $templatePaths, $path)
 	{
-		if( !is_string( $path ) || $path === '' ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Invalid domain "%1$s"', $path ) );
+		if (!is_string($path) || $path === '') {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Invalid domain "%1$s"', $path));
 		}
 
-		$localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) );
+		$localClass = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $path)));
 		$config = $this->context->getConfig();
 
-		$decorators = $config->get( 'admin/jqadm/common/decorators/default', array() );
-		$excludes = $config->get( 'admin/jqadm/' . $path . '/decorators/excludes', array() );
+		$decorators = $config->get('admin/jqadm/common/decorators/default', array());
+		$excludes = $config->get('admin/jqadm/' . $path . '/decorators/excludes', array());
 
-		foreach( $decorators as $key => $name )
+		foreach ($decorators as $key => $name)
 		{
-			if( in_array( $name, $excludes ) ) {
-				unset( $decorators[$key] );
+			if (in_array($name, $excludes)) {
+				unset($decorators[$key]);
 			}
 		}
 
 		$classprefix = '\\Aimeos\\Admin\\JQAdm\\Common\\Decorator\\';
-		$client = $this->addDecorators( $client, $templatePaths, $decorators, $classprefix );
+		$client = $this->addDecorators($client, $templatePaths, $decorators, $classprefix);
 
 		$classprefix = '\\Aimeos\\Admin\\JQAdm\\Common\\Decorator\\';
-		$decorators = $config->get( 'admin/jqadm/' . $path . '/decorators/global', array() );
-		$client = $this->addDecorators( $client, $templatePaths, $decorators, $classprefix );
+		$decorators = $config->get('admin/jqadm/' . $path . '/decorators/global', array());
+		$client = $this->addDecorators($client, $templatePaths, $decorators, $classprefix);
 
 		$classprefix = '\\Aimeos\\Admin\\JQAdm\\' . $localClass . '\\Decorator\\';
-		$decorators = $config->get( 'admin/jqadm/' . $path . '/decorators/local', array() );
-		$client = $this->addDecorators( $client, $templatePaths, $decorators, $classprefix );
+		$decorators = $config->get('admin/jqadm/' . $path . '/decorators/local', array());
+		$client = $this->addDecorators($client, $templatePaths, $decorators, $classprefix);
 
 		return $client;
 	}
@@ -189,35 +189,35 @@ 
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-part object
 	 */
-	protected function createSubClient( $path, $name )
+	protected function createSubClient($path, $name)
 	{
-		$path = strtolower( $path );
+		$path = strtolower($path);
 
-		if( $name === null ) {
-			$name = $this->context->getConfig()->get( 'admin/jqadm/' . $path . '/name', 'Standard' );
+		if ($name === null) {
+			$name = $this->context->getConfig()->get('admin/jqadm/' . $path . '/name', 'Standard');
 		}
 
-		if( empty( $name ) || ctype_alnum( $name ) === false ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Invalid characters in client name "%1$s"', $name ) );
+		if (empty($name) || ctype_alnum($name) === false) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Invalid characters in client name "%1$s"', $name));
 		}
 
-		$subnames = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) );
+		$subnames = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $path)));
 
 		$classname = '\\Aimeos\\Admin\\JQAdm\\' . $subnames . '\\' . $name;
 		$interface = '\\Aimeos\\Admin\\JQAdm\\Iface';
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Class "%1$s" not available', $classname));
 		}
 
-		$object = new $classname( $this->context, $this->templatePaths );
+		$object = new $classname($this->context, $this->templatePaths);
 
-		if( ( $object instanceof $interface ) === false ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $interface ) );
+		if (($object instanceof $interface) === false) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $interface));
 		}
 
-		$object = $this->addClientDecorators( $object, $this->templatePaths, $path );
-		$object->setView( $this->view );
+		$object = $this->addClientDecorators($object, $this->templatePaths, $path);
+		$object->setView($this->view);
 
 		return $object;
 	}
@@ -229,13 +229,13 @@ 
 	 * @param array $names List of parameter names
 	 * @return array Associative list of parameters names as key and their values
 	 */
-	protected function getClientParams( $names = array( 'resource', 'site', 'lang', 'fields', 'filter', 'page', 'sort' ) )
+	protected function getClientParams($names = array('resource', 'site', 'lang', 'fields', 'filter', 'page', 'sort'))
 	{
 		$list = array();
 
-		foreach( $names as $name )
+		foreach ($names as $name)
 		{
-			if( ( $val = $this->view->param( $name ) ) !== null ) {
+			if (($val = $this->view->param($name)) !== null) {
 				$list[$name] = $val;
 			}
 		}
@@ -270,12 +270,12 @@ 
 	 */
 	protected function getSubClients()
 	{
-		if( !isset( $this->subclients ) )
+		if (!isset($this->subclients))
 		{
 			$this->subclients = array();
 
-			foreach( $this->getSubClientNames() as $name ) {
-				$this->subclients[] = $this->getSubClient( $name );
+			foreach ($this->getSubClientNames() as $name) {
+				$this->subclients[] = $this->getSubClient($name);
 			}
 		}
 
@@ -301,11 +301,11 @@ 
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 * @return \Aimeos\MW\Criteria\Iface Initialized criteria object
 	 */
-	protected function initCriteria( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	protected function initCriteria(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		$this->initCriteriaConditions( $criteria, $params );
-		$this->initCriteriaSortations( $criteria, $params );
-		$this->initCriteriaSlice( $criteria, $params );
+		$this->initCriteriaConditions($criteria, $params);
+		$this->initCriteriaSortations($criteria, $params);
+		$this->initCriteriaSlice($criteria, $params);
 
 		return $criteria;
 	}
@@ -317,24 +317,24 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 */
-	private function initCriteriaConditions( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	private function initCriteriaConditions(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		if( isset( $params['filter'] ) && isset( $params['filter']['key'] ) )
+		if (isset($params['filter']) && isset($params['filter']['key']))
 		{
 			$expr = array();
 			$existing = $criteria->getConditions();
 
-			foreach( (array) $params['filter']['key'] as $idx => $key )
+			foreach ((array) $params['filter']['key'] as $idx => $key)
 			{
-				if( $key != '' && isset( $params['filter']['op'][$idx] ) && $params['filter']['op'][$idx] != ''
-					&& isset( $params['filter']['val'][$idx] )
+				if ($key != '' && isset($params['filter']['op'][$idx]) && $params['filter']['op'][$idx] != ''
+					&& isset($params['filter']['val'][$idx])
 				) {
-					$expr[] = $criteria->compare( $params['filter']['op'][$idx], $key, $params['filter']['val'][$idx] );
+					$expr[] = $criteria->compare($params['filter']['op'][$idx], $key, $params['filter']['val'][$idx]);
 				}
 			}
 
 			$expr[] = $existing;
-			$criteria->setConditions( $criteria->combine( '&&', $expr ) );
+			$criteria->setConditions($criteria->combine('&&', $expr));
 		}
 	}
 
@@ -345,12 +345,12 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 */
-	private function initCriteriaSlice( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	private function initCriteriaSlice(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		$start = ( isset( $params['page']['offset'] ) ? $params['page']['offset'] : 0 );
-		$size = ( isset( $params['page']['limit'] ) ? $params['page']['limit'] : 100 );
+		$start = (isset($params['page']['offset']) ? $params['page']['offset'] : 0);
+		$size = (isset($params['page']['limit']) ? $params['page']['limit'] : 100);
 
-		$criteria->setSlice( $start, $size );
+		$criteria->setSlice($start, $size);
 	}
 
 
@@ -360,23 +360,23 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 */
-	private function initCriteriaSortations( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	private function initCriteriaSortations(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		if( !isset( $params['sort'] ) ) {
+		if (!isset($params['sort'])) {
 			return;
 		}
 
 		$sortation = array();
 
-		foreach( (array) $params['sort'] as $sort )
+		foreach ((array) $params['sort'] as $sort)
 		{
-			if( $sort[0] === '-' ) {
-				$sortation[] = $criteria->sort( '-', substr( $sort, 1 ) );
+			if ($sort[0] === '-') {
+				$sortation[] = $criteria->sort('-', substr($sort, 1));
 			} else {
-				$sortation[] = $criteria->sort( '+', $sort ); break;
+				$sortation[] = $criteria->sort('+', $sort); break;
 			}
 		}
 
-		$criteria->setSortations( $sortation );
+		$criteria->setSortations($sortation);
 	}
 }