aimeos / ai-admin-jsonadm

admin/jsonadm/src/Admin/JsonAdm/Locale/Site/Standard.php

Spacing +19 added lines, -19 removed lines

@@ -110,7 +110,7 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function get( ServerRequestInterface $request, ResponseInterface $response )
+	public function get(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		/** admin/jsonadm/partials/locale/site/template-data
 		 * Relative path to the data partial template file for the locale site  client
@@ -127,9 +127,9 @@ 
 		 * @since 2016.07
 		 * @category Developer
 		 */
-		$this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/locale/site/template-data' ) );
+		$this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/locale/site/template-data'));
 
-		return parent::get( $request, $response );
+		return parent::get($request, $response);
 	}
 
 
@@ -141,16 +141,16 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'locale/site' );
-		$search = $this->initCriteria( $manager->createSearch(), $view->param() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'locale/site');
+		$search = $this->initCriteria($manager->createSearch(), $view->param());
 		$total = 1;
 
-		if( ( $id = $view->param( 'id' ) ) == null ) {
-			$view->data = $manager->searchItems( $search, [], $total );
+		if (($id = $view->param('id')) == null) {
+			$view->data = $manager->searchItems($search, [], $total);
 		} else {
-			$view->data = $manager->getTree( $id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $search );
+			$view->data = $manager->getTree($id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $search);
 		}
 
 		$view->childItems = [];
@@ -169,25 +169,25 @@ 
 	 * @param \stdClass $entry Object including "id" and "attributes" elements
 	 * @return \Aimeos\MShop\Common\Item\Iface New or updated item
 	 */
-	protected function saveEntry( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry )
+	protected function saveEntry(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry)
 	{
-		if( isset( $entry->id ) )
+		if (isset($entry->id))
 		{
-			$item = $manager->getItem( $entry->id );
-			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$item = $manager->saveItem( $item );
+			$item = $manager->getItem($entry->id);
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$item = $manager->saveItem($item);
 		}
 		else
 		{
 			$item = $manager->createItem();
-			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$manager->insertItem( $item );
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$manager->insertItem($item);
 		}
 
-		if( isset( $entry->relationships ) ) {
-			$this->saveRelationships( $manager, $item, $entry->relationships );
+		if (isset($entry->relationships)) {
+			$this->saveRelationships($manager, $item, $entry->relationships);
 		}
 
-		return $manager->getItem( $item->getId() );
+		return $manager->getItem($item->getId());
 	}
 }

admin/jsonadm/tests/Admin/JsonAdm/Locale/Site/StandardTest.php

Spacing +72 added lines, -72 removed lines

@@ -22,32 +22,32 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Locale\Site\Standard( $this->context, $this->view, $templatePaths, 'locale/site' );
+		$this->object = new \Aimeos\Admin\JsonAdm\Locale\Site\Standard($this->context, $this->view, $templatePaths, 'locale/site');
 	}
 
 
 	public function testGet()
 	{
 		$params = array(
-			'id' => $this->getSiteItem( 'unittest' )->getId(),
+			'id' => $this->getSiteItem('unittest')->getId(),
 			'filter' => array(
-				'==' => array( 'locale.status' => 0 )
+				'==' => array('locale.status' => 0)
 			),
 		);
-		$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( 'locale/site', $result['data']['type'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals('locale/site', $result['data']['type']);
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -55,124 +55,124 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'locale.site.code' => 'unittest' )
+				'==' => array('locale.site.code' => 'unittest')
 			),
 		);
