aimeos / ai-admin-jsonadm

admin/jsonadm/tests/Admin/JsonAdm/Customer/StandardTest.php

Spacing +31 added lines, -31 removed lines

@@ -21,9 +21,9 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Customer\Standard( $this->context, 'customer' );
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JsonAdm\Customer\Standard($this->context, 'customer');
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
+		$this->object->setView($this->view);
 	}
 
 
@@ -31,28 +31,28 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'customer.code' => 'UTC001' )
+				'==' => array('customer.code' => 'UTC001')
 			),
 			'include' => 'text,customer/address'
 		);
-		$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( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'customer', $result['data'][0]['type'] );
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['text'] ) );
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['customer/address'] ) );
-		$this->assertEquals( 2, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('customer', $result['data'][0]['type']);
+		$this->assertEquals(1, count($result['data'][0]['relationships']['text']));
+		$this->assertEquals(1, count($result['data'][0]['relationships']['customer/address']));
+		$this->assertEquals(2, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -60,7 +60,7 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'=~' => array( 'customer.code' => 'UTC' )
+				'=~' => array('customer.code' => 'UTC')
 			),
 			'fields' => array(
 				'customer' => 'customer.id,customer.label'
@@ -68,23 +68,23 @@ 
 			'sort' => 'customer.id',
 			'include' => 'customer/address'
 		);
-		$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( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 3, $result['meta']['total'] );
-		$this->assertEquals( 3, count( $result['data'] ) );
-		$this->assertEquals( 'customer', $result['data'][0]['type'] );
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['customer/address'] ) );
-		$this->assertEquals( 4, count( $result['included'] ) );
+		$this->assertEquals(3, $result['meta']['total']);
+		$this->assertEquals(3, count($result['data']));
+		$this->assertEquals('customer', $result['data'][0]['type']);
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
+		$this->assertEquals(1, count($result['data'][0]['relationships']['customer/address']));
+		$this->assertEquals(4, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

admin/jsonadm/tests/Admin/JsonAdm/Catalog/StandardTest.php

Spacing +73 added lines, -73 removed lines

@@ -21,9 +21,9 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Catalog\Standard( $this->context, 'catalog' );
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JsonAdm\Catalog\Standard($this->context, 'catalog');
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
+		$this->object->setView($this->view);
 	}
 
 
@@ -31,142 +31,142 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'catalog.code' => 'cafe' )
+				'==' => array('catalog.code' => 'cafe')
 			),
 			'include' => '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( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'catalog', $result['data'][0]['type'] );
