aimeos / ai-client-jsonapi

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

Spacing +43 added lines, -43 removed lines

@@ -36,7 +36,7 @@ 
 	 * @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 "catalog/lists"
 	 */
-	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;
@@ -52,9 +52,9 @@ 
 	 * @param array $param List of method parameter
 	 * @throws \Aimeos\Client\JsonApi\Exception If method call failed
 	 */
-	public function __call( $name, array $param )
+	public function __call($name, array $param)
 	{
-		throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Unable to call method "%1$s"', $name ) );
+		throw new \Aimeos\Client\JsonApi\Exception(sprintf('Unable to call method "%1$s"', $name));
 	}
 
 
@@ -65,9 +65,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->defaultAction( $request, $response );
+		return $this->defaultAction($request, $response);
 	}
 
 
@@ -78,9 +78,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->defaultAction( $request, $response );
+		return $this->defaultAction($request, $response);
 	}
 
 
@@ -91,9 +91,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->defaultAction( $request, $response );
+		return $this->defaultAction($request, $response);
 	}
 
 
@@ -104,9 +104,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->defaultAction( $request, $response );
+		return $this->defaultAction($request, $response);
 	}
 
 
@@ -118,9 +118,9 @@ 
 	 * @param string|null $prefix Form parameter prefix when nesting parameters is required
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function put( ServerRequestInterface $request, ResponseInterface $response )
+	public function put(ServerRequestInterface $request, ResponseInterface $response)
 	{
-		return $this->defaultAction( $request, $response );
+		return $this->defaultAction($request, $response);
 	}
 
 
@@ -131,9 +131,9 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @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->defaultAction( $request, $response );
+		return $this->defaultAction($request, $response);
 	}
 
 
@@ -144,14 +144,14 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function defaultAction( ServerRequestInterface $request, ResponseInterface $response )
+	protected function defaultAction(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$status = 403;
 		$view = $this->getView();
 
-		$view->errors = array( array(
-			'title' => $this->getContext()->getI18n()->dt( 'client/jsonapi', 'Not allowed for this resource' ),
-		) );
+		$view->errors = array(array(
+			'title' => $this->getContext()->getI18n()->dt('client/jsonapi', 'Not allowed for this resource'),
+		));
 
 		/** client/jsonapi/standard/template-error
 		 * Relative path to the default JSON API template
@@ -180,11 +180,11 @@ 
 		$tplconf = 'client/jsonapi/standard/template-error';
 		$default = 'error-default.php';
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Content-Type', 'application/vnd.api+json' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Content-Type', 'application/vnd.api+json')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 
 
@@ -239,11 +239,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;
 	}
@@ -256,17 +256,17 @@ 
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 * @return \Aimeos\MW\Criteria\Iface Initialized criteria object
 	 */
-	protected function initCriteriaConditions( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	protected function initCriteriaConditions(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		if( !isset( $params['filter'] ) ) {
+		if (!isset($params['filter'])) {
 			return $criteria;
 		}
 
 		$existing = $criteria->getConditions();
-		$criteria->setConditions( $criteria->toConditions( (array) $params['filter'] ) );
+		$criteria->setConditions($criteria->toConditions((array) $params['filter']));
 
-		$expr = array( $criteria->getConditions(), $existing );
-		return $criteria->setConditions( $criteria->combine( '&&', $expr ) );
+		$expr = array($criteria->getConditions(), $existing);
+		return $criteria->setConditions($criteria->combine('&&', $expr));
 	}
 
 
@@ -277,12 +277,12 @@ 
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 * @return \Aimeos\MW\Criteria\Iface Initialized criteria object
 	 */
-	protected function initCriteriaSlice( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	protected function initCriteriaSlice(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		$start = ( isset( $params['page']['offset'] ) ? (int) $params['page']['offset'] : 0 );
-		$size = ( isset( $params['page']['limit'] ) ? (int) $params['page']['limit'] : 25 );
+		$start = (isset($params['page']['offset']) ? (int) $params['page']['offset'] : 0);
+		$size = (isset($params['page']['limit']) ? (int) $params['page']['limit'] : 25);
 
-		return $criteria->setSlice( $start, $size );
+		return $criteria->setSlice($start, $size);
 	}
 
 
@@ -293,23 +293,23 @@ 
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 * @return \Aimeos\MW\Criteria\Iface Initialized criteria object
 	 */
-	protected function initCriteriaSortations( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	protected 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 );
+				$sortation[] = $criteria->sort('+', $sort);
 			}
 		}
 
-		return $criteria->setSortations( $sortation );
+		return $criteria->setSortations($sortation);
 	}
 }

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);
 	}
 }

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);
 	}
 }

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]);
 				}
 			}
 

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);
 	}
 
 }

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

Spacing +23 added lines, -23 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/locale/standard/template-get
@@ -84,12 +84,12 @@ 
 		$tplconf = 'client/jsonapi/locale/standard/template-get';
 		$default = 'locale/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,11 +101,11 @@ 
 	 * @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)
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'locale' );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'locale');
 
-		$view->items = $cntl->getItem( $view->param( 'id' ) );
+		$view->items = $cntl->getItem($view->param('id'));
 		$view->total = 1;
 
 		return $response;
@@ -120,16 +120,16 @@ 
 	 * @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;
 
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'locale' );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'locale');
 
 		$filter = $cntl->createFilter();
-		$filter = $this->initCriteriaConditions( $filter, $view->param() );
+		$filter = $this->initCriteriaConditions($filter, $view->param());
 
-		$view->items = $cntl->searchItems( $filter, [], $total );
+		$view->items = $cntl->searchItems($filter, [], $total);
 		$view->total = $total;
 
 		return $response;

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

Spacing +28 added lines, -28 removed lines

@@ -8,37 +8,37 @@ 
  */
 
 
-$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);
 
 
-$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\Locale\Item\Iface $item ) use ( $fields, $view, $target, $cntl, $action, $config )
+$entryFcn = function(\Aimeos\MShop\Locale\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(
@@ -46,8 +46,8 @@ 
 		'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,
@@ -60,37 +60,37 @@ 
 ?>
 {
 	"meta": {
-		"total": <?php echo $this->get( 'total', 0 ); ?>
+		"total": <?php echo $this->get('total', 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
 			$data = [];
-			$items = $this->get( 'items', [] );
+			$items = $this->get('items', []);
 
-			if( is_array( $items ) )
+			if (is_array($items))
 			{
-				foreach( $items as $localeItem ) {
-					$data[] = $entryFcn( $localeItem );
+				foreach ($items as $localeItem) {
+					$data[] = $entryFcn($localeItem);
 				}
 			}
 			else
 			{
-				$data = $entryFcn( $items );
+				$data = $entryFcn($items);
 			}
 		 ?>
 
-		"data": <?php echo json_encode( $data ); ?>
+		"data": <?php echo json_encode($data); ?>
 
 	<?php endif; ?>