-		$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( 'locale/site', $result['data'][0]['type'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('locale/site', $result['data'][0]['type']);
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testPatch()
 	{
-		$stub = $this->getSiteMock( array( 'getItem', 'moveItem', 'saveItem' ) );
+		$stub = $this->getSiteMock(array('getItem', 'moveItem', 'saveItem'));
 		$item = $stub->createItem();
 
-		$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( $item ) );
+		$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($item));
 
 
-		$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": "locale/site", "attributes": {"locale.site.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( 'locale/site', $result['data']['type'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertArrayHasKey('data', $result);
+		$this->assertEquals('locale/site', $result['data']['type']);
 
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testPost()
 	{
-		$stub = $this->getSiteMock( array( 'getItem', 'insertItem' ) );
+		$stub = $this->getSiteMock(array('getItem', 'insertItem'));
 		$item = $stub->createItem();
 
-		$stub->expects( $this->any() )->method( 'getItem' )
-			->will( $this->returnValue( $item ) );
-		$stub->expects( $this->once() )->method( 'insertItem' );
+		$stub->expects($this->any())->method('getItem')
+			->will($this->returnValue($item));
+		$stub->expects($this->once())->method('insertItem');
 
 
 		$body = '{"data": {"type": "locale/site", "attributes": {"locale.site.code": "unittest", "locale.site.label": "Unit test"}}}';
-		$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( 'locale/site', $result['data']['type'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertArrayHasKey('data', $result);
+		$this->assertEquals('locale/site', $result['data']['type']);
 
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
-	protected function getSiteItem( $code )
+	protected function getSiteItem($code)
 	{
-		$manager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $this->context )->getSubManager( 'site' );
+		$manager = \Aimeos\MShop\Locale\Manager\Factory::createManager($this->context)->getSubManager('site');
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'locale.site.code', $code ) );
-		$items = $manager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'locale.site.code', $code));
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'No locale site item with code "%1$s" found', $code ) );
+		if (($item = reset($items)) === false) {
+			throw new \RuntimeException(sprintf('No locale site item with code "%1$s" found', $code));
 		}
 
 		return $item;
 	}
 
 