-		$this->assertEquals( 6, count( $result['data'][0]['relationships']['text'] ) );
-		$this->assertEquals( 6, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('catalog', $result['data'][0]['type']);
+		$this->assertEquals(6, count($result['data'][0]['relationships']['text']));
+		$this->assertEquals(6, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testGetTree()
 	{
 		$params = array(
-			'id' => $this->getCatalogItem( 'root' )->getId(),
+			'id' => $this->getCatalogItem('root')->getId(),
 			'include' => 'catalog,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( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 'catalog', $result['data']['type'] );
-		$this->assertEquals( 2, count( $result['data']['relationships']['catalog'] ) );
-		$this->assertEquals( 2, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals('catalog', $result['data']['type']);
+		$this->assertEquals(2, count($result['data']['relationships']['catalog']));
+		$this->assertEquals(2, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testPatch()
 	{
-		$stub = $this->getCatalogMock( array( 'getItem', 'moveItem', 'saveItem' ) );
+		$stub = $this->getCatalogMock(array('getItem', 'moveItem', 'saveItem'));
 
-		$stub->expects( $this->once() )->method( 'moveItem' );
-		$stub->expects( $this->once() )->method( 'saveItem' )
-			->will( $this->returnValue( $stub->createItem() ) );
-		$stub->expects( $this->exactly( 2 ) )->method( 'getItem' ) // 2x due to decorator
-			->will( $this->returnValue( $stub->createItem() ) );
+		$stub->expects($this->once())->method('moveItem');
+		$stub->expects($this->once())->method('saveItem')
+			->will($this->returnValue($stub->createItem()));
+		$stub->expects($this->exactly(2))->method('getItem') // 2x due to decorator
+			->will($this->returnValue($stub->createItem()));
 
 
-		$params = array( 'id' => '-1' );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$params = array('id' => '-1');
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
 		$body = '{"data": {"parentid": "1", "targetid": 2, "type": "catalog", "attributes": {"catalog.label": "test"}}}';
-		$request = $this->view->request()->withBody( $this->view->response()->createStreamFromString( $body ) );
+		$request = $this->view->request()->withBody($this->view->response()->createStreamFromString($body));
 
-		$response = $this->object->patch( $request, $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->patch($request, $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'data', $result );
-		$this->assertEquals( 'catalog', $result['data']['type'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertArrayHasKey('data', $result);
+		$this->assertEquals('catalog', $result['data']['type']);
 
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testPost()
 	{
-		$stub = $this->getCatalogMock( array( 'getItem', 'insertItem' ) );
+		$stub = $this->getCatalogMock(array('getItem', 'insertItem'));
 
-		$stub->expects( $this->any() )->method( 'getItem' )
-			->will( $this->returnValue( $stub->createItem() ) );
-		$stub->expects( $this->once() )->method( 'insertItem' );
+		$stub->expects($this->any())->method('getItem')
+			->will($this->returnValue($stub->createItem()));
+		$stub->expects($this->once())->method('insertItem');
 
 
 		$body = '{"data": {"type": "catalog", "attributes": {"catalog.code": "test", "catalog.label": "Test catalog"}}}';
-		$request = $this->view->request()->withBody( $this->view->response()->createStreamFromString( $body ) );
+		$request = $this->view->request()->withBody($this->view->response()->createStreamFromString($body));
 
-		$response = $this->object->post( $request, $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->post($request, $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 201, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(201, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'data', $result );
-		$this->assertEquals( 'catalog', $result['data']['type'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertArrayHasKey('data', $result);
+		$this->assertEquals('catalog', $result['data']['type']);
 
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
-	protected function getCatalogItem( $code )
+	protected function getCatalogItem($code)
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'catalog.code', $code ) );
-		$items = $manager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'catalog.code', $code));
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'No catalog item with code "%1$s" found', $code ) );
+		if (($item = reset($items)) === false) {
+			throw new \RuntimeException(sprintf('No catalog item with code "%1$s" found', $code));
 		}
 
 		return $item;
 	}
 
 
-	protected function getCatalogMock( array $methods )
+	protected function getCatalogMock(array $methods)
 	{
 		$name = 'ClientJsonAdmStandard';
-		$this->context->getConfig()->set( 'mshop/catalog/manager/name', $name );
+		$this->context->getConfig()->set('mshop/catalog/manager/name', $name);
 
-		$stub = $this->getMockBuilder( '\\Aimeos\\MShop\\Catalog\\Manager\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( $methods )
+		$stub = $this->getMockBuilder('\\Aimeos\\MShop\\Catalog\\Manager\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods($methods)
 			->getMock();
 
-		\Aimeos\MShop\Product\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Catalog\\Manager\\' . $name, $stub );
+		\Aimeos\MShop\Product\Manager\Factory::injectManager('\\Aimeos\\MShop\\Catalog\\Manager\\' . $name, $stub);
 
 		return $stub;
 	}

admin/jsonadm/tests/Admin/JsonAdm/Order/StandardTest.php

Spacing +42 added lines, -42 removed lines

@@ -21,9 +21,9 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Order\Standard( $this->context, 'order' );
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JsonAdm\Order\Standard($this->context, 'order');
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
+		$this->object->setView($this->view);
 	}
 
 
@@ -31,25 +31,25 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'order.editor' => 'core:unittest' )
+				'==' => array('order.editor' => 'core:unittest')
 			),
 			'aggregate' => 'order.cdate',
 		);
-		$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( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'aggregate', $result['data'][0]['type'] );
-		$this->assertGreaterThan( 0, $result['data'][0]['attributes'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('aggregate', $result['data'][0]['type']);
+		$this->assertGreaterThan(0, $result['data'][0]['attributes']);
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -57,28 +57,28 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'order.datepayment' => '2008-02-15 12:34:56' )
+				'==' => array('order.datepayment' => '2008-02-15 12:34:56')
 			),
 			'include' => 'order/base,order/status'
 		);
-		$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( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'order', $result['data'][0]['type'] );
-		$this->assertEquals( 3, count( $result['data'][0]['relationships']['order/status'] ) );
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['order/base'] ) );
-		$this->assertEquals( 4, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('order', $result['data'][0]['type']);
+		$this->assertEquals(3, count($result['data'][0]['relationships']['order/status']));
+		$this->assertEquals(1, count($result['data'][0]['relationships']['order/base']));
+		$this->assertEquals(4, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -91,23 +91,23 @@ 
 			'sort' => 'order.id',
 			'include' => 'order/status'
 		);
-		$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( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertGreaterThanOrEqual( 4, $result['meta']['total'] );
-		$this->assertGreaterThanOrEqual( 4, count( $result['data'] ) );
-		$this->assertEquals( 'order', $result['data'][0]['type'] );
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
-		$this->assertGreaterThanOrEqual( 3, count( $result['data'][0]['relationships']['order/status'] ) );
-		$this->assertGreaterThanOrEqual( 11, count( $result['included'] ) );
+		$this->assertGreaterThanOrEqual(4, $result['meta']['total']);
+		$this->assertGreaterThanOrEqual(4, count($result['data']));
+		$this->assertEquals('order', $result['data'][0]['type']);
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
+		$this->assertGreaterThanOrEqual(3, count($result['data'][0]['relationships']['order/status']));
+		$this->assertGreaterThanOrEqual(11, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }

admin/jsonadm/tests/Admin/JsonAdm/Order/Base/StandardTest.php

Spacing +30 added lines, -30 removed lines

@@ -21,9 +21,9 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Order\Base\Standard( $this->context, 'order/base' );
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JsonAdm\Order\Base\Standard($this->context, 'order/base');
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
+		$this->object->setView($this->view);
 	}
 
 
@@ -31,28 +31,28 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'order.base.price' => '4800.00' )
+				'==' => array('order.base.price' => '4800.00')
 			),
 			'include' => 'order/base/address,order/base/product'
 		);
-		$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( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'order/base', $result['data'][0]['type'] );
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['order/base/address'] ) );
-		$this->assertEquals( 6, count( $result['data'][0]['relationships']['order/base/product'] ) );
-		$this->assertEquals( 7, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('order/base', $result['data'][0]['type']);
+		$this->assertEquals(1, count($result['data'][0]['relationships']['order/base/address']));
+		$this->assertEquals(6, count($result['data'][0]['relationships']['order/base/product']));
+		$this->assertEquals(7, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -65,23 +65,23 @@ 
 			'sort' => 'order.base.id',
 			'include' => 'order/base/product'
 		);
-		$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( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertGreaterThanOrEqual( 4, $result['meta']['total'] );
-		$this->assertGreaterThanOrEqual( 4, count( $result['data'] ) );
-		$this->assertEquals( 'order/base', $result['data'][0]['type'] );
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
-		$this->assertGreaterThanOrEqual( 4, count( $result['data'][0]['relationships']['order/base/product'] ) );
-		$this->assertGreaterThanOrEqual( 14, count( $result['included'] ) );
+		$this->assertGreaterThanOrEqual(4, $result['meta']['total']);
+		$this->assertGreaterThanOrEqual(4, count($result['data']));
+		$this->assertEquals('order/base', $result['data'][0]['type']);
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
+		$this->assertGreaterThanOrEqual(4, count($result['data'][0]['relationships']['order/base/product']));
+		$this->assertGreaterThanOrEqual(14, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

admin/jsonadm/tests/Admin/JsonAdm/Supplier/StandardTest.php

Spacing +30 added lines, -30 removed lines

@@ -21,9 +21,9 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Supplier\Standard( $this->context, 'supplier' );
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JsonAdm\Supplier\Standard($this->context, 'supplier');
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
+		$this->object->setView($this->view);
 	}
 
 
@@ -31,28 +31,28 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'supplier.code' => 'unitCode001' )
+				'==' => array('supplier.code' => 'unitCode001')
 			),
 			'include' => 'text,supplier/address'
 		);
