aimeos / ai-client-jsonapi

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

Spacing +98 added lines, -98 removed lines

@@ -22,61 +22,61 @@ 
 		$templatePaths = \TestHelperJapi::getTemplatePaths();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Client\JsonApi\Product\Standard( $this->context, $this->view, $templatePaths, 'product' );
+		$this->object = new \Aimeos\Client\JsonApi\Product\Standard($this->context, $this->view, $templatePaths, 'product');
 	}
 
 
 	public function testAggregateAttribute()
 	{
-		$params = array( 'aggregate' => 'index.attribute.id' );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$params = array('aggregate' => 'index.attribute.id');
+		$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( 13, $result['meta']['total'] );
-		$this->assertEquals( 13, count( $result['data'] ) );
-		$this->assertGreaterThan( 0, $result['data'][0]['id'] );
-		$this->assertGreaterThan( 0, $result['data'][0]['attributes'] );
-		$this->assertEquals( 'index.attribute.id', $result['data'][0]['type'] );
+		$this->assertEquals(13, $result['meta']['total']);
+		$this->assertEquals(13, count($result['data']));
+		$this->assertGreaterThan(0, $result['data'][0]['id']);
+		$this->assertGreaterThan(0, $result['data'][0]['attributes']);
+		$this->assertEquals('index.attribute.id', $result['data'][0]['type']);
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testAggregateCatalog()
 	{
-		$params = array( 'aggregate' => 'index.catalog.id' );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$params = array('aggregate' => 'index.catalog.id');
+		$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( 4, $result['meta']['total'] );
-		$this->assertEquals( 4, count( $result['data'] ) );
-		$this->assertGreaterThan( 0, $result['data'][0]['id'] );
-		$this->assertGreaterThan( 0, $result['data'][0]['attributes'] );
-		$this->assertEquals( 'index.catalog.id', $result['data'][0]['type'] );
+		$this->assertEquals(4, $result['meta']['total']);
+		$this->assertEquals(4, count($result['data']));
+		$this->assertGreaterThan(0, $result['data'][0]['id']);
+		$this->assertGreaterThan(0, $result['data'][0]['attributes']);
+		$this->assertEquals('index.catalog.id', $result['data'][0]['type']);
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testGetItem()
 	{
-		$prodId = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNE' )->getId();
+		$prodId = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNE')->getId();
 		$params = array(
 			'id' => $prodId,
 			'fields' => array(
@@ -86,88 +86,88 @@ 
 			'include' => 'attribute,media,price,product,product/property,text'
 		);
 
-		$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( 'product', $result['data']['type'] );
-		$this->assertEquals( 6, count( $result['data']['attributes']['text'] ) );
-		$this->assertEquals( 2, count( $result['data']['attributes']['price'] ) );
-		$this->assertEquals( 4, count( $result['data']['attributes']['media'] ) );
-		$this->assertEquals( 4, count( $result['data']['attributes']['product/property'] ) );
-		$this->assertEquals( 5, count( $result['data']['relationships']['product']['data'] ) );
-		$this->assertEquals( 5, count( $result['data']['relationships']['attribute']['data'] ) );
-		$this->assertEquals( 12, count( $result['included'] ) );
-		$this->assertArrayHaskey( 'self', $result['included'][0]['links'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals('product', $result['data']['type']);
+		$this->assertEquals(6, count($result['data']['attributes']['text']));
+		$this->assertEquals(2, count($result['data']['attributes']['price']));
+		$this->assertEquals(4, count($result['data']['attributes']['media']));
+		$this->assertEquals(4, count($result['data']['attributes']['product/property']));
+		$this->assertEquals(5, count($result['data']['relationships']['product']['data']));
+		$this->assertEquals(5, count($result['data']['relationships']['attribute']['data']));
+		$this->assertEquals(12, count($result['included']));
+		$this->assertArrayHaskey('self', $result['included'][0]['links']);
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testGetItems()
 	{
-		$catId = \Aimeos\MShop\Factory::createManager( $this->context, 'catalog' )->findItem( 'cafe' )->getId();
+		$catId = \Aimeos\MShop\Factory::createManager($this->context, 'catalog')->findItem('cafe')->getId();
 		$params = array(
-			'filter' => array( 'f_catid' => $catId ),
+			'filter' => array('f_catid' => $catId),
 			'fields' => array(
 				'product' => 'product.id,product.label'
 			),
 			'sort' => '-product.id',
 			'include' => 'attribute,text,product,product/property'
 		);
-		$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 );
-
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Allow' ) ) );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
-
-		$this->assertEquals( 2, $result['meta']['total'] );
-		$this->assertEquals( 2, count( $result['data'] ) );
-		$this->assertEquals( 'product', $result['data'][0]['type'] );
-		$this->assertEquals( 4, count( $result['data'][0]['attributes'] ) );
-		$this->assertEquals( 6, count( $result['data'][0]['attributes']['text'] ) );
-		$this->assertEquals( 4, count( $result['data'][0]['attributes']['product/property'] ) );
-		$this->assertEquals( 5, count( $result['data'][0]['relationships']['attribute']['data'] ) );
-		$this->assertEquals( 5, count( $result['data'][0]['relationships']['product']['data'] ) );
-		$this->assertEquals( 24, count( $result['included'] ) );
-
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$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);
+
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Allow')));
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
+
+		$this->assertEquals(2, $result['meta']['total']);
+		$this->assertEquals(2, count($result['data']));
+		$this->assertEquals('product', $result['data'][0]['type']);
+		$this->assertEquals(4, count($result['data'][0]['attributes']));
+		$this->assertEquals(6, count($result['data'][0]['attributes']['text']));
+		$this->assertEquals(4, count($result['data'][0]['attributes']['product/property']));
+		$this->assertEquals(5, count($result['data'][0]['relationships']['attribute']['data']));
+		$this->assertEquals(5, count($result['data'][0]['relationships']['product']['data']));
+		$this->assertEquals(24, count($result['included']));
+
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testGetItemsCriteria()
 	{
-		$catId = \Aimeos\MShop\Factory::createManager( $this->context, 'catalog' )->findItem( 'cafe' )->getId();
+		$catId = \Aimeos\MShop\Factory::createManager($this->context, 'catalog')->findItem('cafe')->getId();
 		$params = array(
 			'filter' => array(
 				'f_catid' => $catId,
 				'f_search' => 'Cafe',
 				'f_listtype' => ['unittype13', 'unittype19'],
-				'==' => array( 'product.type.code' => 'default' ),
+				'==' => array('product.type.code' => 'default'),
 			),
 			'sort' => '-product.id',
 		);
-		$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( 2, $result['meta']['total'] );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(2, $result['meta']['total']);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -175,21 +175,21 @@ 
 	{
 		$templatePaths = \TestHelperJapi::getTemplatePaths();
 
-		$object = $this->getMockBuilder( '\Aimeos\Client\JsonApi\Product\Standard' )
-			->setConstructorArgs( [$this->context, $this->view, $templatePaths, 'product'] )
-			->setMethods( ['getItems'] )
+		$object = $this->getMockBuilder('\Aimeos\Client\JsonApi\Product\Standard')
+			->setConstructorArgs([$this->context, $this->view, $templatePaths, 'product'])
+			->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);
 	}
 
 
@@ -197,20 +197,20 @@ 
 	{
 		$templatePaths = \TestHelperJapi::getTemplatePaths();
 
-		$object = $this->getMockBuilder( '\Aimeos\Client\JsonApi\Product\Standard' )
-			->setConstructorArgs( [$this->context, $this->view, $templatePaths, 'product'] )
-			->setMethods( ['getItems'] )
+		$object = $this->getMockBuilder('\Aimeos\Client\JsonApi\Product\Standard')
+			->setConstructorArgs([$this->context, $this->view, $templatePaths, 'product'])
+			->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

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

Spacing +18 added lines, -18 removed lines

@@ -22,22 +22,22 @@ 
 		$templatePaths = \TestHelperJapi::getTemplatePaths();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Client\JsonApi\Standard( $this->context, $this->view, $templatePaths, '' );
+		$this->object = new \Aimeos\Client\JsonApi\Standard($this->context, $this->view, $templatePaths, '');
 	}
 
 
 	public function testOptions()
 	{
-		$response = $this->object->options( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->options($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( null, $result['meta']['prefix'] );
-		$this->assertGreaterThan( 0, count( $result['meta']['resources'] ) );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(null, $result['meta']['prefix']);
+		$this->assertGreaterThan(0, count($result['meta']['resources']));
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -45,20 +45,20 @@ 
 	{
 		$templatePaths = \TestHelperJapi::getTemplatePaths();
 
-		$object = $this->getMockBuilder( '\Aimeos\Client\JsonApi\Standard' )
-			->setConstructorArgs( [$this->context, $this->view, $templatePaths, ''] )
-			->setMethods( ['getContext'] )
+		$object = $this->getMockBuilder('\Aimeos\Client\JsonApi\Standard')
+			->setConstructorArgs([$this->context, $this->view, $templatePaths, ''])
+			->setMethods(['getContext'])
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getContext' )
-			->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('getContext')
+			->will($this->throwException(new \Exception()));
 
 
-		$response = $object->options( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $object->options($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

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

Spacing +8 added lines, -8 removed lines

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

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

Spacing +65 added lines, -65 removed lines

@@ -22,14 +22,14 @@ 
 		$templatePaths = \TestHelperJapi::getTemplatePaths();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Client\JsonApi\Attribute\Standard( $this->context, $this->view, $templatePaths, 'attribute' );
+		$this->object = new \Aimeos\Client\JsonApi\Attribute\Standard($this->context, $this->view, $templatePaths, 'attribute');
 	}
 
 
 	public function testGetItem()
 	{
-		$attrManager = \Aimeos\MShop\Factory::createManager( $this->context, 'attribute' );
-		$attrId = $attrManager->findItem( 'xs', [], 'product', 'size' )->getId();
+		$attrManager = \Aimeos\MShop\Factory::createManager($this->context, 'attribute');
+		$attrId = $attrManager->findItem('xs', [], 'product', 'size')->getId();
 
 		$params = array(
 			'id' => $attrId,
@@ -40,31 +40,31 @@ 
 			'include' => 'media,price,text'
 		);
 
-		$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( 'attribute', $result['data']['type'] );
-		$this->assertEquals( 3, count( $result['data']['attributes']['text'] ) );
-		$this->assertEquals( 1, count( $result['data']['attributes']['price'] ) );
-		$this->assertEquals( 1, count( $result['data']['attributes']['media'] ) );
-		$this->assertEquals( 0, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals('attribute', $result['data']['type']);
+		$this->assertEquals(3, count($result['data']['attributes']['text']));
+		$this->assertEquals(1, count($result['data']['attributes']['price']));
+		$this->assertEquals(1, count($result['data']['attributes']['media']));
+		$this->assertEquals(0, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testGetItems()
 	{
-		$this->context->getConfig()->set( 'client/jsonapi/attribute/types', ['size', 'length', 'width'] );
+		$this->context->getConfig()->set('client/jsonapi/attribute/types', ['size', 'length', 'width']);
 
 		$params = array(
 			'fields' => array(
@@ -73,29 +73,29 @@ 
 			'include' => 'media,price,text',
 			'sort' => 'attribute.position',
 		);
-		$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 );
-
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Allow' ) ) );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
-
-		$this->assertEquals( 17, $result['meta']['total'] );
-		$this->assertEquals( 17, count( $result['data'] ) );
-		$this->assertEquals( 'attribute', $result['data'][0]['type'] );
-		$this->assertEquals( 6, count( $result['data'][0]['attributes'] ) );
-		$this->assertEquals( 'size', $result['data'][0]['attributes']['attribute.type'] );
-		$this->assertEquals( 'xs', $result['data'][0]['attributes']['attribute.code'] );
-		$this->assertEquals( 0, count( $result['included'] ) );
-
-		foreach( $result['data'] as $entry ) {
-			$this->assertContains( $entry['attributes']['attribute.type'], ['size', 'length', 'width'] );
+		$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);
+
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Allow')));
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
+
+		$this->assertEquals(17, $result['meta']['total']);
+		$this->assertEquals(17, count($result['data']));
+		$this->assertEquals('attribute', $result['data'][0]['type']);
+		$this->assertEquals(6, count($result['data'][0]['attributes']));
+		$this->assertEquals('size', $result['data'][0]['attributes']['attribute.type']);
+		$this->assertEquals('xs', $result['data'][0]['attributes']['attribute.code']);
+		$this->assertEquals(0, count($result['included']));
+
+		foreach ($result['data'] as $entry) {
+			$this->assertContains($entry['attributes']['attribute.type'], ['size', 'length', 'width']);
 		}
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -103,20 +103,20 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'attribute.type.code' => 'size' ),
+				'==' => array('attribute.type.code' => 'size'),
 			),
 			'sort' => 'attribute.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( 6, $result['meta']['total'] );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(6, $result['meta']['total']);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -124,21 +124,21 @@ 
 	{
 		$templatePaths = \TestHelperJapi::getTemplatePaths();
 
-		$object = $this->getMockBuilder( '\Aimeos\Client\JsonApi\Attribute\Standard' )
-			->setConstructorArgs( [$this->context, $this->view, $templatePaths, 'attribute'] )
-			->setMethods( ['getItems'] )
+		$object = $this->getMockBuilder('\Aimeos\Client\JsonApi\Attribute\Standard')
+			->setConstructorArgs([$this->context, $this->view, $templatePaths, 'attribute'])
+			->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);
 	}
 
 
@@ -146,20 +146,20 @@ 
 	{
 		$templatePaths = \TestHelperJapi::getTemplatePaths();
 
-		$object = $this->getMockBuilder( '\Aimeos\Client\JsonApi\Attribute\Standard' )
-			->setConstructorArgs( [$this->context, $this->view, $templatePaths, 'attribute'] )
-			->setMethods( ['getItems'] )
+		$object = $this->getMockBuilder('\Aimeos\Client\JsonApi\Attribute\Standard')
+			->setConstructorArgs([$this->context, $this->view, $templatePaths, 'attribute'])
+			->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

client/jsonapi/tests/TestHelperJapi.php

Spacing +42 added lines, -42 removed lines

@@ -18,46 +18,46 @@ 
 
 		$includepaths = $aimeos->getIncludePaths();
 		$includepaths[] = get_include_path();
-		set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
+		set_include_path(implode(PATH_SEPARATOR, $includepaths));
 	}
 
 
-	public static function getContext( $site = 'unittest' )
+	public static function getContext($site = 'unittest')
 	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
-			self::$context[$site]->setView( self::getView( self::$context[$site]->getConfig() ) );
+		if (!isset(self::$context[$site])) {
+			self::$context[$site] = self::createContext($site);
+			self::$context[$site]->setView(self::getView(self::$context[$site]->getConfig()));
 		}
 
 		return clone self::$context[$site];
 	}
 
 
-	public static function getView( \Aimeos\MW\Config\Iface $config )
+	public static function getView(\Aimeos\MW\Config\Iface $config)
 	{
-		$view = new \Aimeos\MW\View\Standard( self::getTemplatePaths() );
+		$view = new \Aimeos\MW\View\Standard(self::getTemplatePaths());
 
-		$trans = new \Aimeos\MW\Translation\None( 'en' );
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $trans );
-		$view->addHelper( 'translate', $helper );
+		$trans = new \Aimeos\MW\Translation\None('en');
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $trans);
+		$view->addHelper('translate', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Url\Standard( $view, 'baseurl' );
-		$view->addHelper( 'url', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Url\Standard($view, 'baseurl');
+		$view->addHelper('url', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, '.', '' );
-		$view->addHelper( 'number', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, '.', '');
+		$view->addHelper('number', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Date\Standard( $view, 'Y-m-d' );
-		$view->addHelper( 'date', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Date\Standard($view, 'Y-m-d');
+		$view->addHelper('date', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Request\Standard( $view, new \Zend\Diactoros\ServerRequest() );
-		$view->addHelper( 'request', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Request\Standard($view, new \Zend\Diactoros\ServerRequest());
+		$view->addHelper('request', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Response\Standard( $view, new \Zend\Diactoros\Response() );
-		$view->addHelper( 'response', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Response\Standard($view, new \Zend\Diactoros\Response());
+		$view->addHelper('response', $helper);
 
 		return $view;
 	}
@@ -65,26 +65,26 @@ 
 
 	public static function getTemplatePaths()
 	{
-		return self::getAimeos()->getCustomPaths( 'client/jsonapi/templates' );
+		return self::getAimeos()->getCustomPaths('client/jsonapi/templates');
 	}
 
 
 	private static function getAimeos()
 	{
-		if( !isset( self::$aimeos ) )
+		if (!isset(self::$aimeos))
 		{
 			require_once 'Bootstrap.php';
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
 
-			$extdir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) );
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true );
+			$extdir = dirname(dirname(dirname(dirname(__DIR__))));
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true);
 		}
 
 		return self::$aimeos;
 	}
 
 
-	private static function createContext( $site )
+	private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 		$aimeos = self::getAimeos();
@@ -93,36 +93,36 @@ 
 		$paths = $aimeos->getConfigPaths();
 		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( array(), $paths );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray(array(), $paths);
+		$ctx->setConfig($conf);
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $conf );
-		$ctx->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\DBAL($conf);
+		$ctx->setDatabaseManager($dbm);
 
 
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
-		$ctx->setLogger( $logger );
+		$logger = new \Aimeos\MW\Logger\File($site . '.log', \Aimeos\MW\Logger\Base::DEBUG);
+		$ctx->setLogger($logger);
 
 
 		$cache = new \Aimeos\MW\Cache\None();
-		$ctx->setCache( $cache );
+		$ctx->setCache($cache);
 
 
-		$i18n = new \Aimeos\MW\Translation\None( 'en' );
-		$ctx->setI18n( array( 'en' => $i18n ) );
+		$i18n = new \Aimeos\MW\Translation\None('en');
+		$ctx->setI18n(array('en' => $i18n));
 
 
 		$session = new \Aimeos\MW\Session\None();
-		$ctx->setSession( $session );
+		$ctx->setSession($session);
 
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
-		$locale = $localeManager->bootstrap( $site, '', '', false );
-		$ctx->setLocale( $locale );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
+		$locale = $localeManager->bootstrap($site, '', '', false);
+		$ctx->setLocale($locale);
 
 
-		$ctx->setEditor( 'ai-client-jsonapi:unittest' );
+		$ctx->setEditor('ai-client-jsonapi:unittest');
 
 		return $ctx;
 	}

client/jsonapi/tests/bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -4,17 +4,17 @@
  * Set error reporting to maximum
  */
 error_reporting( -1 );
-ini_set( 'display_errors', true );
+ini_set('display_errors', true);
 
-date_default_timezone_set( 'UTC' );
+date_default_timezone_set('UTC');
 
 /*
  * Set locale settings to reasonable defaults
  */
-setlocale( LC_ALL, 'en_US.UTF-8' );
-setlocale( LC_CTYPE, 'en_US.UTF-8' );
-setlocale( LC_NUMERIC, 'POSIX' );
-setlocale( LC_TIME, 'POSIX' );
+setlocale(LC_ALL, 'en_US.UTF-8');
+setlocale(LC_CTYPE, 'en_US.UTF-8');
+setlocale(LC_NUMERIC, 'POSIX');
+setlocale(LC_TIME, 'POSIX');
 
 
 require_once 'TestHelperJapi.php';

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

Spacing +62 added lines, -62 removed lines

@@ -22,7 +22,7 @@ 
  * @see client/jsonapi/url/action
  * @see client/jsonapi/url/config
  */
-$target = $this->config( 'client/jsonapi/url/target' );
+$target = $this->config('client/jsonapi/url/target');
 
 /** client/jsonapi/url/controller
  * Name of the client whose action should be called
@@ -38,7 +38,7 @@ 
  * @see client/jsonapi/url/action
  * @see client/jsonapi/url/config
  */
-$cntl = $this->config( 'client/jsonapi/url/controller', 'jsonapi' );
+$cntl = $this->config('client/jsonapi/url/controller', 'jsonapi');
 
 /** client/jsonapi/url/action
  * Name of the action that should create the output
@@ -54,7 +54,7 @@ 
  * @see client/jsonapi/url/controller
  * @see client/jsonapi/url/config
  */
-$action = $this->config( 'client/jsonapi/url/action', 'get' );
+$action = $this->config('client/jsonapi/url/action', 'get');
 
 /** client/jsonapi/url/config
  * Associative list of configuration options used for generating the URL
@@ -76,43 +76,43 @@ 
  * @see client/jsonapi/url/controller
  * @see client/jsonapi/url/action
  */
-$config = $this->config( 'client/jsonapi/url/config', array() );
+$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', 48 ), 1 );
+$total = $this->get('total', 0);
+$offset = max($this->param('page/offset', 0), 0);
+$limit = max($this->param('page/limit', 48), 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);
 
 
-$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\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(
@@ -120,36 +120,36 @@ 
 		'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\Product\Item\Iface )
+	if ($item instanceof \Aimeos\MShop\Product\Item\Iface)
 	{
-		foreach( $item->getPropertyItems() as $propertyItem ) {
+		foreach ($item->getPropertyItems() as $propertyItem) {
 			$entry['attributes']['product/property'][] = $propertyItem->toArray();
 		}
 	}
 
-	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();
 			}
 		}
@@ -159,29 +159,29 @@ 
 };
 
 
-$refFcn = function( \Aimeos\MShop\Common\Item\Iface $item, $level ) use ( $map, $entryFcn, &$refFcn )
+$refFcn = function(\Aimeos\MShop\Common\Item\Iface $item, $level) use ($map, $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
 		) {
 			$id = $refItem->getId();
 
-			if( isset( $map[$domain][$id] ) ) {
+			if (isset($map[$domain][$id])) {
 				$refItem = $map[$domain][$id];
 			}
 
-			$list[] = $entryFcn( $refItem );
-			$list = array_merge( $list, $refFcn( $refItem, ++$level ) );
+			$list[] = $entryFcn($refItem);
+			$list = array_merge($list, $refFcn($refItem, ++$level));
 		}
 	}
 
@@ -197,51 +197,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 $prodId => $productItem )
+				foreach ($items as $prodId => $productItem)
 				{
-					$data[] = $entryFcn( $productItem );
-					$included = array_merge( $included, $refFcn( $productItem, 0 ) );
+					$data[] = $entryFcn($productItem);
+					$included = array_merge($included, $refFcn($productItem, 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

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

client/jsonapi/templates/options-default.php

Spacing +10 added lines, -10 removed lines

@@ -1,26 +1,26 @@
 <?php
 
-$target = $this->config( 'admin/jsonadm/url/target' );
-$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonapi' );
-$action = $this->config( 'admin/jsonadm/url/action', 'get' );
-$config = $this->config( 'admin/jsonadm/url/config', [] );
+$target = $this->config('admin/jsonadm/url/target');
+$cntl = $this->config('admin/jsonadm/url/controller', 'jsonapi');
+$action = $this->config('admin/jsonadm/url/action', 'get');
+$config = $this->config('admin/jsonadm/url/config', []);
 
 $resources = [];
-foreach( $this->get( 'resources', [] ) as $resource ) {
-	$resources[$resource] = $this->url( $target, $cntl, $action, array( 'resource' => $resource, 'id' => '' ), [], $config );
+foreach ($this->get('resources', []) as $resource) {
+	$resources[$resource] = $this->url($target, $cntl, $action, array('resource' => $resource, 'id' => ''), [], $config);
 }
 
 ?>
 {
 	"meta": {
-		"prefix": <?php echo json_encode( $this->get( 'prefix' ) ); ?>,
-		"resources": <?php echo json_encode( $resources ); ?>
+		"prefix": <?php echo json_encode($this->get('prefix')); ?>,
+		"resources": <?php echo json_encode($resources); ?>
 
 	}
 
-	<?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 endif; ?>
 }

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

Spacing +41 added lines, -41 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\Stock\Item\Iface $item ) use ( $fields, $view, $target, $cntl, $action, $config )
+$entryFcn = function(\Aimeos\MShop\Stock\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,8 +54,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,
@@ -73,46 +73,46 @@ 
 	},
 
 	"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 $stockId => $stockItem ) {
-					$data[] = $entryFcn( $stockItem );
+				foreach ($items as $stockId => $stockItem) {
+					$data[] = $entryFcn($stockItem);
 				}
 			}
 			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

@@ -105,8 +105,7 @@
 				foreach( $items as $stockId => $stockItem ) {
 					$data[] = $entryFcn( $stockItem );
 				}
-			}
-			else
+			} else
 			{
 				$data = $entryFcn( $items );
 			}