-	protected function getSiteMock( array $methods )
+	protected function getSiteMock(array $methods)
 	{
 		$name = 'AdminJsonAdmStandard';
-		$this->context->getConfig()->set( 'mshop/locale/manager/name', $name );
+		$this->context->getConfig()->set('mshop/locale/manager/name', $name);
 
-		$stub = $this->getMockBuilder( '\\Aimeos\\MShop\\Locale\\Manager\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( array( 'getSubManager' ) )
+		$stub = $this->getMockBuilder('\\Aimeos\\MShop\\Locale\\Manager\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(array('getSubManager'))
 			->getMock();
 
-		$siteStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Locale\\Manager\\Site\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( $methods )
+		$siteStub = $this->getMockBuilder('\\Aimeos\\MShop\\Locale\\Manager\\Site\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods($methods)
 			->getMock();
 
-		$stub->expects( $this->once() )->method( 'getSubManager' )
-			->will( $this->returnValue( $siteStub ) );
+		$stub->expects($this->once())->method('getSubManager')
+			->will($this->returnValue($siteStub));
 
-		\Aimeos\MShop\Locale\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Locale\\Manager\\' . $name, $stub );
+		\Aimeos\MShop\Locale\Manager\Factory::injectManager('\\Aimeos\\MShop\\Locale\\Manager\\' . $name, $stub);
 
 		return $siteStub;
 	}

admin/jsonadm/src/Admin/JsonAdm/Catalog/Standard.php

Spacing +42 added lines, -42 removed lines

@@ -110,7 +110,7 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function get( ServerRequestInterface $request, ResponseInterface $response )
+	public function get(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		/** admin/jsonadm/partials/catalog/template-data
 		 * Relative path to the data partial template file for the catalog client
@@ -127,9 +127,9 @@ 
 		 * @since 2016.07
 		 * @category Developer
 		 */
-		$this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/catalog/template-data' ) );
+		$this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/catalog/template-data'));
 
-		return parent::get( $request, $response );
+		return parent::get($request, $response);
 	}
 
 
@@ -140,14 +140,14 @@ 
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface
 	 */
-	protected function getChildItems( array $items, array $include )
+	protected function getChildItems(array $items, array $include)
 	{
 		$list = [];
 
-		if( in_array( 'catalog', $include ) )
+		if (in_array('catalog', $include))
 		{
-			foreach( $items as $item ) {
-				$list = array_merge( $list, [$item], $this->getChildItems( $item->getChildren(), $include ) );
+			foreach ($items as $item) {
+				$list = array_merge($list, [$item], $this->getChildItems($item->getChildren(), $include));
 			}
 		}
 
@@ -162,40 +162,40 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog');
 
-		if( ( $key = $view->param( 'aggregate' ) ) !== null )
+		if (($key = $view->param('aggregate')) !== null)
 		{
-			$search = $this->initCriteria( $manager->createSearch(), $view->param() );
-			$view->data = $manager->aggregate( $search, $key );
+			$search = $this->initCriteria($manager->createSearch(), $view->param());
+			$view->data = $manager->aggregate($search, $key);
 			return $response;
 		}
 
-		$include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : [] );
-		$search = $this->initCriteria( $manager->createSearch(), $view->param() );
+		$include = (($include = $view->param('include')) !== null ? explode(',', $include) : []);
+		$search = $this->initCriteria($manager->createSearch(), $view->param());
 		$total = 1;
 
-		if( ( $id = $view->param( 'id' ) ) == null )
+		if (($id = $view->param('id')) == null)
 		{
-			$view->data = $manager->searchItems( $search, [], $total );
-			$view->listItems = $this->getListItems( $view->data, $include );
+			$view->data = $manager->searchItems($search, [], $total);
+			$view->listItems = $this->getListItems($view->data, $include);
 			$view->childItems = [];
 		}
 		else
 		{
 			$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE;
-			if( in_array( 'catalog', $include ) ) {
+			if (in_array('catalog', $include)) {
 				$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST;
 			}
 
-			$view->data = $manager->getTree( $id, $include, $level, $search );
-			$view->listItems = $this->getListItems( array( $id => $view->data ), $include );
-			$view->childItems = $this->getChildItems( $view->data->getChildren(), $include );
+			$view->data = $manager->getTree($id, $include, $level, $search);
+			$view->listItems = $this->getListItems(array($id => $view->data), $include);
+			$view->childItems = $this->getChildItems($view->data->getChildren(), $include);
 		}
 
-		$view->refItems = $this->getRefItems( $view->listItems );
+		$view->refItems = $this->getRefItems($view->listItems);
 		$view->total = $total;
 
 		return $response;
@@ -209,18 +209,18 @@ 
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 */
-	protected function getListItems( array $items, array $include )
+	protected function getListItems(array $items, array $include)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'catalog.lists.parentid', array_keys( $items ) ),
-			$search->compare( '==', 'catalog.lists.domain', $include ),
+			$search->compare('==', 'catalog.lists.parentid', array_keys($items)),
+			$search->compare('==', 'catalog.lists.domain', $include),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -231,32 +231,32 @@ 
 	 * @param \stdClass $entry Object including "id" and "attributes" elements
 	 * @return \Aimeos\MShop\Common\Item\Iface New or updated item
 	 */
-	protected function saveEntry( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry )
+	protected function saveEntry(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry)
 	{
-		$targetId = ( isset( $entry->targetid ) ? $entry->targetid : null );
-		$refId = ( isset( $entry->refid ) ? $entry->refid : null );
+		$targetId = (isset($entry->targetid) ? $entry->targetid : null);
+		$refId = (isset($entry->refid) ? $entry->refid : null);
 
-		if( isset( $entry->id ) )
+		if (isset($entry->id))
 		{
-			$item = $manager->getItem( $entry->id );
-			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$item = $manager->saveItem( $item );
+			$item = $manager->getItem($entry->id);
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$item = $manager->saveItem($item);
 
-			if( isset( $entry->parentid ) && $targetId !== null ) {
-				$manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId );
+			if (isset($entry->parentid) && $targetId !== null) {
+				$manager->moveItem($item->getId(), $entry->parentid, $targetId, $refId);
 			}
 		}
 		else
 		{
 			$item = $manager->createItem();
-			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$manager->insertItem( $item, $targetId, $refId );
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$manager->insertItem($item, $targetId, $refId);
 		}
 
-		if( isset( $entry->relationships ) ) {
-			$this->saveRelationships( $manager, $item, $entry->relationships );
+		if (isset($entry->relationships)) {
+			$this->saveRelationships($manager, $item, $entry->relationships);
 		}
 
-		return $manager->getItem( $item->getId() );
+		return $manager->getItem($item->getId());
 	}
 }

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

Spacing +71 added lines, -71 removed lines

@@ -22,7 +22,7 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Catalog\Standard( $this->context, $this->view, $templatePaths, 'catalog' );
+		$this->object = new \Aimeos\Admin\JsonAdm\Catalog\Standard($this->context, $this->view, $templatePaths, 'catalog');
 	}
 
 
@@ -30,142 +30,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/TestHelperJadm.php

Spacing +50 added lines, -50 removed lines

@@ -15,15 +15,15 @@ 
 	public static function bootstrap()
 	{
 		self::getAimeos();
-		\Aimeos\MShop\Factory::setCache( false );
-		\Aimeos\Admin\JsonAdm\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
+		\Aimeos\Admin\JsonAdm\Factory::setCache(false);
 	}
 
 
-	public static function getContext( $site = 'unittest' )
+	public static function getContext($site = 'unittest')
 	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
+		if (!isset(self::$context[$site])) {
+			self::$context[$site] = self::createContext($site);
 		}
 
 		return clone self::$context[$site];
@@ -32,13 +32,13 @@ 
 
 	public 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( __FILE__ ) ) ) );
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), false );
+			$extdir = dirname(dirname(dirname(dirname(__FILE__))));
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), false);
 		}
 
 		return self::$aimeos;
