aimeos / ai-client-jsonapi

client/jsonapi/src/Client/JsonApi/Stock/Factory.php

Spacing +11 added lines, -11 removed lines

@@ -31,12 +31,12 @@ 
 	 * @return \Aimeos\Client\JsonApi\Iface JSON API client
 	 * @throws \Aimeos\Client\JsonApi\Exception If requested client implementation couldn't be found or initialisation fails
 	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $path, $name = null )
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $path, $name = null)
 	{
-		if( ctype_alnum( $path ) === false )
+		if (ctype_alnum($path) === false)
 		{
-			$path = ( is_string( $path ) ? $path : '<not a string>' );
-			throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Invalid client "%1$s"', $path ), 400 );
+			$path = (is_string($path) ? $path : '<not a string>');
+			throw new \Aimeos\Client\JsonApi\Exception(sprintf('Invalid client "%1$s"', $path), 400);
 		}
 
 		/** client/jsonapi/stock/name
@@ -72,23 +72,23 @@ 
 		 * @since 2017.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/jsonapi/stock/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('client/jsonapi/stock/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\JsonApi\\Stock\\' . $name : '<not a string>';
-			throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Client\\JsonApi\\Stock\\' . $name : '<not a string>';
+			throw new \Aimeos\Client\JsonApi\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$view = $context->getView();
 		$iface = '\\Aimeos\\Client\\JsonApi\\Iface';
 		$classname = '\\Aimeos\\Client\\JsonApi\\Stock\\' . $name;
 
-		$client = self::createClientBase( $classname, $iface, $context, $view, $templatePaths, $path );
+		$client = self::createClientBase($classname, $iface, $context, $view, $templatePaths, $path);
 
-		return self::addClientDecorators( $client, $context, $view, $templatePaths, $path );
+		return self::addClientDecorators($client, $context, $view, $templatePaths, $path);
 	}
 
 }

client/jsonapi/src/Client/JsonApi/Product/Standard.php

Spacing +81 added lines, -81 removed lines

@@ -31,40 +31,40 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function get( ServerRequestInterface $request, ResponseInterface $response )
+	public function get(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$view = $this->getView();
 
 		try
 		{
-			if( $view->param( 'aggregate' ) != '' ) {
-				$response = $this->aggregate( $view, $request, $response );
-			} elseif( $view->param( 'id' ) != '' ) {
-				$response = $this->getItem( $view, $request, $response );
+			if ($view->param('aggregate') != '') {
+				$response = $this->aggregate($view, $request, $response);
+			} elseif ($view->param('id') != '') {
+				$response = $this->getItem($view, $request, $response);
 			} else {
-				$response = $this->getItems( $view, $request, $response );
+				$response = $this->getItems($view, $request, $response);
 			}
 
 			$status = 200;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $this->getContext()->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(),
-			) );
+			));
 		}
 
-		if( $view->param( 'aggregate' ) != '' )
+		if ($view->param('aggregate') != '')
 		{
 			/** client/jsonapi/product/standard/template-aggregate
 			 * Relative path to the product aggregate JSON API template
@@ -113,12 +113,12 @@ 
 			$default = 'product/get-default.php';
 		}
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Allow', 'GET' )
-			->withHeader( 'Content-Type', 'application/vnd.api+json' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Allow', 'GET')
+			->withHeader('Content-Type', 'application/vnd.api+json')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 
 
@@ -130,16 +130,16 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function aggregate( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function aggregate(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
-		$key = $view->param( 'aggregate' );
-		$size = $view->param( 'page/limit', 10000 );
-		$start = $view->param( 'page/offset', 0 );
+		$key = $view->param('aggregate');
+		$size = $view->param('page/limit', 10000);
+		$start = $view->param('page/offset', 0);
 
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
-		$filter = $this->getFilter( $view, null, '+', $start, $size );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
+		$filter = $this->getFilter($view, null, '+', $start, $size);
 
-		$view->data = $cntl->aggregate( $filter, $key );
+		$view->data = $cntl->aggregate($filter, $key);
 
 		return $response;
 	}
@@ -153,25 +153,25 @@ 
 	 * @param string $domain Domain name of the items that should be returned
 	 * @return \Aimeos\MShop\Attribute\Item\Iface[] Associative list of attribute IDs as keys and attribute items as values
 	 */
-	protected function getDomainItems( array $productItems, array $ref, $domain )
+	protected function getDomainItems(array $productItems, array $ref, $domain)
 	{
 		$ids = array();
 
-		foreach( $productItems as $item ) {
-			$ids = array_merge( $ids, array_keys( $item->getRefItems( $domain ) ) );
+		foreach ($productItems as $item) {
+			$ids = array_merge($ids, array_keys($item->getRefItems($domain)));
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $domain );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $domain);
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', $domain . '.id', $ids ),
+			$search->compare('==', $domain . '.id', $ids),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0x7fffffff);
 
-		return $manager->searchItems( $search, $ref );
+		return $manager->searchItems($search, $ref);
 	}
 
 