-		$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( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'supplier', $result['data'][0]['type'] );
-		$this->assertEquals( 3, count( $result['data'][0]['relationships']['text'] ) );
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['supplier/address'] ) );
-		$this->assertEquals( 4, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('supplier', $result['data'][0]['type']);
+		$this->assertEquals(3, count($result['data'][0]['relationships']['text']));
+		$this->assertEquals(1, count($result['data'][0]['relationships']['supplier/address']));
+		$this->assertEquals(4, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -65,23 +65,23 @@ 
 			'sort' => 'supplier.id',
 			'include' => 'supplier/address'
 		);
-		$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( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 3, $result['meta']['total'] );
-		$this->assertEquals( 3, count( $result['data'] ) );
-		$this->assertEquals( 'supplier', $result['data'][0]['type'] );
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['supplier/address'] ) );
-		$this->assertEquals( 3, count( $result['included'] ) );
+		$this->assertEquals(3, $result['meta']['total']);
+		$this->assertEquals(3, count($result['data']));
+		$this->assertEquals('supplier', $result['data'][0]['type']);
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
+		$this->assertEquals(1, count($result['data'][0]['relationships']['supplier/address']));
+		$this->assertEquals(3, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

admin/jsonadm/src/Admin/JsonAdm/Common/Decorator/Iface.php

Spacing +1 added lines, -1 removed lines

@@ -27,5 +27,5 @@
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
 	 * @param string $path Name of the client separated by slashes, e.g "product/stock"
 	 */
-	public function __construct( \Aimeos\Admin\JsonAdm\Iface $client, \Aimeos\MShop\Context\Item\Iface $context, $path );
+	public function __construct(\Aimeos\Admin\JsonAdm\Iface $client, \Aimeos\MShop\Context\Item\Iface $context, $path);
 }
