aimeos / ai-admin-jsonadm

admin/jsonadm/tests/Admin/JsonAdm/Common/Factory/BaseTest.php

Spacing +26 added lines, -26 removed lines

@@ -21,29 +21,29 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->client = new \Aimeos\Admin\JsonAdm\Product\Standard( $this->context, $this->view, [], '' );
+		$this->client = new \Aimeos\Admin\JsonAdm\Product\Standard($this->context, $this->view, [], '');
 
-		$this->object = $this->getMockBuilder( '\Aimeos\Admin\JsonAdm\Common\Factory\Base' )
+		$this->object = $this->getMockBuilder('\Aimeos\Admin\JsonAdm\Common\Factory\Base')
 			->getMockForAbstractClass();
 	}
 
 
 	public function testinjectClient()
 	{
-		$this->object::injectClient( 'test', $this->client );
+		$this->object::injectClient('test', $this->client);
 	}
 
 
 	public function testAddClientDecorators()
 	{
 		$config = $this->context->getConfig();
-		$config->set( 'client/jsonapi/common/decorators/default', ['Test'] );
-		$config->set( 'client/jsonapi/product/decorators/excludes', ['Test'] );
+		$config->set('client/jsonapi/common/decorators/default', ['Test']);
+		$config->set('client/jsonapi/product/decorators/excludes', ['Test']);
 
 		$params = [$this->client, $this->context, $this->view, [], 'product'];
-		$result = $this->access( 'addClientDecorators' )->invokeArgs( $this->object, $params );
+		$result = $this->access('addClientDecorators')->invokeArgs($this->object, $params);
 
-		$this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result);
 	}
 
 
@@ -52,9 +52,9 @@ 
 		$prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
 		$params = [$this->client, ['Example'], $prefix, $this->context, $this->view, [], ''];
 
-		$result = $this->access( 'addDecorators' )->invokeArgs( $this->object, $params );
+		$result = $this->access('addDecorators')->invokeArgs($this->object, $params);
 
-		$this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result);
 	}
 
 
@@ -63,8 +63,8 @@ 
 		$prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
 		$params = [$this->client, ['Test'], $prefix, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( '\Aimeos\Admin\JsonAdm\Exception' );
-		$this->access( 'addDecorators' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException('\Aimeos\Admin\JsonAdm\Exception');
+		$this->access('addDecorators')->invokeArgs($this->object, $params);
 	}
 
 
@@ -73,8 +73,8 @@ 
 		$prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
 		$params = [$this->client, [''], $prefix, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( '\Aimeos\Admin\JsonAdm\Exception' );
-		$this->access( 'addDecorators' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException('\Aimeos\Admin\JsonAdm\Exception');
+		$this->access('addDecorators')->invokeArgs($this->object, $params);
 	}
 
 
@@ -84,9 +84,9 @@ 
 		$class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard';
 		$params = [$class, $iface, $this->context, $this->view, [], ''];
 
-		$result = $this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$result = $this->access('createClientBase')->invokeArgs($this->object, $params);
 
-		$this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result);
 	}
 
 
@@ -95,10 +95,10 @@ 
 		$iface = '\Aimeos\\Admin\\JsonAdm\\Iface';
 		$params = ['test', $iface, $this->context, $this->view, [], ''];
 
-		$this->object->injectClient( 'test', $this->client );
-		$result = $this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$this->object->injectClient('test', $this->client);
+		$result = $this->access('createClientBase')->invokeArgs($this->object, $params);
 
-		$this->assertSame( $this->client, $result );
+		$this->assertSame($this->client, $result);
 	}
 
 
@@ -107,8 +107,8 @@ 
 		$iface = '\Aimeos\\Admin\\JsonAdm\\Iface';
 		$params = ['invalid', $iface, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( '\Aimeos\Admin\JsonAdm\Exception' );
-		$this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException('\Aimeos\Admin\JsonAdm\Exception');
+		$this->access('createClientBase')->invokeArgs($this->object, $params);
 	}
 
 