@@ -185,20 +185,20 @@ 
 	 * @param integer $size Slize size
 	 * @return \Aimeos\MW\Criteria\Iface Initialize search filter
 	 */
-	protected function getFilter( \Aimeos\MW\View\Iface $view, $sort, $direction, $start, $size )
+	protected function getFilter(\Aimeos\MW\View\Iface $view, $sort, $direction, $start, $size)
 	{
-		$listtype = $view->param( 'filter/f_listtype', 'default' );
-		$attrIds = $view->param( 'filter/f_attrid', array() );
-		$optIds = $view->param( 'filter/f_optid', array() );
-		$oneIds = $view->param( 'filter/f_oneid', array() );
+		$listtype = $view->param('filter/f_listtype', 'default');
+		$attrIds = $view->param('filter/f_attrid', array());
+		$optIds = $view->param('filter/f_optid', array());
+		$oneIds = $view->param('filter/f_oneid', array());
 
 		$context = $this->getContext();
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'product' );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($context, 'product');
 
-		$filter = $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
-		$filter = $cntl->addFilterAttribute( $filter, $attrIds, $optIds, $oneIds );
+		$filter = $cntl->createFilter($sort, $direction, $start, $size, $listtype);
+		$filter = $cntl->addFilterAttribute($filter, $attrIds, $optIds, $oneIds);
 
-		if( ( $catid = $view->param( 'filter/f_catid' ) ) !== null )
+		if (($catid = $view->param('filter/f_catid')) !== null)
 		{
 			$default = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE;
 
@@ -228,19 +228,19 @@ 
 			 * @since 2017.03
 			 * @category Developer
 			 */
-			$level = $context->getConfig()->get( 'client/jsonapi/product/levels', $default );
+			$level = $context->getConfig()->get('client/jsonapi/product/levels', $default);
 
-			$filter = $cntl->addFilterCategory( $filter, $catid, $level, $sort, $direction, $listtype );
+			$filter = $cntl->addFilterCategory($filter, $catid, $level, $sort, $direction, $listtype);
 		}
 
-		if( ( $search = $view->param( 'filter/f_search' ) ) !== null ) {
-			$filter = $cntl->addFilterText( $filter, $search, $sort, $direction, $listtype );
+		if (($search = $view->param('filter/f_search')) !== null) {
+			$filter = $cntl->addFilterText($filter, $search, $sort, $direction, $listtype);
 		}
 
-		$params = $view->param( 'filter', [] );
-		unset( $params['f_attrid'], $params['f_optid'], $params['f_oneid'] );
-		unset( $params['f_listtype'], $params['f_catid'], $params['f_search'] );
-		$filter = $this->initCriteriaConditions( $filter, ['filter' => $params] );
+		$params = $view->param('filter', []);
+		unset($params['f_attrid'], $params['f_optid'], $params['f_oneid']);
+		unset($params['f_listtype'], $params['f_catid'], $params['f_search']);
+		$filter = $this->initCriteriaConditions($filter, ['filter' => $params]);
 
 		return $filter;
 	}
