aimeos / ai-admin-jsonadm

admin/jsonadm/src/Admin/JsonAdm/Order/Base/Standard.php

Spacing +11 added lines, -11 removed lines

@@ -108,7 +108,7 @@ 
 	 * @param integer &$status Variable which contains the HTTP status afterwards
 	 * @return string Content for response body
 	 */
-	public function get( $body, array &$header, &$status )
+	public function get($body, array &$header, &$status)
 	{
 		/** admin/jsonadm/partials/order/base/template-data
 		 * Relative path to the data partial template file for the order base client
@@ -125,9 +125,9 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		$this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/order/base/template-data' ) );
+		$this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/order/base/template-data'));
 
-		return parent::get( $body, $header, $status );
+		return parent::get($body, $header, $status);
 	}
 
 
@@ -138,21 +138,21 @@ 
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface
 	 */
-	protected function getChildItems( array $items, array $include )
+	protected function getChildItems(array $items, array $include)
 	{
 		$list = array();
-		$ids = array_keys( $items );
-		$keys = array( 'order/base/address', 'order/base/coupon', 'order/base/product', 'order/base/service' );
-		$include = array_intersect( $include, $keys );
+		$ids = array_keys($items);
+		$keys = array('order/base/address', 'order/base/coupon', 'order/base/product', 'order/base/service');
+		$include = array_intersect($include, $keys);
 
-		foreach( $include as $type )
+		foreach ($include as $type)
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $type );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $type);
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.baseid', $ids ) );
+			$search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.baseid', $ids));
 
-			$list = array_merge( $list, $manager->searchItems( $search ) );
+			$list = array_merge($list, $manager->searchItems($search));
 		}
 
 		return $list;

admin/jsonadm/src/Admin/JsonAdm/Text/Standard.php

Spacing +6 added lines, -6 removed lines

@@ -107,17 +107,17 @@
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 */
-	protected function getListItems( array $items, array $include )
+	protected function getListItems(array $items, array $include)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'text/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'text/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'text.lists.parentid', array_keys( $items ) ),
-			$search->compare( '==', 'text.lists.domain', $include ),
+			$search->compare('==', 'text.lists.parentid', array_keys($items)),
+			$search->compare('==', 'text.lists.domain', $include),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

admin/jsonadm/src/Admin/JsonAdm/Price/Standard.php

Spacing +6 added lines, -6 removed lines

@@ -107,17 +107,17 @@
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 */
-	protected function getListItems( array $items, array $include )
+	protected function getListItems(array $items, array $include)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'price/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'price/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'price.lists.parentid', array_keys( $items ) ),
-			$search->compare( '==', 'price.lists.domain', $include ),
+			$search->compare('==', 'price.lists.parentid', array_keys($items)),
+			$search->compare('==', 'price.lists.domain', $include),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

admin/jsonadm/src/Admin/JsonAdm/Factory.php

Spacing +31 added lines, -31 removed lines

@@ -33,11 +33,11 @@ 
 	 * @param integer $id Context ID the objects have been created with (string of \Aimeos\MShop\Context\Item\Iface)
 	 * @param string $path Path describing the client to clear, e.g. "product/lists/type"
 	 */