@@ -118,16 +118,16 @@ 
 		$class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard';
 		$params = [$class, $iface, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( '\Aimeos\Admin\JsonAdm\Exception' );
-		$this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException('\Aimeos\Admin\JsonAdm\Exception');
+		$this->access('createClientBase')->invokeArgs($this->object, $params);
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( '\Aimeos\Admin\JsonAdm\Common\Factory\Base' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Admin\JsonAdm\Common\Factory\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

admin/jsonadm/tests/Admin/JsonAdm/Common/Decorator/BaseTest.php

Spacing +23 added lines, -23 removed lines

@@ -21,88 +21,88 @@
 		$context = \TestHelperJadm::getContext();
 		$this->view = $context->getView();
 
-		$this->stub = $this->getMockBuilder( '\\Aimeos\\Admin\\JsonAdm\\Standard' )
-			->setConstructorArgs( array( $context, $this->view, array(), 'attribute' ) )
+		$this->stub = $this->getMockBuilder('\\Aimeos\\Admin\\JsonAdm\\Standard')
+			->setConstructorArgs(array($context, $this->view, array(), 'attribute'))
 			->getMock();
 
-		$this->object = $this->getMockBuilder( '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\Base' )
-			->setConstructorArgs( [$this->stub, $context, $this->view, [], ''] )
+		$this->object = $this->getMockBuilder('\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\Base')
+			->setConstructorArgs([$this->stub, $context, $this->view, [], ''])
 			->getMockForAbstractClass();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->stub, $this->view );
+		unset($this->object, $this->stub, $this->view);
 	}
 
 
 	public function testDelete()
 	{
-		$this->stub->expects( $this->once() )->method( 'delete' )->will( $this->returnArgument( 1 ) );
+		$this->stub->expects($this->once())->method('delete')->will($this->returnArgument(1));
 		$response = $this->view->response();
 
-		$this->assertSame( $response, $this->object->delete( $this->view->request(), $response ) );
+		$this->assertSame($response, $this->object->delete($this->view->request(), $response));
 	}
 
 
 	public function testGet()
 	{
-		$this->stub->expects( $this->once() )->method( 'get' )->will( $this->returnArgument( 1 ) );
+		$this->stub->expects($this->once())->method('get')->will($this->returnArgument(1));
 		$response = $this->view->response();
 
-		$this->assertSame( $response, $this->object->get( $this->view->request(), $response ) );
+		$this->assertSame($response, $this->object->get($this->view->request(), $response));
 	}
 
 
 	public function testPatch()
 	{
-		$this->stub->expects( $this->once() )->method( 'patch' )->will( $this->returnArgument( 1 ) );
+		$this->stub->expects($this->once())->method('patch')->will($this->returnArgument(1));
 		$response = $this->view->response();
 
-		$this->assertSame( $response, $this->object->patch( $this->view->request(), $response ) );
+		$this->assertSame($response, $this->object->patch($this->view->request(), $response));
 	}
 
 
 	public function testPost()
 	{
-		$this->stub->expects( $this->once() )->method( 'post' )->will( $this->returnArgument( 1 ) );
+		$this->stub->expects($this->once())->method('post')->will($this->returnArgument(1));
 		$response = $this->view->response();
 
-		$this->assertSame( $response, $this->object->post( $this->view->request(), $response ) );
+		$this->assertSame($response, $this->object->post($this->view->request(), $response));
 	}
 
 
 	public function testPut()
 	{
-		$this->stub->expects( $this->once() )->method( 'put' )->will( $this->returnArgument( 1 ) );
+		$this->stub->expects($this->once())->method('put')->will($this->returnArgument(1));
 		$response = $this->view->response();
 
-		$this->assertSame( $response, $this->object->put( $this->view->request(), $response ) );
+		$this->assertSame($response, $this->object->put($this->view->request(), $response));
 	}
 
 
 	public function testOptions()
 	{
-		$this->stub->expects( $this->once() )->method( 'options' )->will( $this->returnArgument( 1 ) );
+		$this->stub->expects($this->once())->method('options')->will($this->returnArgument(1));
 		$response = $this->view->response();
 
-		$this->assertSame( $response, $this->object->options( $this->view->request(), $response ) );
+		$this->assertSame($response, $this->object->options($this->view->request(), $response));
 	}
 
 
 	public function testGetClient()
 	{
-		$result = $this->access( 'getClient' )->invokeArgs( $this->object, [] );
-		$this->assertSame( $this->stub, $result );
+		$result = $this->access('getClient')->invokeArgs($this->object, []);
+		$this->assertSame($this->stub, $result);
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( '\Aimeos\Admin\JsonAdm\Common\Decorator\Base' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Admin\JsonAdm\Common\Decorator\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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

Spacing +14 added lines, -14 removed lines

@@ -22,7 +22,7 @@ 
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Price\Standard( $this->context, $this->view, $templatePaths, 'price' );
+		$this->object = new \Aimeos\Admin\JsonAdm\Price\Standard($this->context, $this->view, $templatePaths, 'price');
 	}
 
 
@@ -30,26 +30,26 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'price.value' => '12.95' )
+				'==' => array('price.value' => '12.95')
 			),
 			'include' => 'attribute'
 		);
-		$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->assertEquals( 2, count( $result['data'] ) );
-		$this->assertEquals( 'price', $result['data'][0]['type'] );
-		$this->assertEquals( 0, count( $result['data'][0]['relationships'] ) );
-		$this->assertEquals( 0, count( $result['included'] ) );
+		$this->assertEquals(2, $result['meta']['total']);
+		$this->assertEquals(2, count($result['data']));
+		$this->assertEquals('price', $result['data'][0]['type']);
+		$this->assertEquals(0, count($result['data'][0]['relationships']));
+		$this->assertEquals(0, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

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

Spacing +30 added lines, -30 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);
 	}
 
 
@@ -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 = array();
 