@@ -254,28 +254,28 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function getItem( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function getItem(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$map = array();
-		$ref = $view->param( 'include', array() );
+		$ref = $view->param('include', array());
 
-		if( is_string( $ref ) ) {
-			$ref = explode( ',', $ref );
+		if (is_string($ref)) {
+			$ref = explode(',', $ref);
 		}
 
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
 
-		$view->items = $cntl->getItem( $view->param( 'id' ), $ref );
+		$view->items = $cntl->getItem($view->param('id'), $ref);
 		$view->total = 1;
 
-		if( in_array( 'product', $ref, true ) ) {
-			$map['product'] = $this->getDomainItems( array( $view->items ), $ref, 'product' );
+		if (in_array('product', $ref, true)) {
+			$map['product'] = $this->getDomainItems(array($view->items), $ref, 'product');
 		}
 
-		if( in_array( 'attribute', $ref, true ) )
+		if (in_array('attribute', $ref, true))
 		{
-			$productItems = ( isset( $map['product'] ) ? array_merge( array( $view->items ), $map['product'] ) : array() );
-			$map['attribute'] = $this->getDomainItems( $productItems, $ref, 'attribute' );
+			$productItems = (isset($map['product']) ? array_merge(array($view->items), $map['product']) : array());
+			$map['attribute'] = $this->getDomainItems($productItems, $ref, 'attribute');
 		}
 
 		$view->itemMap = $map;
@@ -292,41 +292,41 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$total = 0;
 		$map = array();
-		$direction  = '+';
+		$direction = '+';
 
-		$ref = $view->param( 'include', array() );
-		$size = $view->param( 'page/limit', 48 );
-		$start = $view->param( 'page/offset', 0 );
-		$sort = $view->param( 'sort', 'relevance' );
+		$ref = $view->param('include', array());
+		$size = $view->param('page/limit', 48);
+		$start = $view->param('page/offset', 0);
+		$sort = $view->param('sort', 'relevance');
 
-		if( is_string( $ref ) ) {
-			$ref = explode( ',', $ref );
+		if (is_string($ref)) {
+			$ref = explode(',', $ref);
 		}
 
-		if( $sort[0] === '-' )
+		if ($sort[0] === '-')
 		{
-			$sort = substr( $sort, 1 );
+			$sort = substr($sort, 1);
 			$direction = '-';
 		}
 
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
-		$filter = $this->getFilter( $view, $sort, $direction, $start, $size );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
+		$filter = $this->getFilter($view, $sort, $direction, $start, $size);
 
-		$view->items = $cntl->searchItems( $filter, $ref, $total );
+		$view->items = $cntl->searchItems($filter, $ref, $total);
 		$view->total = $total;
 
-		if( in_array( 'product', $ref, true ) ) {
-			$map['product'] = $this->getDomainItems( $view->items, $ref, 'product' );
+		if (in_array('product', $ref, true)) {
+			$map['product'] = $this->getDomainItems($view->items, $ref, 'product');
 		}
 
-		if( in_array( 'attribute', $ref, true ) )
+		if (in_array('attribute', $ref, true))
 		{
-			$productItems = ( isset( $map['product'] ) ? array_merge( $view->items, $map['product'] ) : array() );
-			$map['attribute'] = $this->getDomainItems( $productItems, $ref, 'attribute' );
+			$productItems = (isset($map['product']) ? array_merge($view->items, $map['product']) : array());
+			$map['attribute'] = $this->getDomainItems($productItems, $ref, 'attribute');
 		}
 
 		$view->itemMap = $map;

Braces +3 added lines, -6 removed lines

@@ -46,16 +46,14 @@ 
 			}
 
 			$status = 200;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(
@@ -87,8 +85,7 @@ 
 			 */
 			$tplconf = 'client/jsonapi/product/standard/template-aggregate';
 			$default = 'aggregate-default.php';
-		}
-		else
+		} else
 		{
 			/** client/jsonapi/product/standard/template-get
 			 * Relative path to the product JSON API template for GET requests

client/jsonapi/src/Client/JsonApi/Product/Factory.php

Spacing +11 added lines, -11 removed lines

@@ -31,12 +31,12 @@ 
 	 * @return \Aimeos\Client\JsonApi\Iface JSON API client
 	 * @throws \Aimeos\Client\JsonApi\Exception If requested client implementation couldn't be found or initialisation fails
 	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $path, $name = null )
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $path, $name = null)
 	{
-		if( ctype_alnum( $path ) === false )
+		if (ctype_alnum($path) === false)
 		{
-			$path = ( is_string( $path ) ? $path : '<not a string>' );
-			throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Invalid client "%1$s"', $path ), 400 );
+			$path = (is_string($path) ? $path : '<not a string>');
+			throw new \Aimeos\Client\JsonApi\Exception(sprintf('Invalid client "%1$s"', $path), 400);
 		}
 
 		/** client/jsonapi/product/name
@@ -72,23 +72,23 @@ 
 		 * @since 2017.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/jsonapi/product/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('client/jsonapi/product/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\JsonApi\\Product\\' . $name : '<not a string>';
-			throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Client\\JsonApi\\Product\\' . $name : '<not a string>';
+			throw new \Aimeos\Client\JsonApi\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$view = $context->getView();
 		$iface = '\\Aimeos\\Client\\JsonApi\\Iface';
 		$classname = '\\Aimeos\\Client\\JsonApi\\Product\\' . $name;
 
-		$client = self::createClientBase( $classname, $iface, $context, $view, $templatePaths, $path );
+		$client = self::createClientBase($classname, $iface, $context, $view, $templatePaths, $path);
 
-		return self::addClientDecorators( $client, $context, $view, $templatePaths, $path );
+		return self::addClientDecorators($client, $context, $view, $templatePaths, $path);
 	}
 
 }

client/jsonapi/src/Client/JsonApi/Standard.php

Spacing +10 added lines, -10 removed lines

@@ -32,7 +32,7 @@ 
 	 * @param string|null $prefix Form parameter prefix when nesting parameters is required
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function options( ServerRequestInterface $request, ResponseInterface $response, $prefix = null )
+	public function options(ServerRequestInterface $request, ResponseInterface $response, $prefix = null)
 	{
 		$view = $this->getView();
 
@@ -55,19 +55,19 @@ 
 			 * @category Developer
 			 */
 			$default = ['attribute', 'catalog', 'product', 'stock'];
-			$resources = $this->getContext()->getConfig()->get( 'client/jsonapi/resources', $default );
+			$resources = $this->getContext()->getConfig()->get('client/jsonapi/resources', $default);
 
 			$view->resources = (array) $resources;
 			$view->prefix = $prefix;
 			$status = 200;
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$status = 500;
-			$view->errors = array( array(
+			$view->errors = array(array(
 				'title' => $e->getMessage(),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
 
 		/** client/jsonapi/standard/template-options
@@ -97,11 +97,11 @@ 
 		$tplconf = 'client/jsonapi/standard/template-options';
 		$default = 'options-default.php';
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Allow', 'GET' )
-			->withHeader( 'Content-Type', 'application/vnd.api+json' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Allow', 'GET')
+			->withHeader('Content-Type', 'application/vnd.api+json')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
 			$view->resources = (array) $resources;
 			$view->prefix = $prefix;
 			$status = 200;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(

client/jsonapi/src/Client/JsonApi/Iface.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function delete( ServerRequestInterface $request, ResponseInterface $response );
+	public function delete(ServerRequestInterface $request, ResponseInterface $response);
 
 
 	/**
@@ -39,7 +39,7 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function get( ServerRequestInterface $request, ResponseInterface $response );
+	public function get(ServerRequestInterface $request, ResponseInterface $response);
 
 
 	/**
@@ -49,7 +49,7 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function patch( ServerRequestInterface $request, ResponseInterface $response );
+	public function patch(ServerRequestInterface $request, ResponseInterface $response);
 
 
 	/**
@@ -59,7 +59,7 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function post( ServerRequestInterface $request, ResponseInterface $response );
+	public function post(ServerRequestInterface $request, ResponseInterface $response);
 
 
 	/**
@@ -69,7 +69,7 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function put( ServerRequestInterface $request, ResponseInterface $response );
+	public function put(ServerRequestInterface $request, ResponseInterface $response);
 
 
 	/**
@@ -80,5 +80,5 @@ 
 	 * @param string|null $prefix Form parameter prefix when nesting parameters is required
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function options( ServerRequestInterface $request, ResponseInterface $response, $prefix = null );
+	public function options(ServerRequestInterface $request, ResponseInterface $response, $prefix = null);
 }

client/jsonapi/src/Client/JsonApi/Factory.php

Spacing +34 added lines, -34 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();
@@ -65,19 +65,19 @@ 
 	 * @return \Aimeos\Client\JsonApi\Iface JSON client instance
 	 * @throws \Aimeos\Client\JsonApi\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] ) ) {
-			self::$clients[$id][$path] = self::createClientNew( $context, $templatePaths, $path, $name );
+		if (self::$cache === false || !isset(self::$clients[$id][$path])) {
+			self::$clients[$id][$path] = self::createClientNew($context, $templatePaths, $path, $name);
 		}
 
 		return self::$clients[$id][$path];
@@ -90,7 +90,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;
@@ -109,37 +109,37 @@ 
 	 * @return \Aimeos\Client\JsonApi\Iface JSON client instance
 	 * @throws \Aimeos\Client\JsonApi\Exception If the given path is invalid
 	 */
-	protected static function createClientNew( \Aimeos\MShop\Context\Item\Iface $context,
-		array $templatePaths, $path, $name )
+	protected static function createClientNew(\Aimeos\MShop\Context\Item\Iface $context,
+		array $templatePaths, $path, $name)
 	{
-		$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\Client\JsonApi\Exception( $msg, 400 );
+				$msg = sprintf('Invalid client "%1$s" in "%2$s"', $part, $path);
+				throw new \Aimeos\Client\JsonApi\Exception($msg, 400);
 			}
 
-			$parts[$key] = ucwords( $part );
+			$parts[$key] = ucwords($part);
 		}
 
 
 		$view = $context->getView();
-		$factory = '\\Aimeos\\Client\\JsonApi\\' . join( '\\', $parts ) . '\\Factory';
+		$factory = '\\Aimeos\\Client\\JsonApi\\' . join('\\', $parts) . '\\Factory';
 
-		if( class_exists( $factory ) === true )
+		if (class_exists($factory) === true)
 		{
-			$args = array( $context, $templatePaths, $path, $name );
+			$args = array($context, $templatePaths, $path, $name);
 
-			if( ( $client = @call_user_func_array( array( $factory, 'createClient' ), $args ) ) === false ) {
-				throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Invalid factory "%1$s"', $factory ), 400 );
+			if (($client = @call_user_func_array(array($factory, 'createClient'), $args)) === false) {
+				throw new \Aimeos\Client\JsonApi\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);
 		}
 
 		return $client;
@@ -157,8 +157,8 @@ 
 	 * @return \Aimeos\Client\JsonApi\Iface JSON client instance
 	 * @throws \Aimeos\Client\JsonApi\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)
 	{
 		/** client/jsonapi/name
 		 * Class name of the used JSON API client implementation
@@ -193,20 +193,20 @@ 
 		 * @since 2015.12
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/jsonapi/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('client/jsonapi/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\JsonApi\\' . $name : '<not a string>';
-			throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Client\\JsonApi\\' . $name : '<not a string>';
+			throw new \Aimeos\Client\JsonApi\Exception(sprintf('Invalid class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Client\\JsonApi\\Iface';
 		$classname = '\\Aimeos\\Client\\JsonApi\\' . $name;
 
-		$client = self::createClientBase( $classname, $iface, $context, $view, $templatePaths, $path );
+		$client = self::createClientBase($classname, $iface, $context, $view, $templatePaths, $path);
 
 		/** client/jsonapi/decorators/excludes
 		 * Excludes decorators added by the "common" option from the JSON API clients
@@ -286,6 +286,6 @@ 
 		 * @see client/jsonapi/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

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

client/jsonapi/src/Client/JsonApi/Attribute/Standard.php

Spacing +36 added lines, -36 removed lines

@@ -31,35 +31,35 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function get( ServerRequestInterface $request, ResponseInterface $response )
+	public function get(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$view = $this->getView();
 
 		try
 		{
-			if( $view->param( 'id' ) != '' ) {
-				$response = $this->getItem( $view, $request, $response );
+			if ($view->param('id') != '') {
+				$response = $this->getItem($view, $request, $response);
 			} else {
-				$response = $this->getItems( $view, $request, $response );
+				$response = $this->getItems($view, $request, $response);
 			}
 
 			$status = 200;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $this->getContext()->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(),
-			) );
+			));
 		}
 
 		/** client/jsonapi/attribute/standard/template-get
@@ -84,12 +84,12 @@ 
 		$tplconf = 'client/jsonapi/attribute/standard/template-get';
 		$default = 'attribute/get-default.php';
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Allow', 'GET' )
-			->withHeader( 'Content-Type', 'application/vnd.api+json' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Allow', 'GET')
+			->withHeader('Content-Type', 'application/vnd.api+json')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 
 
@@ -101,17 +101,17 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function getItem( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function getItem(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
-		$ref = $view->param( 'include', array() );
+		$ref = $view->param('include', array());
 
-		if( is_string( $ref ) ) {
-			$ref = explode( ',', $ref );
+		if (is_string($ref)) {
+			$ref = explode(',', $ref);
 		}
 
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'attribute' );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'attribute');
 
-		$view->items = $cntl->getItem( $view->param( 'id' ), $ref );
+		$view->items = $cntl->getItem($view->param('id'), $ref);
 		$view->total = 1;
 
 		return $response;
@@ -126,7 +126,7 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
 		/** client/jsonapi/attribute/types
 		 * List of attribute types that should be displayed in this order in the catalog filter
@@ -146,37 +146,37 @@ 
 		 * @since 2017.03
 		 * @category Developer
 		 */
-		$attrTypes = $this->getContext()->getConfig()->get( 'client/jsonapi/attribute/types', array() );
+		$attrTypes = $this->getContext()->getConfig()->get('client/jsonapi/attribute/types', array());
 
 		$total = 0;
 		$attrMap = [];
 
-		$ref = $view->param( 'include', array() );
+		$ref = $view->param('include', array());
 
-		if( is_string( $ref ) ) {
-			$ref = explode( ',', $ref );
+		if (is_string($ref)) {
+			$ref = explode(',', $ref);
 		}
 
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'attribute' );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'attribute');
 
 		$filter = $cntl->createFilter();
-		$filter = $this->initCriteriaConditions( $filter, $view->param() );
-		$filter = $cntl->addFilterTypes( $filter, $attrTypes );
+		$filter = $this->initCriteriaConditions($filter, $view->param());
+		$filter = $cntl->addFilterTypes($filter, $attrTypes);
 
-		$items = $cntl->searchItems( $filter, $ref, $total );
+		$items = $cntl->searchItems($filter, $ref, $total);
 
-		foreach( $items as $id => $item ) {
+		foreach ($items as $id => $item) {
 			$attrMap[$item->getType()][$id] = $item;
 		}
 
-		if( !empty( $attrTypes ) )
+		if (!empty($attrTypes))
 		{
 			$sorted = [];
 
-			foreach( $attrTypes as $type )
+			foreach ($attrTypes as $type)
 			{
-				if( isset( $attrMap[$type] ) ) {
-					$sorted = array_merge( $sorted, $attrMap[$type] );
+				if (isset($attrMap[$type])) {
+					$sorted = array_merge($sorted, $attrMap[$type]);
 				}
 			}
 

Braces +2 added lines, -4 removed lines

@@ -44,16 +44,14 @@
 			}
 
 			$status = 200;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(

client/jsonapi/src/Client/JsonApi/Attribute/Factory.php

Spacing +11 added lines, -11 removed lines

@@ -31,12 +31,12 @@ 
 	 * @return \Aimeos\Client\JsonApi\Iface JSON API client
 	 * @throws \Aimeos\Client\JsonApi\Exception If requested client implementation couldn't be found or initialisation fails
 	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $path, $name = null )
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $path, $name = null)
 	{
-		if( ctype_alnum( $path ) === false )
+		if (ctype_alnum($path) === false)
 		{
-			$path = ( is_string( $path ) ? $path : '<not a string>' );
-			throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Invalid client "%1$s"', $path ), 400 );
+			$path = (is_string($path) ? $path : '<not a string>');
+			throw new \Aimeos\Client\JsonApi\Exception(sprintf('Invalid client "%1$s"', $path), 400);
 		}
 
 		/** client/jsonapi/attribute/name
@@ -72,23 +72,23 @@ 
 		 * @since 2017.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/jsonapi/attribute/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('client/jsonapi/attribute/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\JsonApi\\Attribute\\' . $name : '<not a string>';
-			throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Client\\JsonApi\\Attribute\\' . $name : '<not a string>';
+			throw new \Aimeos\Client\JsonApi\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$view = $context->getView();
 		$iface = '\\Aimeos\\Client\\JsonApi\\Iface';
 		$classname = '\\Aimeos\\Client\\JsonApi\\Attribute\\' . $name;
 
-		$client = self::createClientBase( $classname, $iface, $context, $view, $templatePaths, $path );
+		$client = self::createClientBase($classname, $iface, $context, $view, $templatePaths, $path);
 
-		return self::addClientDecorators( $client, $context, $view, $templatePaths, $path );
+		return self::addClientDecorators($client, $context, $view, $templatePaths, $path);
 	}
 
 }