aimeos / ai-client-jsonapi

client/jsonapi/templates/attribute/get-default.php

Spacing +58 added lines, -58 removed lines

@@ -8,45 +8,45 @@ 
  */
 
 
-$target = $this->config( 'client/jsonapi/url/target' );
-$cntl = $this->config( 'client/jsonapi/url/controller', 'jsonapi' );
-$action = $this->config( 'client/jsonapi/url/action', 'get' );
-$config = $this->config( 'client/jsonapi/url/config', array() );
+$target = $this->config('client/jsonapi/url/target');
+$cntl = $this->config('client/jsonapi/url/controller', 'jsonapi');
+$action = $this->config('client/jsonapi/url/action', 'get');
+$config = $this->config('client/jsonapi/url/config', array());
 
 
 $view = $this;
 $enc = $this->encoder();
 
 
-$ref = array( 'id', 'resource', 'filter', 'page', 'sort', 'include', 'fields' );
-$params = array_intersect_key( $this->param(), array_flip( $ref ) );
+$ref = array('id', 'resource', 'filter', 'page', 'sort', 'include', 'fields');
+$params = array_intersect_key($this->param(), array_flip($ref));
 
 
-$total = $this->get( 'total', 0 );
-$offset = max( $this->param( 'page/offset', 0 ), 0 );
-$limit = max( $this->param( 'page/limit', 100 ), 1 );
+$total = $this->get('total', 0);
+$offset = max($this->param('page/offset', 0), 0);
+$limit = max($this->param('page/limit', 100), 1);
 