\ No newline at end of file

admin/jsonadm/src/Admin/JsonAdm/Common/Decorator/Base.php

Spacing +22 added lines, -22 removed lines

@@ -34,9 +34,9 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
 	 * @param string $path Name of the client separated by slashes, e.g "product/property"
 	 */
-	public function __construct( \Aimeos\Admin\JsonAdm\Iface $client, \Aimeos\MShop\Context\Item\Iface $context, $path )
+	public function __construct(\Aimeos\Admin\JsonAdm\Iface $client, \Aimeos\MShop\Context\Item\Iface $context, $path)
 	{
-		parent::__construct( $context, $path );
+		parent::__construct($context, $path);
 
 		$this->client = $client;
 	}
@@ -50,9 +50,9 @@ 
 	 * @return mixed Returns the value of the called method
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If method call failed
 	 */
-	public function __call( $name, array $param )
+	public function __call($name, array $param)
 	{
-		return @call_user_func_array( array( $this->client, $name ), $param );
+		return @call_user_func_array(array($this->client, $name), $param);
 	}
 
 
@@ -63,9 +63,9 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function delete( ServerRequestInterface $request, ResponseInterface $response )
+	public function delete(ServerRequestInterface $request, ResponseInterface $response)
 	{
-		return $this->client->delete( $request, $response );
+		return $this->client->delete($request, $response);
 	}
 
 
