aimeos / ai-client-jsonapi

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;

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/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; ?>
 

Braces +1 added lines, -2 removed lines

@@ -83,8 +83,7 @@
 				foreach( $items as $localeItem ) {
 					$data[] = $entryFcn( $localeItem );
 				}
-			}
-			else
+			} else
 			{
 				$data = $entryFcn( $items );
 			}

client/jsonapi/tests/Client/JsonApi/Locale/FactoryTest.php

Spacing +8 added lines, -8 removed lines

@@ -16,8 +16,8 @@ 
 		$context = \TestHelperJapi::getContext();
 		$templatePaths = \TestHelperJapi::getTemplatePaths();
 
-		$client = \Aimeos\Client\JsonApi\Locale\Factory::createClient( $context, $templatePaths, 'locale' );
-		$this->assertInstanceOf( '\Aimeos\Client\JsonApi\Iface', $client );
+		$client = \Aimeos\Client\JsonApi\Locale\Factory::createClient($context, $templatePaths, 'locale');
+		$this->assertInstanceOf('\Aimeos\Client\JsonApi\Iface', $client);
 	}
 
 
@@ -26,8 +26,8 @@ 
 		$context = \TestHelperJapi::getContext();
 		$templatePaths = \TestHelperJapi::getTemplatePaths();
 
-		$this->setExpectedException( '\Aimeos\Client\JsonApi\Exception' );
-		\Aimeos\Client\JsonApi\Locale\Factory::createClient( $context, $templatePaths, '' );
+		$this->setExpectedException('\Aimeos\Client\JsonApi\Exception');
+		\Aimeos\Client\JsonApi\Locale\Factory::createClient($context, $templatePaths, '');
 	}
 
 
@@ -36,8 +36,8 @@ 
 		$context = \TestHelperJapi::getContext();
 		$templatePaths = \TestHelperJapi::getTemplatePaths();
 
-		$this->setExpectedException( '\Aimeos\Client\JsonApi\Exception' );
-		\Aimeos\Client\JsonApi\Locale\Factory::createClient( $context, $templatePaths, '%^' );
+		$this->setExpectedException('\Aimeos\Client\JsonApi\Exception');
+		\Aimeos\Client\JsonApi\Locale\Factory::createClient($context, $templatePaths, '%^');
 	}
 
 
@@ -46,7 +46,7 @@ 
 		$context = \TestHelperJapi::getContext();
 		$templatePaths = \TestHelperJapi::getTemplatePaths();
 
-		$this->setExpectedException( '\Aimeos\Client\JsonApi\Exception' );
-		\Aimeos\Client\JsonApi\Locale\Factory::createClient( $context, $templatePaths, 'locale', '%^' );
+		$this->setExpectedException('\Aimeos\Client\JsonApi\Exception');
+		\Aimeos\Client\JsonApi\Locale\Factory::createClient($context, $templatePaths, 'locale', '%^');
 	}
 }
\ No newline at end of file

client/jsonapi/tests/Client/JsonApi/Locale/StandardTest.php

Spacing +60 added lines, -60 removed lines

@@ -22,20 +22,20 @@ 
 		$templatePaths = \TestHelperJapi::getTemplatePaths();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Client\JsonApi\Locale\Standard( $this->context, $this->view, $templatePaths, 'locale' );
+		$this->object = new \Aimeos\Client\JsonApi\Locale\Standard($this->context, $this->view, $templatePaths, 'locale');
 	}
 
 
 	public function testGetItem()
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($this->context, 'locale');
 		$search = $localeManager->createSearch();
-		$search->setSortations( [$search->sort( '+', 'locale.position' )] );
-		$search->setSlice( 0, 1 );
-		$localeItems = $localeManager->searchItems( $search );
+		$search->setSortations([$search->sort('+', 'locale.position')]);
+		$search->setSlice(0, 1);
+		$localeItems = $localeManager->searchItems($search);
 
-		if( ( $localeItem = reset( $localeItems ) ) === false ) {
-			throw new \Exception( 'No locale item found' );
+		if (($localeItem = reset($localeItems)) === false) {
+			throw new \Exception('No locale item found');
 		}
 
 
@@ -46,24 +46,24 @@ 
 			)
 		);
 
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Allow' ) ) );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Allow')));
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 'locale', $result['data']['type'] );
-		$this->assertGreaterThan( 0, $result['data']['attributes']['locale.id'] );
-		$this->assertEquals( 'de', $result['data']['attributes']['locale.languageid'] );
-		$this->assertEquals( 'EUR', $result['data']['attributes']['locale.currencyid'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals('locale', $result['data']['type']);
+		$this->assertGreaterThan(0, $result['data']['attributes']['locale.id']);
+		$this->assertEquals('de', $result['data']['attributes']['locale.languageid']);
+		$this->assertEquals('EUR', $result['data']['attributes']['locale.currencyid']);
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -75,25 +75,25 @@ 
 			),
 			'sort' => 'locale.position',
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Allow' ) ) );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Allow')));
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'locale', $result['data'][0]['type'] );
-		$this->assertEquals( 3, count( $result['data'][0]['attributes'] ) );
-		$this->assertEquals( 'en', $result['data'][0]['attributes']['locale.languageid'] );
-		$this->assertEquals( 'EUR', $result['data'][0]['attributes']['locale.currencyid'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('locale', $result['data'][0]['type']);
+		$this->assertEquals(3, count($result['data'][0]['attributes']));
+		$this->assertEquals('en', $result['data'][0]['attributes']['locale.languageid']);
+		$this->assertEquals('EUR', $result['data'][0]['attributes']['locale.currencyid']);
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -101,20 +101,20 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'>=' => array( 'locale.position' => 0 ),
+				'>=' => array('locale.position' => 0),
 			),
 			'sort' => '-locale.position',
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -122,21 +122,21 @@ 
 	{
 		$templatePaths = \TestHelperJapi::getTemplatePaths();
 
-		$object = $this->getMockBuilder( '\Aimeos\Client\JsonApi\Locale\Standard' )
-			->setConstructorArgs( [$this->context, $this->view, $templatePaths, 'locale'] )
-			->setMethods( ['getItems'] )
+		$object = $this->getMockBuilder('\Aimeos\Client\JsonApi\Locale\Standard')
+			->setConstructorArgs([$this->context, $this->view, $templatePaths, 'locale'])
+			->setMethods(['getItems'])
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getItems' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception() ) );
+		$object->expects($this->once())->method('getItems')
+			->will($this->throwException(new \Aimeos\MShop\Exception()));
 
 
-		$response = $object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 404, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(404, $response->getStatusCode());
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
@@ -144,20 +144,20 @@ 
 	{
 		$templatePaths = \TestHelperJapi::getTemplatePaths();
 
-		$object = $this->getMockBuilder( '\Aimeos\Client\JsonApi\Locale\Standard' )
-			->setConstructorArgs( [$this->context, $this->view, $templatePaths, 'locale'] )
-			->setMethods( ['getItems'] )
+		$object = $this->getMockBuilder('\Aimeos\Client\JsonApi\Locale\Standard')
+			->setConstructorArgs([$this->context, $this->view, $templatePaths, 'locale'])
+			->setMethods(['getItems'])
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getItems' )
-			->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('getItems')
+			->will($this->throwException(new \Exception()));
 
 
-		$response = $object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 500, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(500, $response->getStatusCode());
+		$this->assertArrayHasKey('errors', $result);
 	}
 }
\ No newline at end of file