-$first = ( $offset > 0 ? 0 : null );
-$prev = ( $offset - $limit >= 0 ? $offset - $limit : null );
-$next = ( $offset + $limit < $total ? $offset + $limit : null );
-$last = ( ((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null );
+$first = ($offset > 0 ? 0 : null);
+$prev = ($offset - $limit >= 0 ? $offset - $limit : null);
+$next = ($offset + $limit < $total ? $offset + $limit : null);
+$last = (((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null);
 
 
-$fields = $this->param( 'fields', array() );
+$fields = $this->param('fields', array());
 
-foreach( (array) $fields as $resource => $list ) {
-	$fields[$resource] = array_flip( explode( ',', $list ) );
+foreach ((array) $fields as $resource => $list) {
+	$fields[$resource] = array_flip(explode(',', $list));
 }
 
 
-$entryFcn = function( \Aimeos\MShop\Common\Item\Iface $item ) use ( $fields, $view, $target, $cntl, $action, $config )
+$entryFcn = function(\Aimeos\MShop\Common\Item\Iface $item) use ($fields, $view, $target, $cntl, $action, $config)
 {
 	$attributes = $item->toArray();
 	$type = $item->getResourceType();
-	$params = array( 'resource' => $type, 'id' => $item->getId() );
+	$params = array('resource' => $type, 'id' => $item->getId());
 
-	if( isset( $fields[$type] ) ) {
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
+	if (isset($fields[$type])) {
+		$attributes = array_intersect_key($attributes, $fields[$type]);
 	}
 
 	$entry = array(
@@ -54,29 +54,29 @@ 
 		'type' => $item->getResourceType(),
 		'links' => array(
 			'self' => array(
-				'href' => $view->url( $target, $cntl, $action, $params, array(), $config ),
-				'allow' => array( 'GET' ),
+				'href' => $view->url($target, $cntl, $action, $params, array(), $config),
+				'allow' => array('GET'),
 			),
 		),
 		'attributes' => $attributes,
 	);
 
-	if( $item instanceof \Aimeos\MShop\Common\Item\ListRef\Iface )
+	if ($item instanceof \Aimeos\MShop\Common\Item\ListRef\Iface)
 	{
-		foreach( $item->getListItems() as $listItem )
+		foreach ($item->getListItems() as $listItem)
 		{
 			$domain = $listItem->getDomain();
 
-			if( in_array( $domain, array( 'media', 'price', 'text' ), true )
-				&& ( $refItem = $listItem->getRefItem() ) !== null
+			if (in_array($domain, array('media', 'price', 'text'), true)
+				&& ($refItem = $listItem->getRefItem()) !== null
 			) {
 				$entry['attributes'][$domain][] = $refItem->toArray() + $listItem->toArray();
 			}
 
-			if( !in_array( $domain, array( 'media', 'price', 'text' ), true )
-				&& ( $refItem = $listItem->getRefItem() ) !== null
+			if (!in_array($domain, array('media', 'price', 'text'), true)
+				&& ($refItem = $listItem->getRefItem()) !== null
 			) {
-				$basic = array( 'id' => $refItem->getId(), 'type' => $domain );
+				$basic = array('id' => $refItem->getId(), 'type' => $domain);
 				$entry['relationships'][$domain]['data'][] = $basic + $listItem->toArray();
 			}
 		}
@@ -86,23 +86,23 @@ 
 };
 
 
-$refFcn = function( \Aimeos\MShop\Common\Item\Iface $item, $level ) use ( $entryFcn, &$refFcn )
+$refFcn = function(\Aimeos\MShop\Common\Item\Iface $item, $level) use ($entryFcn, &$refFcn)
 {
 	$list = array();
 
-	if( !( $item instanceof \Aimeos\MShop\Common\Item\ListRef\Iface ) || $level > 1 ) {
+	if (!($item instanceof \Aimeos\MShop\Common\Item\ListRef\Iface) || $level > 1) {
 		return $list;
 	}
 
-	foreach( $item->getListItems() as $listItem )
+	foreach ($item->getListItems() as $listItem)
 	{
 		$domain = $listItem->getDomain();
 
-		if( !in_array( $domain, array( 'media', 'price', 'text' ), true )
-			&& ( $refItem = $listItem->getRefItem() ) !== null
+		if (!in_array($domain, array('media', 'price', 'text'), true)
+			&& ($refItem = $listItem->getRefItem()) !== null
 		) {
-			$list[] = $entryFcn( $refItem );
-			$list = array_merge( $list, $refFcn( $refItem, ++$level ) );
+			$list[] = $entryFcn($refItem);
+			$list = array_merge($list, $refFcn($refItem, ++$level));
 		}
 	}
 
@@ -118,51 +118,51 @@ 
 	},
 
 	"links": {
-		<?php if( is_array( $this->get( 'items' ) ) ) : ?>
-			<?php if( $first !== null ) : ?>
-				"first": "<?php $params['page']['offset'] = $first; echo $this->url( $target, $cntl, $action, $params, array(), $config ); ?>",
+		<?php if (is_array($this->get('items'))) : ?>
+			<?php if ($first !== null) : ?>
+				"first": "<?php $params['page']['offset'] = $first; echo $this->url($target, $cntl, $action, $params, array(), $config); ?>",
 			<?php endif; ?>
-			<?php if( $prev !== null ) : ?>
-				"prev": "<?php $params['page']['offset'] = $prev; echo $this->url( $target, $cntl, $action, $params, array(), $config ); ?>",
+			<?php if ($prev !== null) : ?>
+				"prev": "<?php $params['page']['offset'] = $prev; echo $this->url($target, $cntl, $action, $params, array(), $config); ?>",
 			<?php endif; ?>
-			<?php if( $next !== null ) : ?>
-				"next": "<?php $params['page']['offset'] = $next; echo $this->url( $target, $cntl, $action, $params, array(), $config ); ?>",
+			<?php if ($next !== null) : ?>
+				"next": "<?php $params['page']['offset'] = $next; echo $this->url($target, $cntl, $action, $params, array(), $config); ?>",
 			<?php endif; ?>
-			<?php if( $last !== null ) : ?>
-				"last": "<?php $params['page']['offset'] = $last; echo $this->url( $target, $cntl, $action, $params, array(), $config ); ?>",
+			<?php if ($last !== null) : ?>
+				"last": "<?php $params['page']['offset'] = $last; echo $this->url($target, $cntl, $action, $params, array(), $config); ?>",
 			<?php endif; ?>
 		<?php endif; ?>
-		"self": "<?php $params['page']['offset'] = $offset; echo $this->url( $target, $cntl, $action, $params, array(), $config ); ?>"
+		"self": "<?php $params['page']['offset'] = $offset; echo $this->url($target, $cntl, $action, $params, array(), $config); ?>"
 	},
 
-	<?php if( isset( $this->errors ) ) : ?>
+	<?php if (isset($this->errors)) : ?>
 
-		"errors": <?php echo json_encode( $this->errors, JSON_PRETTY_PRINT ); ?>
+		"errors": <?php echo json_encode($this->errors, JSON_PRETTY_PRINT); ?>
 
-	<?php elseif( isset( $this->items ) ) : ?>
+	<?php elseif (isset($this->items)) : ?>
 
 		<?php
 			$data = $included = array();
-			$items = $this->get( 'items', array() );
+			$items = $this->get('items', array());
 
-			if( is_array( $items ) )
+			if (is_array($items))
 			{
-				foreach( $items as $attrItem )
+				foreach ($items as $attrItem)
 				{
-					$data[] = $entryFcn( $attrItem );
-					$included = array_merge( $included, $refFcn( $attrItem, 0 ) );
+					$data[] = $entryFcn($attrItem);
+					$included = array_merge($included, $refFcn($attrItem, 0));
 				}
 			}
 			else
 			{
-				$data = $entryFcn( $items );
-				$included = $refFcn( $items, 0 );
+				$data = $entryFcn($items);
+				$included = $refFcn($items, 0);
 			}
 		 ?>
 
-		"data": <?php echo json_encode( $data ); ?>,
+		"data": <?php echo json_encode($data); ?>,
 
-		"included": <?php echo json_encode( $included ); ?>
+		"included": <?php echo json_encode($included); ?>
 
 	<?php endif; ?>
 

Braces +1 added lines, -2 removed lines

@@ -152,8 +152,7 @@
 					$data[] = $entryFcn( $attrItem );
 					$included = array_merge( $included, $refFcn( $attrItem, 0 ) );
 				}
-			}
-			else
+			} else
 			{
 				$data = $entryFcn( $items );
 				$included = $refFcn( $items, 0 );

client/jsonapi/templates/error-default.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 {
-<?php if( isset( $this->errors ) ) : ?>
-	"errors": <?php echo json_encode( $this->errors, JSON_PRETTY_PRINT ); ?>
+<?php if (isset($this->errors)) : ?>
+	"errors": <?php echo json_encode($this->errors, JSON_PRETTY_PRINT); ?>
 <?php endif; ?>
 
 }

client/jsonapi/templates/catalog/get-default.php

Spacing +32 added lines, -32 removed lines

@@ -8,38 +8,38 @@ 
  */
 
 
-$target = $this->config( 'client/jsonapi/url/target' );
-$cntl = $this->config( 'client/jsonapi/url/controller', 'jsonapi' );
-$action = $this->config( 'client/jsonapi/url/action', 'get' );
-$config = $this->config( 'client/jsonapi/url/config', array() );
+$target = $this->config('client/jsonapi/url/target');
+$cntl = $this->config('client/jsonapi/url/controller', 'jsonapi');
+$action = $this->config('client/jsonapi/url/action', 'get');
+$config = $this->config('client/jsonapi/url/config', array());
 
 
 $view = $this;
 $enc = $this->encoder();
 
-$ref = array( 'id', 'resource', 'filter', 'page', 'sort', 'include', 'fields' );
-$params = array_intersect_key( $this->param(), array_flip( $ref ) );
+$ref = array('id', 'resource', 'filter', 'page', 'sort', 'include', 'fields');
+$params = array_intersect_key($this->param(), array_flip($ref));
 
-$offset = max( $this->param( 'page/offset', 0 ), 0 );
-$limit = max( $this->param( 'page/limit', 100 ), 1 );
+$offset = max($this->param('page/offset', 0), 0);
+$limit = max($this->param('page/limit', 100), 1);
 
 
-$map = $this->get( 'itemMap', array() );
-$fields = $this->param( 'fields', array() );
+$map = $this->get('itemMap', array());
+$fields = $this->param('fields', array());
 
-foreach( (array) $fields as $resource => $list ) {
-	$fields[$resource] = array_flip( explode( ',', $list ) );
+foreach ((array) $fields as $resource => $list) {
+	$fields[$resource] = array_flip(explode(',', $list));
 }
 
 
-$entryFcn = function( \Aimeos\MShop\Catalog\Item\Iface $item ) use ( $fields, $view, $target, $cntl, $action, $config )
+$entryFcn = function(\Aimeos\MShop\Catalog\Item\Iface $item) use ($fields, $view, $target, $cntl, $action, $config)
 {
 	$attributes = $item->toArray();
 	$type = $item->getResourceType();
-	$params = array( 'resource' => $type, 'id' => $item->getId() );
+	$params = array('resource' => $type, 'id' => $item->getId());
 
-	if( isset( $fields[$type] ) ) {
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
+	if (isset($fields[$type])) {
+		$attributes = array_intersect_key($attributes, $fields[$type]);
 	}
 
 	$entry = array(
@@ -47,24 +47,24 @@ 
 		'type' => $item->getResourceType(),
 		'links' => array(
 			'self' => array(
-				'href' => $view->url( $target, $cntl, $action, $params, array(), $config ),
-				'allow' => array( 'GET' ),
+				'href' => $view->url($target, $cntl, $action, $params, array(), $config),
+				'allow' => array('GET'),
 			),
 		),
 		'attributes' => $attributes,
 	);
 
-	foreach( $item->getChildren() as $catItem ) {
-		$entry['relationships']['catalog']['data'][] = array( 'id' => $catItem->getId(), 'type' => 'catalog' );
+	foreach ($item->getChildren() as $catItem) {
+		$entry['relationships']['catalog']['data'][] = array('id' => $catItem->getId(), 'type' => 'catalog');
 	}
 
-	if( $item instanceof \Aimeos\MShop\Common\Item\ListRef\Iface )
+	if ($item instanceof \Aimeos\MShop\Common\Item\ListRef\Iface)
 	{
-		foreach( $item->getListItems() as $listItem )
+		foreach ($item->getListItems() as $listItem)
 		{
 			$domain = $listItem->getDomain();
 
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
+			if (($refItem = $listItem->getRefItem()) !== null) {
 				$entry['attributes'][$domain][] = $refItem->toArray() + $listItem->toArray();
 			}
 
@@ -78,31 +78,31 @@ 
 ?>
 {
 	"meta": {
-		"total": <?php echo ( isset( $this->items ) ? 1 : 0 ); ?>
+		"total": <?php echo (isset($this->items) ? 1 : 0); ?>
 
 	},
 
 	"links": {
-		"self": "<?php echo $this->url( $target, $cntl, $action, $params, array(), $config ); ?>"
+		"self": "<?php echo $this->url($target, $cntl, $action, $params, array(), $config); ?>"
 	},
 
-	<?php if( isset( $this->errors ) ) : ?>
+	<?php if (isset($this->errors)) : ?>
 
-		"errors": <?php echo json_encode( $this->errors, JSON_PRETTY_PRINT ); ?>
+		"errors": <?php echo json_encode($this->errors, JSON_PRETTY_PRINT); ?>
 
-	<?php elseif( isset( $this->items ) ) : ?>
+	<?php elseif (isset($this->items)) : ?>
 
 		<?php
 			$included = array();
 
-			foreach( $this->items->getChildren() as $catItem ) {
-				$included[] = $entryFcn( $catItem );
+			foreach ($this->items->getChildren() as $catItem) {
+				$included[] = $entryFcn($catItem);
 			}
 		 ?>
 
-		"data": <?php echo json_encode( $entryFcn( $this->items ) ); ?>,
+		"data": <?php echo json_encode($entryFcn($this->items)); ?>,
 
-		"included": <?php echo json_encode( $included ); ?>
+		"included": <?php echo json_encode($included); ?>
 
 	<?php endif; ?>
 

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

Spacing +24 added lines, -24 removed lines

@@ -31,30 +31,30 @@ 
 	 * @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
 		{
-			$response = $this->getItem( $view, $request, $response );
+			$response = $this->getItem($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/catalog/standard/template-get
@@ -79,12 +79,12 @@ 
 		$tplconf = 'client/jsonapi/catalog/standard/template-get';
 		$default = 'catalog/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);
 	}
 
 
@@ -96,32 +96,32 @@ 
 	 * @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();
-		$catId = $view->param( 'id' );
-		$ref = $view->param( 'include', array() );
+		$catId = $view->param('id');
+		$ref = $view->param('include', array());
 		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE;
 
-		if( $catId == '' ) {
+		if ($catId == '') {
 			$catId = null;
 		}
 
-		if( is_string( $ref ) ) {
-			$ref = explode( ',', $ref );
+		if (is_string($ref)) {
+			$ref = explode(',', $ref);
 		}
 
-		if( in_array( 'catalog', $ref, true ) ) {
+		if (in_array('catalog', $ref, true)) {
 			$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST;
 		}
 
 		$context = $this->getContext();
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
 
 		$filter = $cntl->createFilter();
-		$filter = $this->initCriteria( $filter, $view->param() );
+		$filter = $this->initCriteria($filter, $view->param());
 
-		$view->items = $cntl->getTree( $catId, $ref, $level, $filter );
+		$view->items = $cntl->getTree($catId, $ref, $level, $filter);
 
 		return $response;
 	}

Braces +2 added lines, -4 removed lines

@@ -39,16 +39,14 @@
 		{
 			$response = $this->getItem( $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() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(

client/jsonapi/src/Client/JsonApi/Catalog/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/catalog/name
@@ -72,23 +72,23 @@ 
 		 * @since 2017.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/jsonapi/catalog/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('client/jsonapi/catalog/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\JsonApi\\Catalog\\' . $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\\Catalog\\' . $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\\Catalog\\' . $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/Common/Factory/Base.php

Spacing +38 added lines, -38 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string $classname Full name of the class for which the object should be returned
 	 * @param \Aimeos\Client\JsonApi\Iface|null $client JSON API client object
 	 */
-	public static function injectClient( $classname, \Aimeos\Client\JsonApi\Iface $client = null )
+	public static function injectClient($classname, \Aimeos\Client\JsonApi\Iface $client = null)
 	{
 		self::$objects[$classname] = $client;
 	}
@@ -47,8 +47,8 @@ 
 	 * @param string $path Name of the client separated by slashes, e.g "product/property"
 	 * @return \Aimeos\Client\JsonApi\Common\Iface Client object
 	 */
-	protected static function addClientDecorators( \Aimeos\Client\JsonApi\Iface $client,
-		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path )
+	protected static function addClientDecorators(\Aimeos\Client\JsonApi\Iface $client,
+		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path)
 	{
 		$config = $context->getConfig();
 
@@ -74,38 +74,38 @@ 
 		 * @since 2015.12
 		 * @category Developer
 		 */
-		$decorators = $config->get( 'client/jsonapi/common/decorators/default', array() );
+		$decorators = $config->get('client/jsonapi/common/decorators/default', array());
 
-		if( $path !== null && is_string( $path ) )
+		if ($path !== null && is_string($path))
 		{
-			$dpath = trim( $path, '/' );
-			$dpath = ( $dpath !== '' ? $dpath . '/' : $dpath );
+			$dpath = trim($path, '/');
+			$dpath = ($dpath !== '' ? $dpath . '/' : $dpath);
 
-			$excludes = $config->get( 'client/jsonapi/' . $dpath . 'decorators/excludes', array() );
-			$localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) );
+			$excludes = $config->get('client/jsonapi/' . $dpath . 'decorators/excludes', array());
+			$localClass = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $path)));
 
-			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\\Client\\JsonApi\\Common\\Decorator\\';
-			$decorators = $config->get( 'client/jsonapi/' . $dpath . 'decorators/global', array() );
-			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );
+			$decorators = $config->get('client/jsonapi/' . $dpath . 'decorators/global', array());
+			$client = self::addDecorators($client, $decorators, $classprefix, $context, $view, $templatePaths, $path);
 
-			if( !empty( $path ) )
+			if (!empty($path))
 			{
-				$classprefix = '\\Aimeos\\Client\\JsonApi\\' . ucfirst( $localClass ) . '\\Decorator\\';
-				$decorators = $config->get( 'client/jsonapi/' . $dpath . 'decorators/local', array() );
-				$client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );
+				$classprefix = '\\Aimeos\\Client\\JsonApi\\' . ucfirst($localClass) . '\\Decorator\\';
+				$decorators = $config->get('client/jsonapi/' . $dpath . 'decorators/local', array());
+				$client = self::addDecorators($client, $decorators, $classprefix, $context, $view, $templatePaths, $path);
 			}
 		}
 		else
 		{
 			$classprefix = '\\Aimeos\\Client\\JsonApi\\Common\\Decorator\\';
-			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );
+			$client = self::addDecorators($client, $decorators, $classprefix, $context, $view, $templatePaths, $path);
 		}
 
 		return $client;
@@ -124,29 +124,29 @@ 
 	 * @param string $path Name of the client, e.g "product"
 	 * @return \Aimeos\Client\JsonApi\Common\Iface Client object
 	 */
-	protected static function addDecorators( \Aimeos\Client\JsonApi\Iface $client, array $decorators, $classprefix,
-			\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, $templatePaths, $path )
+	protected static function addDecorators(\Aimeos\Client\JsonApi\Iface $client, array $decorators, $classprefix,
+			\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, $templatePaths, $path)
 	{
 		$iface = '\\Aimeos\\Client\\JsonApi\\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\Client\JsonApi\Exception( sprintf( 'Invalid class name "%1$s"', $classname ), 404 );
+				$classname = is_string($name) ? $classprefix . $name : '<not a string>';
+				throw new \Aimeos\Client\JsonApi\Exception(sprintf('Invalid class name "%1$s"', $classname), 404);
 			}
 
 			$classname = $classprefix . $name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Client\JsonApi\Exception(sprintf('Class "%1$s" not found', $classname), 404);
 			}
 
-			$client = new $classname( $client, $context, $view, $templatePaths, $path );
+			$client = new $classname($client, $context, $view, $templatePaths, $path);
 
-			if( !( $client instanceof $iface ) ) {
-				throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $iface ), 404 );
+			if (!($client instanceof $iface)) {
+				throw new \Aimeos\Client\JsonApi\Exception(sprintf('Class "%1$s" does not implement "%2$s"', $classname, $iface), 404);
 			}
 		}
 
@@ -165,21 +165,21 @@ 
 	 * @param string $path Name of the client separated by slashes, e.g "product/stock"
 	 * @return \Aimeos\Client\JsonApi\Common\Iface Client object
 	 */
-	protected static function createClientBase( $classname, $interface, \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\MW\View\Iface $view, array $templatePaths, $path )
+	protected static function createClientBase($classname, $interface, \Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\MW\View\Iface $view, array $templatePaths, $path)
 	{
-		if( isset( self::$objects[$classname] ) ) {
+		if (isset(self::$objects[$classname])) {
 			return self::$objects[$classname];
 		}
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Client\JsonApi\Exception(sprintf('Class "%1$s" not found', $classname), 404);
 		}
 
-		$client = new $classname( $context, $view, $templatePaths, $path );
+		$client = new $classname($context, $view, $templatePaths, $path);
 
-		if( !( $client instanceof $interface ) ) {
-			throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $interface ), 500 );
+		if (!($client instanceof $interface)) {
+			throw new \Aimeos\Client\JsonApi\Exception(sprintf('Class "%1$s" does not implement "%2$s"', $classname, $interface), 500);
 		}
 
 		return $client;

Braces +1 added lines, -2 removed lines

@@ -101,8 +101,7 @@
 				$decorators = $config->get( 'client/jsonapi/' . $dpath . 'decorators/local', array() );
 				$client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );
 			}
-		}
-		else
+		} else
 		{
 			$classprefix = '\\Aimeos\\Client\\JsonApi\\Common\\Decorator\\';
 			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );

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

Spacing +1 added lines, -1 removed lines

@@ -28,5 +28,5 @@
 	 * @param string|null $name Name of the client implementation ("Standard" if null)
 	 * @return \Aimeos\Admin\JsonAdm\Iface Client Interface
 	 */
-	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);
 }

client/jsonapi/src/Client/JsonApi/Common/Decorator/Base.php

Spacing +17 added lines, -17 removed lines

@@ -36,10 +36,10 @@ 
 	 * @param array $templatePaths List of file system paths where the templates are stored
 	 * @param string $path Name of the client, e.g "product"
 	 */
-	public function __construct( \Aimeos\Client\JsonApi\Iface $client,
-		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path )
+	public function __construct(\Aimeos\Client\JsonApi\Iface $client,
+		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path)
 	{
-		parent::__construct( $context, $view, $templatePaths, $path );
+		parent::__construct($context, $view, $templatePaths, $path);
 
 		$this->client = $client;
 	}
@@ -53,9 +53,9 @@ 
 	 * @return mixed Returns the value of the called method
 	 * @throws \Aimeos\Client\JsonApi\Exception If method call failed
 	 */
-	public function __call( $name, array $param )
+	public function __call($name, array $param)
 	{
-		return @call_user_func_array( array( $this->client, $name ), $param );
+		return @call_user_func_array(array($this->client, $name), $param);
 	}
 
 
@@ -66,9 +66,9 @@ 
 	 * @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)
 	{
-		return $this->client->delete( $request, $response );
+		return $this->client->delete($request, $response);
 	}
 
 
@@ -79,9 +79,9 @@ 
 	 * @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)
 	{
-		return $this->client->get( $request, $response );
+		return $this->client->get($request, $response);
 	}
 
 
@@ -93,9 +93,9 @@ 
 	 * @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)
 	{
-		return $this->client->patch( $request, $response );
+		return $this->client->patch($request, $response);
 	}
 
 
@@ -107,9 +107,9 @@ 
 	 * @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)
 	{
-		return $this->client->post( $request, $response );
+		return $this->client->post($request, $response);
 	}
 
 
@@ -121,9 +121,9 @@ 
 	 * @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)
 	{
-		return $this->client->put( $request, $response );
+		return $this->client->put($request, $response);
 	}
 
 
@@ -136,9 +136,9 @@ 
 	 * @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)
 	{
-		return $this->client->options( $request, $response, $prefix );
+		return $this->client->options($request, $response, $prefix);
 	}
 
 

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

Spacing +2 added lines, -2 removed lines

@@ -29,6 +29,6 @@
 	 * @param array $templatePaths List of file system paths where the templates are stored
 	 * @param string $path Name of the client separated by slashes, e.g "product/stock"
 	 */
-	public function __construct( \Aimeos\Client\JsonApi\Iface $client,
-		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path );
+	public function __construct(\Aimeos\Client\JsonApi\Iface $client,
+		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path);
 }
\ No newline at end of file