@@ -47,88 +47,88 @@ 
 
 	public static function getJsonadmPaths()
 	{
-		return self::getAimeos()->getCustomPaths( 'admin/jsonadm/templates' );
+		return self::getAimeos()->getCustomPaths('admin/jsonadm/templates');
 	}
 
 
-	private static function createContext( $site )
+	private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 		$aimeos = self::getAimeos();
 
 
-		$paths = $aimeos->getConfigPaths( 'mysql' );
+		$paths = $aimeos->getConfigPaths('mysql');
 		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
 		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
-		$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf );
-		$conf = new \Aimeos\MW\Config\Decorator\Documentor( $conf, $file );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray([], $paths);
+		$conf = new \Aimeos\MW\Config\Decorator\Memory($conf);
+		$conf = new \Aimeos\MW\Config\Decorator\Documentor($conf, $file);
+		$ctx->setConfig($conf);
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
-		$ctx->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($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);
 
 
 		$session = new \Aimeos\MW\Session\None();
-		$ctx->setSession( $session );
+		$ctx->setSession($session);
 
 
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
-		$ctx->setI18n( array( 'de' => $i18n ) );
+		$i18n = new \Aimeos\MW\Translation\None('de');
+		$ctx->setI18n(array('de' => $i18n));
 
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
-		$locale = $localeManager->bootstrap( $site, 'de', '', false );
-		$ctx->setLocale( $locale );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
+		$locale = $localeManager->bootstrap($site, 'de', '', false);
+		$ctx->setLocale($locale);
 
 
-		$view = self::createView( $conf );
-		$ctx->setView( $view );
+		$view = self::createView($conf);
+		$ctx->setView($view);
 
 
-		$ctx->setEditor( 'core:admin/jsonadm' );
+		$ctx->setEditor('core:admin/jsonadm');
 
 		return $ctx;
 	}
 
 