-		if( in_array( 'locale/site', $include ) )
+		if (in_array('locale/site', $include))
 		{
-			foreach( $items as $item ) {
-				$list = array_merge( $list, $item->getChildren() );
+			foreach ($items as $item) {
+				$list = array_merge($list, $item->getChildren());
 			}
 		}
 
@@ -163,23 +163,23 @@ 
 	 * @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' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'locale/site');
 
-		$include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : array() );
-		$search = $this->initCriteria( $manager->createSearch(), $view->param() );
+		$include = (($include = $view->param('include')) !== null ? explode(',', $include) : array());
+		$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, array(), $total );
-			$view->childItems = $this->getChildItems( $view->data, $include );
+			$view->data = $manager->searchItems($search, array(), $total);
+			$view->childItems = $this->getChildItems($view->data, $include);
 		}
 		else
 		{
-			$view->data = $manager->getTree( $id, array(), \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search );
-			$view->childItems = $this->getChildItems( array( $view->data ), $include );
+			$view->data = $manager->getTree($id, array(), \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search);
+			$view->childItems = $this->getChildItems(array($view->data), $include);
 		}
 
 		$view->listItems = array();
@@ -197,32 +197,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() );
-			$manager->saveItem( $item );
+			$item = $manager->getItem($entry->id);
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$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/src/Admin/JsonAdm/Common/Factory/Base.php

Spacing +38 added lines, -38 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;
 	}
@@ -47,8 +47,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, \Aimeos\MW\View\Iface $view, array $templatePaths, $path )
+	protected static function addClientDecorators(\Aimeos\Admin\JsonAdm\Iface $client,
+		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path)
 	{
 		$config = $context->getConfig();
 
@@ -74,38 +74,38 @@ 
 		 * @since 2015.12
 		 * @category Developer
 		 */
-		$decorators = $config->get( 'admin/jsonadm/common/decorators/default', array() );
+		$decorators = $config->get('admin/jsonadm/common/decorators/default', array());
 
-		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', array() );
-			$localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) );
+			$excludes = $config->get('admin/jsonadm/' . $dpath . 'decorators/excludes', array());
+			$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', array() );
-			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );
+			$decorators = $config->get('admin/jsonadm/' . $dpath . 'decorators/global', array());
+			$client = self::addDecorators($client, $decorators, $classprefix, $context, $view, $templatePaths, $path);
 
-			if( !empty( $path ) )
+			if (!empty($path))
 			{
-				$classprefix = '\\Aimeos\\Admin\\JsonAdm\\' . ucfirst( $localClass ) . '\\Decorator\\';
-				$decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/local', array() );
-				$client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );
+				$classprefix = '\\Aimeos\\Admin\\JsonAdm\\' . ucfirst($localClass) . '\\Decorator\\';
+				$decorators = $config->get('admin/jsonadm/' . $dpath . 'decorators/local', array());
+				$client = self::addDecorators($client, $decorators, $classprefix, $context, $view, $templatePaths, $path);
 			}
 		}
 		else
 		{
 			$classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
-			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );
+			$client = self::addDecorators($client, $decorators, $classprefix, $context, $view, $templatePaths, $path);
 		}
 
 		return $client;
@@ -124,29 +124,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, \Aimeos\MW\View\Iface $view, $templatePaths, $path )
+	protected static function addDecorators(\Aimeos\Admin\JsonAdm\Iface $client, array $decorators, $classprefix,
+			\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, $templatePaths, $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, $view, $templatePaths, $path );
+			$client = new $classname($client, $context, $view, $templatePaths, $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);
 			}
 		}
 
@@ -165,21 +165,21 @@ 
 	 * @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 createClientBase( $classname, $interface, \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\MW\View\Iface $view, array $templatePaths, $path )
+	protected static function createClientBase($classname, $interface, \Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\MW\View\Iface $view, array $templatePaths, $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, $view, $templatePaths, $path );
+		$client = new $classname($context, $view, $templatePaths, $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

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

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

Spacing +17 added lines, -17 removed lines

@@ -36,10 +36,10 @@ 
 	 * @param array $templatePaths List of file system paths where the templates are stored
 	 * @param string $path Name of the client separated by slashes, e.g "product/property"
 	 */
-	public function __construct( \Aimeos\Admin\JsonAdm\Iface $client,
-		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path )
+	public function __construct(\Aimeos\Admin\JsonAdm\Iface $client,
+		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path)
 	{
-		parent::__construct( $context, $view, $templatePaths, $path );
+		parent::__construct($context, $view, $templatePaths, $path);
 
 		$this->client = $client;
 	}
@@ -53,9 +53,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);
 	}
 
 
@@ -66,9 +66,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);
 	}
 
 
@@ -79,9 +79,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);
 	}
 
 
@@ -93,9 +93,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);
 	}
 
 
@@ -107,9 +107,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);
 	}
 
 
@@ -121,9 +121,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);
 	}
 
 
@@ -136,9 +136,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);
 	}