-	static public function clear( $id = null, $path = null )
+	static public function clear($id = null, $path = null)
 	{
-		if( $id !== null )
+		if ($id !== null)
 		{
-			if( $path !== null ) {
+			if ($path !== null) {
 				self::$clients[$id][$path] = null;
 			} else {
 				self::$clients[$id] = array();
@@ -64,47 +64,47 @@ 
 	 * @param string|null $name Name of the client implementation ("Standard" if null)
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid
 	 */
-	static public function createClient( \Aimeos\MShop\Context\Item\Iface $context,
-		array $templatePaths, $path, $name = null )
+	static public function createClient(\Aimeos\MShop\Context\Item\Iface $context,
+		array $templatePaths, $path, $name = null)
 	{
-		$path = strtolower( trim( $path, "/ \n\t\r\0\x0B" ) );
+		$path = strtolower(trim($path, "/ \n\t\r\0\x0B"));
 
-		if( empty( $path ) ) {
-			return self::createClientRoot( $context, $context->getView(), $templatePaths, $path, $name );
+		if (empty($path)) {
+			return self::createClientRoot($context, $context->getView(), $templatePaths, $path, $name);
 		}
 
 		$id = (string) $context;
 
-		if( self::$cache === false || !isset( self::$clients[$id][$path] ) )
+		if (self::$cache === false || !isset(self::$clients[$id][$path]))
 		{
-			$parts = explode( '/', $path );
+			$parts = explode('/', $path);
 
-			foreach( $parts as $key => $part )
+			foreach ($parts as $key => $part)
 			{
-				if( ctype_alnum( $part ) === false )
+				if (ctype_alnum($part) === false)
 				{
-					$msg = sprintf( 'Invalid client "%1$s" in "%2$s"', $part, $path );
-					throw new \Aimeos\Admin\JsonAdm\Exception( $msg, 400 );
+					$msg = sprintf('Invalid client "%1$s" in "%2$s"', $part, $path);
+					throw new \Aimeos\Admin\JsonAdm\Exception($msg, 400);
 				}
 
-				$parts[$key] = ucwords( $part );
+				$parts[$key] = ucwords($part);
 			}
 
 
 			$view = $context->getView();
-			$factory = '\\Aimeos\\Admin\\JsonAdm\\' . join( '\\', $parts ) . '\\Factory';
+			$factory = '\\Aimeos\\Admin\\JsonAdm\\' . join('\\', $parts) . '\\Factory';
 
-			if( class_exists( $factory ) === true )
+			if (class_exists($factory) === true)
 			{
-				$args = array( $context, $view, $templatePaths, $path, $name );
+				$args = array($context, $view, $templatePaths, $path, $name);
 
-				if( ( $client = @call_user_func_array( array( $factory, 'createClient' ), $args ) ) === false ) {
-					throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid factory "%1$s"', $factory ), 400 );
+				if (($client = @call_user_func_array(array($factory, 'createClient'), $args)) === false) {
+					throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid factory "%1$s"', $factory), 400);
 				}
 			}
 			else
 			{
-				$client = self::createClientRoot( $context, $view, $templatePaths, $path, $name );
+				$client = self::createClientRoot($context, $view, $templatePaths, $path, $name);
 			}
 
 
@@ -121,7 +121,7 @@ 
 	 * @param boolean $value True to enable caching, false to disable it.
 	 * @return boolean Previous cache setting
 	 */
-	static public function setCache( $value )
+	static public function setCache($value)
 	{
 		$old = self::$cache;
 		self::$cache = (boolean) $value;
@@ -140,8 +140,8 @@ 
 	 * @param string|null $name Name of the JsonAdm client (default: "Standard")
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the client couldn't be created
 	 */
-	protected static function createClientRoot( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\MW\View\Iface $view, array $templatePaths, $path, $name = null )
+	protected static function createClientRoot(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\MW\View\Iface $view, array $templatePaths, $path, $name = null)
 	{
 		/** admin/jsonadm/name
 		 * Class name of the used JSON API client implementation
@@ -176,20 +176,20 @@ 
 		 * @since 2015.12
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'admin/jsonadm/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('admin/jsonadm/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>';
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>';
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Admin\\JsonAdm\\Iface';
 		$classname = '\\Aimeos\\Admin\\JsonAdm\\' . $name;
 
-		$client = self::createClientBase( $classname, $iface, $context, $view, $templatePaths, $path );
+		$client = self::createClientBase($classname, $iface, $context, $view, $templatePaths, $path);
 
 		/** admin/jsonadm/decorators/excludes
 		 * Excludes decorators added by the "common" option from the JSON API clients
@@ -269,6 +269,6 @@ 
 		 * @see admin/jsonadm/decorators/global
 		 */
 
-		return self::addClientDecorators( $client, $context, $view, $templatePaths, $path );
+		return self::addClientDecorators($client, $context, $view, $templatePaths, $path);
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -101,8 +101,7 @@
 				if( ( $client = @call_user_func_array( array( $factory, 'createClient' ), $args ) ) === false ) {
 					throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid factory "%1$s"', $factory ), 400 );
 				}
-			}
-			else
+			} else
 			{
 				$client = self::createClientRoot( $context, $view, $templatePaths, $path, $name );
 			}

admin/jsonadm/src/Admin/JsonAdm/Base.php

Spacing +176 added lines, -176 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param string $path Name of the client separated by slashes, e.g "product/stock"
 	 * @return void
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path)
 	{
 		$this->view = $view;
 		$this->context = $context;
@@ -51,73 +51,73 @@ 
 	 * @param integer &$status Variable which contains the HTTP status afterwards
 	 * @return string Content for response body
 	 */
-	public function delete( $body, array &$header, &$status )
+	public function delete($body, array &$header, &$status)
 	{
-		$header = array( 'Content-Type' => 'application/vnd.api+json; supported-ext="bulk"' );
+		$header = array('Content-Type' => 'application/vnd.api+json; supported-ext="bulk"');
 		$context = $this->getContext();
 		$view = $this->getView();
 
 		try
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $context, $this->getPath() );
+			$manager = \Aimeos\MShop\Factory::createManager($context, $this->getPath());
 
-			if( ( $id = $view->param( 'id' ) ) == null )
+			if (($id = $view->param('id')) == null)
 			{
-				if( ( $request = json_decode( $body ) ) === null || !isset( $request->data ) || !is_array( $request->data ) ) {
-					throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 );
+				if (($request = json_decode($body)) === null || !isset($request->data) || !is_array($request->data)) {
+					throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400);
 				}
 
 				$ids = array();
 
-				foreach( $request->data as $entry )
+				foreach ($request->data as $entry)
 				{
-					if( isset( $entry->id ) ) {
+					if (isset($entry->id)) {
 						$ids[] = $entry->id;
 					}
 				}
 
-				$manager->deleteItems( $ids );
-				$view->total = count( $ids );
+				$manager->deleteItems($ids);
+				$view->total = count($ids);
 			}
 			else
 			{
-				$manager->deleteItem( $id );
+				$manager->deleteItem($id);
 				$view->total = 1;
 			}
 
 			$status = 200;
 		}
-		catch( \Aimeos\Admin\JsonAdm\Exception $e )
+		catch (\Aimeos\Admin\JsonAdm\Exception $e)
 		{
 			$status = $e->getCode();
-			$view->errors = array( array(
-				'title' => $context->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('admin/jsonadm', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		catch (\Aimeos\MAdmin\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$status = 500;
-			$view->errors = array( array(
+			$view->errors = array(array(
 				'title' => $e->getMessage(),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
 
 		/** admin/jsonadm/standard/template-delete
@@ -147,7 +147,7 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-delete';
 		$default = 'delete-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -159,60 +159,60 @@ 
 	 * @param integer &$status Variable which contains the HTTP status afterwards
 	 * @return string Content for response body
 	 */
-	public function get( $body, array &$header, &$status )
+	public function get($body, array &$header, &$status)
 	{
-		$header = array( 'Content-Type' => 'application/vnd.api+json; supported-ext="bulk"' );
+		$header = array('Content-Type' => 'application/vnd.api+json; supported-ext="bulk"');
 		$context = $this->getContext();
 		$view = $this->getView();
 		$total = 1;
 
 		try
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $context, $this->getPath() );
-			$include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : array() );
+			$manager = \Aimeos\MShop\Factory::createManager($context, $this->getPath());
+			$include = (($include = $view->param('include')) !== null ? explode(',', $include) : array());
 
-			if( ( $id = $view->param( 'id' ) ) == null )
+			if (($id = $view->param('id')) == null)
 			{
-				$search = $this->initCriteria( $manager->createSearch(), $view->param() );
-				$view->data = $manager->searchItems( $search, array(), $total );
-				$view->childItems = $this->getChildItems( $view->data, $include );
-				$view->listItems = $this->getListItems( $view->data, $include );
+				$search = $this->initCriteria($manager->createSearch(), $view->param());
+				$view->data = $manager->searchItems($search, array(), $total);
+				$view->childItems = $this->getChildItems($view->data, $include);
+				$view->listItems = $this->getListItems($view->data, $include);
 			}
 			else
 			{
-				$view->data = $manager->getItem( $id, array() );
-				$view->childItems = $this->getChildItems( array( $id => $view->data ), $include );
-				$view->listItems = $this->getListItems( array( $id => $view->data ), $include );
+				$view->data = $manager->getItem($id, array());
+				$view->childItems = $this->getChildItems(array($id => $view->data), $include);
+				$view->listItems = $this->getListItems(array($id => $view->data), $include);
 			}
 
-			$view->refItems = $this->getRefItems( $view->listItems );
+			$view->refItems = $this->getRefItems($view->listItems);
 
 			$view->total = $total;
 			$status = 200;
 		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		catch (\Aimeos\MAdmin\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$status = 500;
-			$view->errors = array( array(
+			$view->errors = array(array(
 				'title' => $e->getMessage(),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
 
 		/** admin/jsonadm/standard/template-get
@@ -242,7 +242,7 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-get';
 		$default = 'get-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -254,54 +254,54 @@ 
 	 * @param integer &$status Variable which contains the HTTP status afterwards
 	 * @return string Content for response body
 	 */
-	public function patch( $body, array &$header, &$status )
+	public function patch($body, array &$header, &$status)
 	{
-		$header = array( 'Content-Type' => 'application/vnd.api+json; supported-ext="bulk"' );
+		$header = array('Content-Type' => 'application/vnd.api+json; supported-ext="bulk"');
 		$context = $this->getContext();
 		$view = $this->getView();
 
 		try
 		{
-			if( ( $request = json_decode( $body ) ) === null || !isset( $request->data ) ) {
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 );
+			if (($request = json_decode($body)) === null || !isset($request->data)) {
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400);
 			}
 
 			$data = null;
-			$manager = \Aimeos\MShop\Factory::createManager( $context, $this->getPath() );
+			$manager = \Aimeos\MShop\Factory::createManager($context, $this->getPath());
 
-			if( is_array( $request->data ) )
+			if (is_array($request->data))
 			{
 				$data = array();
 
-				foreach( $request->data as $entry )
+				foreach ($request->data as $entry)
 				{
-					if( isset( $entry->attributes ) && isset( $entry->id ) )
+					if (isset($entry->attributes) && isset($entry->id))
 					{
-						$item = $manager->getItem( $entry->id );
-						$item->fromArray( (array) $entry->attributes );
+						$item = $manager->getItem($entry->id);
+						$item->fromArray((array) $entry->attributes);
 
-						$manager->saveItem( $item );
-						$data[] = $manager->getItem( $entry->id );
+						$manager->saveItem($item);
+						$data[] = $manager->getItem($entry->id);
 					}
 				}
 
 				$view->data = $data;
-				$view->total = count( $data );
+				$view->total = count($data);
 				$header['Content-Type'] = 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"';
 			}
 			else
 			{
-				if( ( $id = $view->param( 'id' ) ) == null ) {
-					throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 );
+				if (($id = $view->param('id')) == null) {
+					throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400);
 				}
 
-				if( isset( $request->data->attributes ) )
+				if (isset($request->data->attributes))
 				{
-					$item = $manager->getItem( $id );
-					$item->fromArray( (array) $request->data->attributes );
+					$item = $manager->getItem($id);
+					$item->fromArray((array) $request->data->attributes);
 
-					$manager->saveItem( $item );
-					$data = $manager->getItem( $id );
+					$manager->saveItem($item);
+					$data = $manager->getItem($id);
 				}
 
 				$view->data = $data;
@@ -310,37 +310,37 @@ 
 
 			$status = 200;
 		}
-		catch( \Aimeos\Admin\JsonAdm\Exception $e )
+		catch (\Aimeos\Admin\JsonAdm\Exception $e)
 		{
 			$status = $e->getCode();
-			$view->errors = array( array(
-				'title' => $context->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('admin/jsonadm', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		catch (\Aimeos\MAdmin\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Aimeos\MW\Exception $e )
+		catch (\Aimeos\MW\Exception $e)
 		{
 			$status = 500;
-			$view->errors = array( array(
+			$view->errors = array(array(
 				'title' => $e->getMessage(),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
 
 		/** admin/jsonadm/standard/template-patch
@@ -370,7 +370,7 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-patch';
 		$default = 'patch-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -382,54 +382,54 @@ 
 	 * @param integer &$status Variable which contains the HTTP status afterwards
 	 * @return string Content for response body
 	 */
-	public function post( $body, array &$header, &$status )
+	public function post($body, array &$header, &$status)
 	{
-		$header = array( 'Content-Type' => 'application/vnd.api+json; supported-ext="bulk"' );
+		$header = array('Content-Type' => 'application/vnd.api+json; supported-ext="bulk"');
 		$context = $this->getContext();
 		$view = $this->getView();
 
 		try
 		{
-			if( ( $request = json_decode( $body ) ) === null || !isset( $request->data ) ) {
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 );
+			if (($request = json_decode($body)) === null || !isset($request->data)) {
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400);
 			}
 
-			if( isset( $request->data->id ) || $view->param( 'id' ) != null ) {
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Client generated IDs are not supported' ), 403 );
+			if (isset($request->data->id) || $view->param('id') != null) {
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Client generated IDs are not supported'), 403);
 			}
 
 			$data = null;
-			$manager = \Aimeos\MShop\Factory::createManager( $context, $this->getPath() );
+			$manager = \Aimeos\MShop\Factory::createManager($context, $this->getPath());
 
-			if( is_array( $request->data ) )
+			if (is_array($request->data))
 			{
 				$data = array();
 
-				foreach( $request->data as $entry )
+				foreach ($request->data as $entry)
 				{
-					if( isset( $entry->attributes ) )
+					if (isset($entry->attributes))
 					{
 						$item = $manager->createItem();
-						$item->fromArray( (array) $entry->attributes );
+						$item->fromArray((array) $entry->attributes);
 
-						$manager->saveItem( $item );
-						$data[] = $manager->getItem( $item->getId() );
+						$manager->saveItem($item);
+						$data[] = $manager->getItem($item->getId());
 					}
 				}
 
 				$view->data = $data;
-				$view->total = count( $data );
+				$view->total = count($data);
 				$header['Content-Type'] = 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"';
 			}
 			else
 			{
-				if( isset( $request->data->attributes ) )
+				if (isset($request->data->attributes))
 				{
 					$item = $manager->createItem();
-					$item->fromArray( (array) $request->data->attributes );
+					$item->fromArray((array) $request->data->attributes);
 
-					$manager->saveItem( $item );
-					$data = $manager->getItem( $item->getId() );
+					$manager->saveItem($item);
+					$data = $manager->getItem($item->getId());
 				}
 
 				$view->data = $data;
@@ -438,37 +438,37 @@ 
 
 			$status = 201;
 		}
-		catch( \Aimeos\Admin\JsonAdm\Exception $e )
+		catch (\Aimeos\Admin\JsonAdm\Exception $e)
 		{
 			$status = $e->getCode();
-			$view->errors = array( array(
-				'title' => $context->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('admin/jsonadm', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		catch (\Aimeos\MAdmin\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$status = 500;
-			$view->errors = array( array(
+			$view->errors = array(array(
 				'title' => $e->getMessage(),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
 
 		/** admin/jsonadm/standard/template-post
@@ -498,7 +498,7 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-post';
 		$default = 'post-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -510,17 +510,17 @@ 
 	 * @param integer &$status Variable which contains the HTTP status afterwards
 	 * @return string Content for response body
 	 */
-	public function put( $body, array &$header, &$status )
+	public function put($body, array &$header, &$status)
 	{
-		$header = array( 'Content-Type' => 'application/vnd.api+json; supported-ext="bulk"' );
+		$header = array('Content-Type' => 'application/vnd.api+json; supported-ext="bulk"');
 		$status = 501;
 
 		$context = $this->getContext();
 		$view = $this->getView();
 
-		$view->errors = array( array(
-			'title' => $context->getI18n()->dt( 'admin/jsonadm', 'Not implemented, use PATCH instead' ),
-		) );
+		$view->errors = array(array(
+			'title' => $context->getI18n()->dt('admin/jsonadm', 'Not implemented, use PATCH instead'),
+		));
 
 		/** admin/jsonadm/standard/template-put
 		 * Relative path to the JSON API template for PUT requests
@@ -549,7 +549,7 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-put';
 		$default = 'put-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -561,7 +561,7 @@ 
 	 * @param integer &$status Variable which contains the HTTP status afterwards
 	 * @return string Content for response body
 	 */
-	public function options( $body, array &$header, &$status )
+	public function options($body, array &$header, &$status)
 	{
 		$context = $this->getContext();
 		$view = $this->getView();
@@ -570,7 +570,7 @@ 
 		{
 			$resources = $attributes = array();
 
-			if( ( $domains = $view->param( 'resource' ) ) == '' )
+			if (($domains = $view->param('resource')) == '')
 			{
 				/** admin/jsonadm/domains
 				 * A list of domain names whose clients are available for the JSON API
@@ -592,14 +592,14 @@ 
 					'attribute', 'catalog', 'coupon', 'customer', 'locale', 'media',
 					'order', 'plugin', 'price', 'product', 'service', 'supplier', 'tag', 'text'
 				);
-				$domains = $context->getConfig()->get( 'admin/jsonadm/domains', $default );
+				$domains = $context->getConfig()->get('admin/jsonadm/domains', $default);
 			}
 
-			foreach( (array) $domains as $domain )
+			foreach ((array) $domains as $domain)
 			{
-				$manager = \Aimeos\MShop\Factory::createManager( $context, $domain );
-				$resources = array_merge( $resources, $manager->getResourceType( true ) );
-				$attributes = array_merge( $attributes, $manager->getSearchAttributes( true ) );
+				$manager = \Aimeos\MShop\Factory::createManager($context, $domain);
+				$resources = array_merge($resources, $manager->getResourceType(true));
+				$attributes = array_merge($attributes, $manager->getSearchAttributes(true));
 			}
 
 			$view->resources = $resources;
@@ -611,29 +611,29 @@ 
 			);
 			$status = 200;
 		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		catch (\Aimeos\MAdmin\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$status = 500;
-			$view->errors = array( array(
+			$view->errors = array(array(
 				'title' => $e->getMessage(),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
 
 		/** admin/jsonadm/standard/template-options
@@ -663,7 +663,7 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-options';
 		$default = 'options-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -685,11 +685,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;
 	}
@@ -701,15 +701,15 @@ 
 	 * @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'] ) && is_array( $params['filter'] ) )
+		if (isset($params['filter']) && is_array($params['filter']))
 		{
 			$existing = $criteria->getConditions();
-			$criteria->setConditions( $criteria->toConditions( (array) $params['filter'] ) );
+			$criteria->setConditions($criteria->toConditions((array) $params['filter']));
 
-			$expr = array( $criteria->getConditions(), $existing );
-			$criteria->setConditions( $criteria->combine( '&&', $expr ) );
+			$expr = array($criteria->getConditions(), $existing);
+			$criteria->setConditions($criteria->combine('&&', $expr));
 		}
 	}
 
@@ -720,12 +720,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'] : 25 );
+		$start = (isset($params['page']['offset']) ? $params['page']['offset'] : 0);
+		$size = (isset($params['page']['limit']) ? $params['page']['limit'] : 25);
 
-		$criteria->setSlice( $start, $size );
+		$criteria->setSlice($start, $size);
 	}
 
 
@@ -735,24 +735,24 @@ 
 	 * @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( explode( ',', $params['sort'] ) as $sort )
+		foreach (explode(',', $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);
 	}
 
 
@@ -763,7 +763,7 @@ 
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface
 	 */
-	protected function getChildItems( array $items, array $include )
+	protected function getChildItems(array $items, array $include)
 	{
 		return array();
 	}
@@ -776,7 +776,7 @@ 
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 */
-	protected function getListItems( array $items, array $include )
+	protected function getListItems(array $items, array $include)
 	{
 		return array();
 	}
@@ -788,22 +788,22 @@ 
 	 * @param array $items List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface
 	 */
-	protected function getRefItems( array $listItems )
+	protected function getRefItems(array $listItems)
 	{
 		$list = $map = array();
 
-		foreach( $listItems as $listItem ) {
+		foreach ($listItems as $listItem) {
 			$map[$listItem->getDomain()][] = $listItem->getRefId();
 		}
 
-		foreach( $map as $domain => $ids )
+		foreach ($map as $domain => $ids)
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $domain );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $domain);
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', $domain . '.id', $ids ) );
+			$search->setConditions($search->compare('==', $domain . '.id', $ids));
 
-			$list = array_merge( $list, $manager->searchItems( $search ) );
+			$list = array_merge($list, $manager->searchItems($search));
 		}
 
 		return $list;

Braces +22 added lines, -44 removed lines

@@ -78,40 +78,35 @@ 
 
 				$manager->deleteItems( $ids );
 				$view->total = count( $ids );
-			}
-			else
+			} else
 			{
 				$manager->deleteItem( $id );
 				$view->total = 1;
 			}
 
 			$status = 200;
-		}
-		catch( \Aimeos\Admin\JsonAdm\Exception $e )
+		} catch( \Aimeos\Admin\JsonAdm\Exception $e )
 		{
 			$status = $e->getCode();
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		} catch( \Aimeos\MAdmin\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(
@@ -177,8 +172,7 @@ 
 				$view->data = $manager->searchItems( $search, array(), $total );
 				$view->childItems = $this->getChildItems( $view->data, $include );
 				$view->listItems = $this->getListItems( $view->data, $include );
-			}
-			else
+			} else
 			{
 				$view->data = $manager->getItem( $id, array() );
 				$view->childItems = $this->getChildItems( array( $id => $view->data ), $include );
@@ -189,24 +183,21 @@ 
 
 			$view->total = $total;
 			$status = 200;
-		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		} catch( \Aimeos\MAdmin\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(
@@ -288,8 +279,7 @@ 
 				$view->data = $data;
 				$view->total = count( $data );
 				$header['Content-Type'] = 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"';
-			}
-			else
+			} else
 			{
 				if( ( $id = $view->param( 'id' ) ) == null ) {
 					throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 );
@@ -309,32 +299,28 @@ 
 			}
 
 			$status = 200;
-		}
-		catch( \Aimeos\Admin\JsonAdm\Exception $e )
+		} catch( \Aimeos\Admin\JsonAdm\Exception $e )
 		{
 			$status = $e->getCode();
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		} catch( \Aimeos\MAdmin\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Aimeos\MW\Exception $e )
+		} catch( \Aimeos\MW\Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(
@@ -420,8 +406,7 @@ 
 				$view->data = $data;
 				$view->total = count( $data );
 				$header['Content-Type'] = 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"';
-			}
-			else
+			} else
 			{
 				if( isset( $request->data->attributes ) )
 				{
@@ -437,32 +422,28 @@ 
 			}
 
 			$status = 201;
-		}
-		catch( \Aimeos\Admin\JsonAdm\Exception $e )
+		} catch( \Aimeos\Admin\JsonAdm\Exception $e )
 		{
 			$status = $e->getCode();
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		} catch( \Aimeos\MAdmin\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(
@@ -610,24 +591,21 @@ 
 				'Allow' => 'DELETE,GET,POST,OPTIONS'
 			);
 			$status = 200;
-		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		} catch( \Aimeos\MAdmin\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(

Doc Comments +5 added lines

@@ -49,6 +49,7 @@ 
 	 * @param string $body Request body
 	 * @param array &$header Variable which contains the HTTP headers and the new ones afterwards
 	 * @param integer &$status Variable which contains the HTTP status afterwards
+	 * @param integer $status
 	 * @return string Content for response body
 	 */
 	public function delete( $body, array &$header, &$status )
@@ -252,6 +253,7 @@ 
 	 * @param string $body Request body
 	 * @param array &$header Variable which contains the HTTP headers and the new ones afterwards
 	 * @param integer &$status Variable which contains the HTTP status afterwards
+	 * @param integer $status
 	 * @return string Content for response body
 	 */
 	public function patch( $body, array &$header, &$status )
@@ -380,6 +382,7 @@ 
 	 * @param string $body Request body
 	 * @param array &$header Variable which contains the HTTP headers and the new ones afterwards
 	 * @param integer &$status Variable which contains the HTTP status afterwards
+	 * @param integer $status
 	 * @return string Content for response body
 	 */
 	public function post( $body, array &$header, &$status )
@@ -508,6 +511,7 @@ 
 	 * @param string $body Request body
 	 * @param array &$header Variable which contains the HTTP headers and the new ones afterwards
 	 * @param integer &$status Variable which contains the HTTP status afterwards
+	 * @param integer $status
 	 * @return string Content for response body
 	 */
 	public function put( $body, array &$header, &$status )
@@ -559,6 +563,7 @@ 
 	 * @param string $body Request body
 	 * @param array &$header Variable which contains the HTTP headers and the new ones afterwards
 	 * @param integer &$status Variable which contains the HTTP status afterwards
+	 * @param integer $status
 	 * @return string Content for response body
 	 */
 	public function options( $body, array &$header, &$status )

admin/jsonadm/src/Admin/JsonAdm/Attribute/Standard.php

Spacing +6 added lines, -6 removed lines

@@ -107,17 +107,17 @@
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 */
-	protected function getListItems( array $items, array $include )
+	protected function getListItems(array $items, array $include)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.lists.parentid', array_keys( $items ) ),
-			$search->compare( '==', 'attribute.lists.domain', $include ),
+			$search->compare('==', 'attribute.lists.parentid', array_keys($items)),
+			$search->compare('==', 'attribute.lists.domain', $include),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

admin/jsonadm/src/Admin/JsonAdm/Service/Standard.php

Spacing +6 added lines, -6 removed lines

@@ -107,17 +107,17 @@
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 */
-	protected function getListItems( array $items, array $include )
+	protected function getListItems(array $items, array $include)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'service.lists.parentid', array_keys( $items ) ),
-			$search->compare( '==', 'service.lists.domain', $include ),
+			$search->compare('==', 'service.lists.parentid', array_keys($items)),
+			$search->compare('==', 'service.lists.domain', $include),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

admin/jsonadm/src/Admin/JsonAdm/Media/Standard.php

Spacing +6 added lines, -6 removed lines

@@ -107,17 +107,17 @@
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 */
-	protected function getListItems( array $items, array $include )
+	protected function getListItems(array $items, array $include)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'media.lists.parentid', array_keys( $items ) ),
-			$search->compare( '==', 'media.lists.domain', $include ),
+			$search->compare('==', 'media.lists.parentid', array_keys($items)),
+			$search->compare('==', 'media.lists.domain', $include),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

admin/jsonadm/src/MW/View/Helper/Jsonadmlinks/Standard.php

Spacing +23 added lines, -23 removed lines

@@ -33,15 +33,15 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers
 	 */
-	public function __construct( \Aimeos\MW\View\Iface $view )
+	public function __construct(\Aimeos\MW\View\Iface $view)
 	{
-		parent::__construct( $view );
+		parent::__construct($view);
 
-		$this->target = $this->config( 'admin/jsonadm/url/target' );
-		$this->cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' );
-		$this->action = $this->config( 'admin/jsonadm/url/action', 'get' );
-		$this->config = $this->config( 'admin/jsonadm/url/config', array() );
-		$this->maxlimit = $this->config( 'admin/jsonadm/limit', 100 );
+		$this->target = $this->config('admin/jsonadm/url/target');
+		$this->cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm');
+		$this->action = $this->config('admin/jsonadm/url/action', 'get');
+		$this->config = $this->config('admin/jsonadm/url/config', array());
+		$this->maxlimit = $this->config('admin/jsonadm/limit', 100);
 	}
 
 
@@ -52,46 +52,46 @@ 
 	 * @param integer $total Total number of items
 	 * @return array List of pagination links
 	 */
-	public function transform( array $params, $total )
+	public function transform(array $params, $total)
 	{
-		$ref = array( 'id', 'resource', 'filter', 'page', 'sort', 'include', 'fields' );
-		$params = array_intersect_key( $params, array_flip( $ref ) );
+		$ref = array('id', 'resource', 'filter', 'page', 'sort', 'include', 'fields');
+		$params = array_intersect_key($params, array_flip($ref));
 
 		// set explicitly as workaround for the Laravel router bugs
-		if( !isset( $params['id'] ) ) {
+		if (!isset($params['id'])) {
 			$params['id'] = '';
 		}
 
-		$total = $this->get( 'total', 0 );
-		$offset = ( isset( $params['offset'] ) ? max( (int) $params['offset'], 0 ) : 0 );
-		$limit = ( isset( $params['limit'] ) ? max( (int) $params['limit'], 1 ) : $this->maxlimit );
+		$total = $this->get('total', 0);
+		$offset = (isset($params['offset']) ? max((int) $params['offset'], 0) : 0);
+		$limit = (isset($params['limit']) ? max((int) $params['limit'], 1) : $this->maxlimit);
 
-		if( $offset > 0 )
+		if ($offset > 0)
 		{
 			$params['page']['offset'] = 0;
-			$list['first'] = $this->url( $this->target, $this->cntl, $this->action, $params, array(), $this->config );
+			$list['first'] = $this->url($this->target, $this->cntl, $this->action, $params, array(), $this->config);
 		}
 
-		if( ( $num = $offset - $limit ) >= 0 )
+		if (($num = $offset - $limit) >= 0)
 		{
 			$params['page']['offset'] = $num;
-			$list['prev'] = $this->url( $this->target, $this->cntl, $this->action, $params, array(), $this->config );
+			$list['prev'] = $this->url($this->target, $this->cntl, $this->action, $params, array(), $this->config);
 		}
 
-		if( ( $num = $offset + $limit ) < $total )
+		if (($num = $offset + $limit) < $total)
 		{
 			$params['page']['offset'] = $num;
-			$list['next'] = $this->url( $this->target, $this->cntl, $this->action, $params, array(), $this->config );
+			$list['next'] = $this->url($this->target, $this->cntl, $this->action, $params, array(), $this->config);
 		}
 
-		if( ( $num = ((int) ($total / $limit)) * $limit ) > $offset )
+		if (($num = ((int) ($total / $limit)) * $limit) > $offset)
 		{
 			$params['page']['offset'] = $num;
-			$list['last'] = $this->url( $this->target, $this->cntl, $this->action, $params, array(), $this->config );
+			$list['last'] = $this->url($this->target, $this->cntl, $this->action, $params, array(), $this->config);
 		}
 
 		$params['page']['offset'] = $offset;
-		$list['self'] = $this->url( $this->target, $this->cntl, $this->action, $params, array(), $this->config );
+		$list['self'] = $this->url($this->target, $this->cntl, $this->action, $params, array(), $this->config);
 
 		return $list;
 	}