-	protected static function createView( \Aimeos\MW\Config\Iface $config )
+	protected static function createView(\Aimeos\MW\Config\Iface $config)
 	{
-		$tmplpaths = self::getAimeos()->getCustomPaths( 'admin/jsonadm/templates' );
+		$tmplpaths = self::getAimeos()->getCustomPaths('admin/jsonadm/templates');
 
-		$view = new \Aimeos\MW\View\Standard( $tmplpaths );
+		$view = new \Aimeos\MW\View\Standard($tmplpaths);
 
-		$helper = new \Aimeos\MW\View\Helper\Access\All( $view );
-		$view->addHelper( 'access', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Access\All($view);
+		$view->addHelper('access', $helper);
 
-		$trans = new \Aimeos\MW\Translation\None( 'de_DE' );
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $trans );
-		$view->addHelper( 'translate', $helper );
+		$trans = new \Aimeos\MW\Translation\None('de_DE');
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $trans);
+		$view->addHelper('translate', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Url\Standard( $view, 'http://baseurl' );
-		$view->addHelper( 'url', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Url\Standard($view, 'http://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);
 
-		$config = new \Aimeos\MW\Config\Decorator\Protect( $config, array( 'admin/jsonadm' ) );
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$config = new \Aimeos\MW\Config\Decorator\Protect($config, array('admin/jsonadm'));
+		$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;
 	}

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

Spacing +40 added lines, -40 removed lines

@@ -33,11 +33,11 @@ 
 	 * @param integer $id Context ID the objects have been created with (string of \Aimeos\MShop\Context\Item\Iface)
 	 * @param string $path Path describing the client to clear, e.g. "product/lists/type"
 	 */
-	static public function clear( $id = null, $path = null )
+	static public function clear($id = null, $path = null)
 	{
-		if( $id !== null )
+		if ($id !== null)
 		{
-			if( $path !== null ) {
+			if ($path !== null) {
 				self::$clients[$id][$path] = null;
 			} else {
 				self::$clients[$id] = [];
@@ -65,18 +65,18 @@ 
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid
 	 */
-	static public function createClient( \Aimeos\MShop\Context\Item\Iface $context,
-		array $templatePaths, $path, $name = null )
+	static public function createClient(\Aimeos\MShop\Context\Item\Iface $context,
+		array $templatePaths, $path, $name = null)
 	{
-		$path = strtolower( trim( $path, "/ \n\t\r\0\x0B" ) );
+		$path = strtolower(trim($path, "/ \n\t\r\0\x0B"));
 		$id = (string) $context;
 
-		if( self::$cache === false || !isset( self::$clients[$id][$path] ) )
+		if (self::$cache === false || !isset(self::$clients[$id][$path]))
 		{
-			if( empty( $path ) ) {
-				self::$clients[$id][$path] = self::createClientRoot( $context, $templatePaths, $path, $name );
+			if (empty($path)) {
+				self::$clients[$id][$path] = self::createClientRoot($context, $templatePaths, $path, $name);
 			} else {
-				self::$clients[$id][$path] = self::createClientNew( $context, $templatePaths, $path, $name );
+				self::$clients[$id][$path] = self::createClientNew($context, $templatePaths, $path, $name);
 			}
 		}
 
@@ -90,7 +90,7 @@ 
 	 * @param boolean $value True to enable caching, false to disable it.
 	 * @return boolean Previous cache setting
 	 */
-	static public function setCache( $value )
+	static public function setCache($value)
 	{
 		$old = self::$cache;
 		self::$cache = (boolean) $value;
@@ -109,51 +109,51 @@ 
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid
 	 */
-	protected static function createClientNew( \Aimeos\MShop\Context\Item\Iface $context,
-		array $templatePaths, $path, $name )
+	protected static function createClientNew(\Aimeos\MShop\Context\Item\Iface $context,
+		array $templatePaths, $path, $name)
 	{
 		$pname = $name;
-		$parts = explode( '/', $path );
+		$parts = explode('/', $path);
 
-		foreach( $parts as $key => $part )
+		foreach ($parts as $key => $part)
 		{
-			if( ctype_alnum( $part ) === false )
+			if (ctype_alnum($part) === false)
 			{
-				$msg = sprintf( 'Invalid client "%1$s" in "%2$s"', $part, $path );
-				throw new \Aimeos\Admin\JsonAdm\Exception( $msg, 400 );
+				$msg = sprintf('Invalid client "%1$s" in "%2$s"', $part, $path);
+				throw new \Aimeos\Admin\JsonAdm\Exception($msg, 400);
 			}
 
-			$parts[$key] = ucwords( $part );
+			$parts[$key] = ucwords($part);
 		}
 
-		if( $pname === null ) {
-			$pname = $context->getConfig()->get( 'admin/jsonadm/' . $path . '/name', 'Standard' );
+		if ($pname === null) {
+			$pname = $context->getConfig()->get('admin/jsonadm/' . $path . '/name', 'Standard');
 		}
 
 		$view = $context->getView();
 		$config = $context->getConfig();
 
-		if( $view->access( $config->get( 'admin/jsonadm/resource/' . $path . '/groups', [] ) ) !== true ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Not allowed to access JQAdm "%1$s" client', $path ) );
+		if ($view->access($config->get('admin/jsonadm/resource/' . $path . '/groups', [])) !== true) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Not allowed to access JQAdm "%1$s" client', $path));
 		}
 
 
 		$view = $context->getView();
 		$iface = '\\Aimeos\\Admin\\JsonAdm\\Iface';
-		$classname = '\\Aimeos\\Admin\\JsonAdm\\' . join( '\\', $parts ) . '\\' . $pname;
+		$classname = '\\Aimeos\\Admin\\JsonAdm\\' . join('\\', $parts) . '\\' . $pname;
 
-		if( ctype_alnum( $pname ) === false )
+		if (ctype_alnum($pname) === false)
 		{
-			$classname = is_string( $pname ) ? $classname : '<not a string>';
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
+			$classname = is_string($pname) ? $classname : '<not a string>';
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname));
 		}
 
-		if( class_exists( $classname ) === false ) {
-			return self::createClientRoot( $context, $templatePaths, $path, $name );
+		if (class_exists($classname) === false) {
+			return self::createClientRoot($context, $templatePaths, $path, $name);
 		}
 
-		$client = self::createClientBase( $classname, $iface, $context, $view, $templatePaths, $path );
-		return self::addClientDecorators( $client, $context, $view, $templatePaths, $path );
+		$client = self::createClientBase($classname, $iface, $context, $view, $templatePaths, $path);
+		return self::addClientDecorators($client, $context, $view, $templatePaths, $path);
 	}
 
 
@@ -167,8 +167,8 @@ 
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the client couldn't be created
 	 */
-	protected static function createClientRoot( \Aimeos\MShop\Context\Item\Iface $context,
-		array $templatePaths, $path, $name = null )
+	protected static function createClientRoot(\Aimeos\MShop\Context\Item\Iface $context,
+		array $templatePaths, $path, $name = null)
 	{
 		/** admin/jsonadm/name
 		 * Class name of the used JSON API client implementation
@@ -203,21 +203,21 @@ 
 		 * @since 2015.12
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'admin/jsonadm/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('admin/jsonadm/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>';
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>';
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname));
 		}
 
 		$view = $context->getView();
 		$iface = '\\Aimeos\\Admin\\JsonAdm\\Iface';
 		$classname = '\\Aimeos\\Admin\\JsonAdm\\' . $name;
 
-		$client = self::createClientBase( $classname, $iface, $context, $view, $templatePaths, $path );
+		$client = self::createClientBase($classname, $iface, $context, $view, $templatePaths, $path);
 
 		/** admin/jsonadm/decorators/excludes
 		 * Excludes decorators added by the "common" option from the JSON API clients
@@ -297,6 +297,6 @@ 
 		 * @see admin/jsonadm/decorators/global
 		 */
 
-		return self::addClientDecorators( $client, $context, $view, $templatePaths, $path );
+		return self::addClientDecorators($client, $context, $view, $templatePaths, $path);
 	}
 }

admin/jsonadm/tests/Admin/JsonAdm/Service/Config/StandardTest.php

Spacing +12 added lines, -12 removed lines

@@ -22,7 +22,7 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Service\Config\Standard( $this->context, $this->view, $templatePaths, 'service/config' );
+		$this->object = new \Aimeos\Admin\JsonAdm\Service\Config\Standard($this->context, $this->view, $templatePaths, 'service/config');
 	}
 
 
@@ -32,20 +32,20 @@ 
 			'id' => 'DirectDebit,Category',
 			'type' => 'payment',
 		);
-		$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( 2, $result['meta']['total'] );
-		$this->assertInternalType( 'array', $result['data'] );
-		$this->assertEquals( 'category.include', $result['data'][0]['id'] );
-		$this->assertEquals( 'category.exclude', $result['data'][1]['id'] );
+		$this->assertEquals(2, $result['meta']['total']);
+		$this->assertInternalType('array', $result['data']);
+		$this->assertEquals('category.include', $result['data'][0]['id']);
+		$this->assertEquals('category.exclude', $result['data'][1]['id']);
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

admin/jsonadm/src/Admin/JsonAdm/Service/Config/Standard.php

Spacing +19 added lines, -19 removed lines

@@ -110,30 +110,30 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function get( ServerRequestInterface $request, ResponseInterface $response )
+	public function get(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$view = $this->getView();
 
 		try
 		{
-			$response = $this->getItems( $view, $request, $response );
+			$response = $this->getItems($view, $request, $response);
 			$status = 200;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$status = 500;
-			$view->errors = array( array(
+			$view->errors = array(array(
 				'title' => $e->getMessage(),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
 
 		/** admin/jsonadm/service/config/template-get
@@ -158,11 +158,11 @@ 
 		$tplconf = 'admin/jsonadm/service/config/template-get';
 		$default = 'config-default.php';
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 
 
@@ -174,16 +174,16 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
-		if( ( $id = $view->param( 'id' ) ) == null ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 );
+		if (($id = $view->param('id')) == null) {
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400);
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-		$item = $manager->createItem()->setProvider( $id );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
+		$item = $manager->createItem()->setProvider($id);
 
-		$view->configItems = $manager->getProvider( $item, $view->param( 'type', 'payment' ) )->getConfigBE();
+		$view->configItems = $manager->getProvider($item, $view->param('type', 'payment'))->getConfigBE();
 
 		return $response;
 	}

admin/jsonadm/src/Admin/JsonAdm/Plugin/Config/Standard.php

Spacing +19 added lines, -19 removed lines

@@ -110,30 +110,30 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function get( ServerRequestInterface $request, ResponseInterface $response )
+	public function get(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$view = $this->getView();
 
 		try
 		{
-			$response = $this->getItems( $view, $request, $response );
+			$response = $this->getItems($view, $request, $response);
 			$status = 200;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$status = 500;
-			$view->errors = array( array(
+			$view->errors = array(array(
 				'title' => $e->getMessage(),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
 
 		/** admin/jsonadm/plugin/config/template-get
@@ -158,11 +158,11 @@ 
 		$tplconf = 'admin/jsonadm/plugin/config/template-get';
 		$default = 'config-default.php';
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 
 
@@ -174,16 +174,16 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
-		if( ( $id = $view->param( 'id' ) ) == null ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 );
+		if (($id = $view->param('id')) == null) {
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400);
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'plugin' );
-		$item = $manager->createItem()->setProvider( $id );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'plugin');
+		$item = $manager->createItem()->setProvider($id);
 
-		$view->configItems = $manager->getProvider( $item, 'order' )->getConfigBE();
+		$view->configItems = $manager->getProvider($item, 'order')->getConfigBE();
 
 		return $response;
 	}