@@ -76,9 +76,9 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function get( ServerRequestInterface $request, ResponseInterface $response )
+	public function get(ServerRequestInterface $request, ResponseInterface $response)
 	{
-		return $this->client->get( $request, $response );
+		return $this->client->get($request, $response);
 	}
 
 
@@ -90,9 +90,9 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function patch( ServerRequestInterface $request, ResponseInterface $response )
+	public function patch(ServerRequestInterface $request, ResponseInterface $response)
 	{
-		return $this->client->patch( $request, $response );
+		return $this->client->patch($request, $response);
 	}
 
 
@@ -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->client->post( $request, $response );
+		return $this->client->post($request, $response);
 	}
 
 
@@ -118,9 +118,9 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function put( ServerRequestInterface $request, ResponseInterface $response )
+	public function put(ServerRequestInterface $request, ResponseInterface $response)
 	{
-		return $this->client->put( $request, $response );
+		return $this->client->put($request, $response);
 	}
 
 
@@ -133,9 +133,9 @@ 
 	 * @param string|null $prefix Form parameter prefix when nesting parameters is required
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function options( ServerRequestInterface $request, ResponseInterface $response, $prefix = null )
+	public function options(ServerRequestInterface $request, ResponseInterface $response, $prefix = null)
 	{
-		return $this->client->options( $request, $response, $prefix );
+		return $this->client->options($request, $response, $prefix);
 	}
 
 
@@ -156,11 +156,11 @@ 
 	 * @param \Aimeos\Bootstrap $aimeos The Aimeos bootstrap object
 	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
 	 */
-	public function setAimeos( \Aimeos\Bootstrap $aimeos )
+	public function setAimeos(\Aimeos\Bootstrap $aimeos)
 	{
-		parent::setAimeos( $aimeos );
+		parent::setAimeos($aimeos);
 
-		$this->client->setAimeos( $aimeos );
+		$this->client->setAimeos($aimeos);
 		return $this;
 	}
 
@@ -182,11 +182,11 @@ 
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the admin output
 	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
 	 */
-	public function setView( \Aimeos\MW\View\Iface $view )
+	public function setView(\Aimeos\MW\View\Iface $view)
 	{
-		parent::setView( $view );
+		parent::setView($view);
 
-		$this->client->setView( $view );
+		$this->client->setView($view);
 		return $this;
 	}
 

Doc Comments +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 	 * Sets the Aimeos bootstrap object
 	 *
 	 * @param \Aimeos\Bootstrap $aimeos The Aimeos bootstrap object
-	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
+	 * @return Base Reference to this object for fluent calls
 	 */
 	public function setAimeos( \Aimeos\Bootstrap $aimeos )
 	{
@@ -98,7 +98,7 @@ 
 	 * Sets the view object that will generate the admin output.
 	 *
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the admin output
-	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
+	 * @return Base Reference to this object for fluent calls
 	 */
 	public function setView( \Aimeos\MW\View\Iface $view )
 	{

admin/jsonadm/src/Admin/JsonAdm/Common/Factory/Iface.php

Spacing +1 added lines, -1 removed lines

@@ -28,5 +28,5 @@
 	 * @param string|null $name Name of the client implementation ("Standard" if null)
 	 * @return \Aimeos\Admin\JsonAdm\Iface Client Interface
 	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $path, $name = null );
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $path, $name = null);
 }
\ No newline at end of file

admin/jsonadm/src/Admin/JsonAdm/Common/Factory/Base.php

Spacing +37 added lines, -37 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -99,8 +99,7 @@
 				$decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/local', [] );
 				$client = self::addDecorators( $client, $decorators, $classprefix, $context, $path );
 			}
-		}
-		else
+		} else
 		{
 			$classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
 			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $path );