aimeos / ai-cms-grapesjs

controller/frontend/tests/Controller/Frontend/Cms/FactoryTest.php

Spacing +10 added lines, -10 removed lines

@@ -15,31 +15,31 @@
 	{
 		$target = '\\Aimeos\\Controller\\Frontend\\Cms\\Iface';
 
-		$controller = \Aimeos\Controller\Frontend\Cms\Factory::create( \TestHelperFrontend::getContext() );
-		$this->assertInstanceOf( $target, $controller );
+		$controller = \Aimeos\Controller\Frontend\Cms\Factory::create(\TestHelperFrontend::getContext());
+		$this->assertInstanceOf($target, $controller);
 
-		$controller = \Aimeos\Controller\Frontend\Cms\Factory::create( \TestHelperFrontend::getContext(), 'Standard' );
-		$this->assertInstanceOf( $target, $controller );
+		$controller = \Aimeos\Controller\Frontend\Cms\Factory::create(\TestHelperFrontend::getContext(), 'Standard');
+		$this->assertInstanceOf($target, $controller);
 	}
 
 
 	public function testCreateControllerInvalidImplementation()
 	{
-		$this->expectException( '\\Aimeos\\MW\\Common\\Exception' );
-		\Aimeos\Controller\Frontend\Cms\Factory::create( \TestHelperFrontend::getContext(), 'Invalid' );
+		$this->expectException('\\Aimeos\\MW\\Common\\Exception');
+		\Aimeos\Controller\Frontend\Cms\Factory::create(\TestHelperFrontend::getContext(), 'Invalid');
 	}
 
 
 	public function testCreateControllerInvalidName()
 	{
-		$this->expectException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Cms\Factory::create( \TestHelperFrontend::getContext(), '%^' );
+		$this->expectException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Cms\Factory::create(\TestHelperFrontend::getContext(), '%^');
 	}
 
 
 	public function testCreateControllerNotExisting()
 	{
-		$this->expectException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Cms\Factory::create( \TestHelperFrontend::getContext(), 'notexist' );
+		$this->expectException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Cms\Factory::create(\TestHelperFrontend::getContext(), 'notexist');
 	}
 }

controller/frontend/tests/Controller/Frontend/Cms/Decorator/BaseTest.php

Spacing +42 added lines, -42 removed lines

@@ -20,145 +20,145 @@
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Cms\Standard::class )
+		$this->stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Cms\Standard::class)
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Cms\Decorator\Base::class )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Cms\Decorator\Base::class)
+			->setConstructorArgs([$this->stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	protected function tearDown() : void
 	{
-		unset( $this->context, $this->object, $this->stub );
+		unset($this->context, $this->object, $this->stub);
 	}
 
 
 	public function testConstructException()
 	{
-		$stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Iface::class )->getMock();
+		$stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Iface::class)->getMock();
 
-		$this->expectException( \Aimeos\MW\Common\Exception::class );
+		$this->expectException(\Aimeos\MW\Common\Exception::class);
 
-		$this->getMockBuilder( \Aimeos\Controller\Frontend\Cms\Decorator\Base::class )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder(\Aimeos\Controller\Frontend\Cms\Decorator\Base::class)
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Cms\Standard::class )
+		$stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Cms\Standard::class)
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Cms\Decorator\Base::class )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Cms\Decorator\Base::class)
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 
-		$stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) );
+		$stub->expects($this->once())->method('invalid')->will($this->returnValue(true));
 
-		$this->assertTrue( $object->invalid() );
+		$this->assertTrue($object->invalid());
 	}
 
 
 	public function testCompare()
 	{
-		$this->assertSame( $this->object, $this->object->compare( '==', 'cms.status', 1 ) );
+		$this->assertSame($this->object, $this->object->compare('==', 'cms.status', 1));
 	}
 
 
 	public function testFind()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'cms' )->create();
+		$item = \Aimeos\MShop::create($this->context, 'cms')->create();
 		$expected = \Aimeos\MShop\Cms\Item\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'find' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('find')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( $expected, $this->object->find( 'test' ) );
+		$this->assertInstanceOf($expected, $this->object->find('test'));
 	}
 
 
 	public function testFunction()
 	{
-		$this->stub->expects( $this->once() )->method( 'function' )
-			->will( $this->returnValue( 'cms:has("domain","type","refid")' ) );
+		$this->stub->expects($this->once())->method('function')
+			->will($this->returnValue('cms:has("domain","type","refid")'));
 
-		$str = $this->object->function( 'cms:has', ['domain', 'type', 'refid'] );
-		$this->assertEquals( 'cms:has("domain","type","refid")', $str );
+		$str = $this->object->function('cms:has', ['domain', 'type', 'refid']);
+		$this->assertEquals('cms:has("domain","type","refid")', $str);
 	}
 
 
 	public function testGet()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'cms' )->create();
+		$item = \Aimeos\MShop::create($this->context, 'cms')->create();
 		$expected = \Aimeos\MShop\Cms\Item\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'get' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('get')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( $expected, $this->object->get( 1 ) );
+		$this->assertInstanceOf($expected, $this->object->get(1));
 	}
 
 
 	public function testHas()
 	{
-		$this->assertSame( $this->object, $this->object->has( 'product', 'default', -1 ) );
+		$this->assertSame($this->object, $this->object->has('product', 'default', -1));
 	}
 
 
 	public function testParse()
 	{
-		$this->assertSame( $this->object, $this->object->parse( [] ) );
+		$this->assertSame($this->object, $this->object->parse([]));
 	}
 
 
 	public function testSearch()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'cms' )->create();
+		$item = \Aimeos\MShop::create($this->context, 'cms')->create();
 
-		$this->stub->expects( $this->once() )->method( 'search' )
-			->will( $this->returnValue( map( [$item] ) ) );
+		$this->stub->expects($this->once())->method('search')
+			->will($this->returnValue(map([$item])));
 
-		$this->assertEquals( [$item], $this->object->search()->toArray() );
+		$this->assertEquals([$item], $this->object->search()->toArray());
 	}
 
 
 	public function testSlice()
 	{
-		$this->assertSame( $this->object, $this->object->slice( 0, 100 ) );
+		$this->assertSame($this->object, $this->object->slice(0, 100));
 	}
 
 
 	public function testSort()
 	{
-		$this->assertSame( $this->object, $this->object->sort( 'cms.label' ) );
+		$this->assertSame($this->object, $this->object->sort('cms.label'));
 	}
 
 
 	public function testUses()
 	{
-		$this->assertSame( $this->object, $this->object->uses( ['text'] ) );
+		$this->assertSame($this->object, $this->object->uses(['text']));
 	}
 
 
 	public function testGetController()
 	{
-		$result = $this->access( 'getController' )->invokeArgs( $this->object, [] );
+		$result = $this->access('getController')->invokeArgs($this->object, []);
 
-		$this->assertSame( $this->stub, $result );
+		$this->assertSame($this->stub, $result);
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( \Aimeos\Controller\Frontend\Cms\Decorator\Base::class );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass(\Aimeos\Controller\Frontend\Cms\Decorator\Base::class);
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

controller/frontend/tests/Controller/Frontend/Cms/StandardTest.php

Spacing +27 added lines, -27 removed lines

@@ -18,104 +18,104 @@
 	protected function setUp() : void
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$this->context->getLocale()->setLanguageId( 'en' );
+		$this->context->getLocale()->setLanguageId('en');
 
-		$this->object = new \Aimeos\Controller\Frontend\Cms\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Cms\Standard($this->context);
 	}
 
 
 	protected function tearDown() : void
 	{
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 	}
 
 
 	public function testCompare()
 	{
-		$this->assertEquals( 1, count( $this->object->compare( '=~', 'cms.label', 'Con' )->search() ) );
+		$this->assertEquals(1, count($this->object->compare('=~', 'cms.label', 'Con')->search()));
 	}
 
 
 	public function testFind()
 	{
-		$item = $this->object->uses( ['text'] )->find( '/contact' );
+		$item = $this->object->uses(['text'])->find('/contact');
 
-		$this->assertInstanceOf( \Aimeos\MShop\Cms\Item\Iface::class, $item );
-		$this->assertEquals( 3, count( $item->getRefItems( 'text' ) ) );
+		$this->assertInstanceOf(\Aimeos\MShop\Cms\Item\Iface::class, $item);
+		$this->assertEquals(3, count($item->getRefItems('text')));
 	}
 
 
 	public function testFunction()
 	{
-		$str = $this->object->function( 'cms:has', ['domain', 'type', 'refid'] );
-		$this->assertEquals( 'cms:has("domain","type","refid")', $str );
+		$str = $this->object->function('cms:has', ['domain', 'type', 'refid']);
+		$this->assertEquals('cms:has("domain","type","refid")', $str);
 	}
 
 
 	public function testGet()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'cms' )->find( '/contact' );
-		$item = $this->object->uses( ['text'] )->get( $item->getId() );
+		$item = \Aimeos\MShop::create($this->context, 'cms')->find('/contact');
+		$item = $this->object->uses(['text'])->get($item->getId());
 
-		$this->assertInstanceOf( \Aimeos\MShop\Cms\Item\Iface::class, $item );
-		$this->assertEquals( 3, count( $item->getRefItems( 'text' ) ) );
+		$this->assertInstanceOf(\Aimeos\MShop\Cms\Item\Iface::class, $item);
+		$this->assertEquals(3, count($item->getRefItems('text')));
 	}
 
 
 	public function testHas()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'text' );
-		$textId = $manager->search( $manager->filter()->add( ['text.domain' => 'cms'] ) )->firstKey();
+		$manager = \Aimeos\MShop::create($this->context, 'text');
+		$textId = $manager->search($manager->filter()->add(['text.domain' => 'cms']))->firstKey();
 
-		$this->assertEquals( 1, count( $this->object->has( 'text', 'default', $textId )->search() ) );
+		$this->assertEquals(1, count($this->object->has('text', 'default', $textId)->search()));
 	}
 
 
 	public function testParse()
 	{
 		$cond = ['&&' => [['==' => ['cms.status' => 1]], ['=~' => ['cms.label' => 'Con']]]];
-		$this->assertEquals( 1, count( $this->object->parse( $cond )->search() ) );
+		$this->assertEquals(1, count($this->object->parse($cond)->search()));
 	}
 
 
 	public function testSearch()
 	{
 		$total = 0;
-		$items = $this->object->uses( ['text'] )->compare( '=~', 'cms.url', '/con' )
-			->sort( 'cms.url' )->search( $total );
+		$items = $this->object->uses(['text'])->compare('=~', 'cms.url', '/con')
+			->sort('cms.url')->search($total);
 
-		$this->assertEquals( 1, count( $items ) );
-		$this->assertEquals( 1, $total );
-		$this->assertEquals( 3, count( $items->first()->getRefItems( 'text' ) ) );
+		$this->assertEquals(1, count($items));
+		$this->assertEquals(1, $total);
+		$this->assertEquals(3, count($items->first()->getRefItems('text')));
 	}
 
 
 	public function testSlice()
 	{
-		$this->assertEquals( 1, count( $this->object->slice( 0, 1 )->search() ) );
+		$this->assertEquals(1, count($this->object->slice(0, 1)->search()));
 	}
 
 
 	public function testSort()
 	{
-		$this->assertGreaterThanOrEqual( 1, count( $this->object->sort()->search() ) );
+		$this->assertGreaterThanOrEqual(1, count($this->object->sort()->search()));
 	}
 
 
 	public function testSortGeneric()
 	{
-		$this->assertGreaterThanOrEqual( 1, count( $this->object->sort( 'cms.label' )->search() ) );
+		$this->assertGreaterThanOrEqual(1, count($this->object->sort('cms.label')->search()));
 	}
 
 
 	public function testSortMultiple()
 	{
-		$this->assertGreaterThanOrEqual( 1, count( $this->object->sort( 'cms.label,-cms.id' )->search() ) );
+		$this->assertGreaterThanOrEqual(1, count($this->object->sort('cms.label,-cms.id')->search()));
 	}
 
 
 	public function testUses()
 	{
-		$this->assertSame( $this->object, $this->object->uses( ['text'] ) );
+		$this->assertSame($this->object, $this->object->uses(['text']));
 	}
 }

client/jsonapi/src/Client/JsonApi/Cms/Factory.php

Spacing +10 added lines, -10 removed lines

@@ -30,10 +30,10 @@ 
 	 * @return \Aimeos\Client\JsonApi\Iface JSON API client
 	 * @throws \Aimeos\Client\JsonApi\Exception If requested client implementation couldn't be found or initialisation fails
 	 */
-	public static function create( \Aimeos\MShop\Context\Item\Iface $context, string $path, string $name = null ) : \Aimeos\Client\JsonApi\Iface
+	public static function create(\Aimeos\MShop\Context\Item\Iface $context, string $path, string $name = null) : \Aimeos\Client\JsonApi\Iface
 	{
-		if( ctype_alnum( $path ) === false ) {
-			throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Invalid client "%1$s"', $path ), 400 );
+		if (ctype_alnum($path) === false) {
+			throw new \Aimeos\Client\JsonApi\Exception(sprintf('Invalid client "%1$s"', $path), 400);
 		}
 
 		/** client/jsonapi/cms/name
@@ -69,18 +69,18 @@ 
 		 * @since 2017.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/jsonapi/cms/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('client/jsonapi/cms/name', 'Standard');
 		}
 
 		$iface = '\\Aimeos\\Client\\JsonApi\\Iface';
 		$classname = '\\Aimeos\\Client\\JsonApi\\Cms\\' . $name;
 
-		if( ctype_alnum( $name ) === false ) {
-			throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+		if (ctype_alnum($name) === false) {
+			throw new \Aimeos\Client\JsonApi\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
-		$client = self::createClient( $classname, $iface, $context, $path );
+		$client = self::createClient($classname, $iface, $context, $path);
 
 
 		/** client/jsonapi/cms/decorators/excludes
@@ -161,8 +161,8 @@ 
 		 * @see client/jsonapi/cms/decorators/global
 		 */
 
-		$client = self::addClientDecorators( $client, $context, $path );
+		$client = self::addClientDecorators($client, $context, $path);
 
-		return $client->setView( $context->getView() );
+		return $client->setView($context->getView());
 	}
 }

client/jsonapi/src/Client/JsonApi/Cms/Standard.php

Spacing +30 added lines, -30 removed lines

@@ -31,29 +31,29 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function get( ServerRequestInterface $request, ResponseInterface $response ) : \Psr\Http\Message\ResponseInterface
+	public function get(ServerRequestInterface $request, ResponseInterface $response) : \Psr\Http\Message\ResponseInterface
 	{
 		$view = $this->getView();
 
 		try
 		{
-			if( $view->param( 'id' ) != '' ) {
-				$response = $this->getItem( $view, $request, $response );
+			if ($view->param('id') != '') {
+				$response = $this->getItem($view, $request, $response);
 			} else {
-				$response = $this->getItems( $view, $request, $response );
+				$response = $this->getItems($view, $request, $response);
 			}
 
 			$status = 200;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = $this->getErrorDetails( $e, 'mshop' );
+			$view->errors = $this->getErrorDetails($e, 'mshop');
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$status = $e->getCode() >= 100 && $e->getCode() < 600 ? $e->getCode() : 500;
-			$view->errors = $this->getErrorDetails( $e );
+			$view->errors = $this->getErrorDetails($e);
 		}
 
 		/** client/jsonapi/cms/template
@@ -78,13 +78,13 @@ 
 		$tplconf = 'client/jsonapi/cms/template';
 		$default = 'cms/standard';
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Allow', 'GET,OPTIONS' )
-			->withHeader( 'Cache-Control', 'max-age=300' )
-			->withHeader( 'Content-Type', 'application/vnd.api+json' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Allow', 'GET,OPTIONS')
+			->withHeader('Cache-Control', 'max-age=300')
+			->withHeader('Content-Type', 'application/vnd.api+json')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 
 
@@ -95,9 +95,9 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function options( ServerRequestInterface $request, ResponseInterface $response ) : \Psr\Http\Message\ResponseInterface
+	public function options(ServerRequestInterface $request, ResponseInterface $response) : \Psr\Http\Message\ResponseInterface
 	{
-		return $this->getOptionsResponse( $request, $response, 'GET,OPTIONS' );
+		return $this->getOptionsResponse($request, $response, 'GET,OPTIONS');
 	}
 
 
@@ -109,17 +109,17 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function getItem( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) : \Psr\Http\Message\ResponseInterface
+	protected function getItem(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) : \Psr\Http\Message\ResponseInterface
 	{
-		$ref = $view->param( 'include', [] );
+		$ref = $view->param('include', []);
 
-		if( is_string( $ref ) ) {
-			$ref = explode( ',', $ref );
+		if (is_string($ref)) {
+			$ref = explode(',', $ref);
 		}
 
-		$cntl = \Aimeos\Controller\Frontend::create( $this->getContext(), 'cms' );
+		$cntl = \Aimeos\Controller\Frontend::create($this->getContext(), 'cms');
 
-		$view->items = $cntl->uses( $ref )->get( $view->param( 'id' ) );
+		$view->items = $cntl->uses($ref)->get($view->param('id'));
 		$view->total = 1;
 
 		return $response;
@@ -134,19 +134,19 @@ 
 	 * @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 ) : \Psr\Http\Message\ResponseInterface
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) : \Psr\Http\Message\ResponseInterface
 	{
 		$total = 0;
-		$ref = $view->param( 'include', [] );
+		$ref = $view->param('include', []);
 
-		if( is_string( $ref ) ) {
-			$ref = explode( ',', $ref );
+		if (is_string($ref)) {
+			$ref = explode(',', $ref);
 		}
 
-		$cmss = \Aimeos\Controller\Frontend::create( $this->getContext(), 'cms' )
-			->slice( $view->param( 'page/offset', 0 ), $view->param( 'page/limit', 25 ) )
-			->sort( $view->param( 'sort' ) )->parse( $view->param( 'filter', [] ) )
-			->uses( $ref )->search( $total );
+		$cmss = \Aimeos\Controller\Frontend::create($this->getContext(), 'cms')
+			->slice($view->param('page/offset', 0), $view->param('page/limit', 25))
+			->sort($view->param('sort'))->parse($view->param('filter', []))
+			->uses($ref)->search($total);
 
 		$view->items = $cmss;
 		$view->total = $total;

Braces +2 added lines, -4 removed lines

@@ -44,13 +44,11 @@
 			}
 
 			$status = 200;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$status = 404;
 			$view->errors = $this->getErrorDetails( $e, 'mshop' );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = $e->getCode() >= 100 && $e->getCode() < 600 ? $e->getCode() : 500;
 			$view->errors = $this->getErrorDetails( $e );

client/jsonapi/templates/cms/standard.php

Spacing +52 added lines, -52 removed lines

@@ -10,42 +10,42 @@ 
 
 $enc = $this->encoder();
 
-$target = $this->config( 'client/jsonapi/url/target' );
-$cntl = $this->config( 'client/jsonapi/url/controller', 'jsonapi' );
-$action = $this->config( 'client/jsonapi/url/action', 'get' );
-$config = $this->config( 'client/jsonapi/url/config', [] );
+$target = $this->config('client/jsonapi/url/target');
+$cntl = $this->config('client/jsonapi/url/controller', 'jsonapi');
+$action = $this->config('client/jsonapi/url/action', 'get');
+$config = $this->config('client/jsonapi/url/config', []);
 
 
-$total = $this->get( 'total', 0 );
-$offset = max( $this->param( 'page/offset', 0 ), 0 );
-$limit = max( $this->param( 'page/limit', 100 ), 1 );
+$total = $this->get('total', 0);
+$offset = max($this->param('page/offset', 0), 0);
+$limit = max($this->param('page/limit', 100), 1);
 
-$first = ( $offset > 0 ? 0 : null );
-$prev = ( $offset - $limit >= 0 ? $offset - $limit : null );
-$next = ( $offset + $limit < $total ? $offset + $limit : null );
-$last = ( ( (int) ( $total / $limit ) ) * $limit > $offset ? ( (int) ( $total / $limit ) ) * $limit : null );
+$first = ($offset > 0 ? 0 : null);
+$prev = ($offset - $limit >= 0 ? $offset - $limit : null);
+$next = ($offset + $limit < $total ? $offset + $limit : null);
+$last = (((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null);
 
 
-$ref = array( 'resource', 'id', 'related', 'relatedid', 'filter', 'page', 'sort', 'include', 'fields' );
-$params = array_intersect_key( $this->param(), array_flip( $ref ) );
+$ref = array('resource', 'id', 'related', 'relatedid', 'filter', 'page', 'sort', 'include', 'fields');
+$params = array_intersect_key($this->param(), array_flip($ref));
 
-$pretty = $this->param( 'pretty' ) ? JSON_PRETTY_PRINT : 0;
-$fields = $this->param( 'fields', [] );
+$pretty = $this->param('pretty') ? JSON_PRETTY_PRINT : 0;
+$fields = $this->param('fields', []);
 
-foreach( (array) $fields as $resource => $list ) {
-	$fields[$resource] = array_flip( explode( ',', $list ) );
+foreach ((array) $fields as $resource => $list) {
+	$fields[$resource] = array_flip(explode(',', $list));
 }
 
 
-$entryFcn = function( \Aimeos\MShop\Cms\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config )
+$entryFcn = function(\Aimeos\MShop\Cms\Item\Iface $item) use ($fields, $target, $cntl, $action, $config)
 {
 	$id = $item->getId();
 	$type = $item->getResourceType();
-	$params = array( 'resource' => $type, 'id' => $id );
+	$params = array('resource' => $type, 'id' => $id);
 	$attributes = $item->toArray();
 
-	if( isset( $fields[$type] ) ) {
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
+	if (isset($fields[$type])) {
+		$attributes = array_intersect_key($attributes, $fields[$type]);
 	}
 
 	$entry = array(
@@ -53,26 +53,26 @@ 
 		'type' => $type,
 		'links' => array(
 			'self' => array(
-				'href' => $this->url( $target, $cntl, $action, $params, [], $config ),
-				'allow' => array( 'GET' ),
+				'href' => $this->url($target, $cntl, $action, $params, [], $config),
+				'allow' => array('GET'),
 			),
 		),
 		'attributes' => $attributes,
 	);
 
-	foreach( $item->getListItems() as $listItem )
+	foreach ($item->getListItems() as $listItem)
 	{
-		if( ( $refItem = $listItem->getRefItem() ) !== null && $refItem->isAvailable() )
+		if (($refItem = $listItem->getRefItem()) !== null && $refItem->isAvailable())
 		{
 			$ltype = $listItem->getResourceType();
 			$type = $refItem->getResourceType();
 			$attributes = $listItem->toArray();
 
-			if( isset( $fields[$ltype] ) ) {
-				$attributes = array_intersect_key( $attributes, $fields[$ltype] );
+			if (isset($fields[$ltype])) {
+				$attributes = array_intersect_key($attributes, $fields[$ltype]);
 			}
 
-			$data = array( 'id' => $refItem->getId(), 'type' => $type, 'attributes' => $attributes );
+			$data = array('id' => $refItem->getId(), 'type' => $type, 'attributes' => $attributes);
 			$entry['relationships'][$type]['data'][] = $data;
 		}
 	}
@@ -85,9 +85,9 @@ 
 {
 	"meta": {
 		"total": <?= $total; ?>,
-		"prefix": <?= json_encode( $this->get( 'prefix' ) ); ?>,
-		"content-baseurl": "<?= $this->config( 'resource/fs/baseurl' ); ?>"
-		<?php if( $this->csrf()->name() != '' ) : ?>
+		"prefix": <?= json_encode($this->get('prefix')); ?>,
+		"content-baseurl": "<?= $this->config('resource/fs/baseurl'); ?>"
+		<?php if ($this->csrf()->name() != '') : ?>
 			, "csrf": {
 				"name": "<?= $this->csrf()->name(); ?>",
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -96,46 +96,46 @@ 
 
 	},
 	"links": {
-		<?php if( is_map( $this->get( 'items' ) ) ) : ?>
-			<?php if( $first !== null ) : ?>
-				"first": "<?php $params['page']['offset'] = $first; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
+		<?php if (is_map($this->get('items'))) : ?>
+			<?php if ($first !== null) : ?>
+				"first": "<?php $params['page']['offset'] = $first; echo $this->url($target, $cntl, $action, $params, [], $config); ?>",
 			<?php endif; ?>
-			<?php if( $prev !== null ) : ?>
-				"prev": "<?php $params['page']['offset'] = $prev; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
+			<?php if ($prev !== null) : ?>
+				"prev": "<?php $params['page']['offset'] = $prev; echo $this->url($target, $cntl, $action, $params, [], $config); ?>",
 			<?php endif; ?>
-			<?php if( $next !== null ) : ?>
-				"next": "<?php $params['page']['offset'] = $next; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
+			<?php if ($next !== null) : ?>
+				"next": "<?php $params['page']['offset'] = $next; echo $this->url($target, $cntl, $action, $params, [], $config); ?>",
 			<?php endif; ?>
-			<?php if( $last !== null ) : ?>
-				"last": "<?php $params['page']['offset'] = $last; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
+			<?php if ($last !== null) : ?>
+				"last": "<?php $params['page']['offset'] = $last; echo $this->url($target, $cntl, $action, $params, [], $config); ?>",
 			<?php endif; ?>
 		<?php endif; ?>
-		"self": "<?php $params['page']['offset'] = $offset; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>"
+		"self": "<?php $params['page']['offset'] = $offset; echo $this->url($target, $cntl, $action, $params, [], $config); ?>"
 	}
-	<?php if( isset( $this->errors ) ) : ?>
-		,"errors": <?= json_encode( $this->errors, $pretty ); ?>
+	<?php if (isset($this->errors)) : ?>
+		,"errors": <?= json_encode($this->errors, $pretty); ?>
 
-	<?php elseif( isset( $this->items ) ) : ?>
+	<?php elseif (isset($this->items)) : ?>
 		<?php
 			$data = [];
-			$items = $this->get( 'items', map() );
-			$included = $this->jincluded( $items, $fields );
+			$items = $this->get('items', map());
+			$included = $this->jincluded($items, $fields);
 
-			if( is_map( $items ) )
+			if (is_map($items))
 			{
-				foreach( $items as $item ) {
-					$data[] = $entryFcn( $item );
+				foreach ($items as $item) {
+					$data[] = $entryFcn($item);
 				}
 			}
 			else
 			{
-				$data = $entryFcn( $items );
+				$data = $entryFcn($items);
 			}
 		 ?>
 
-		,"data": <?= json_encode( $data, $pretty ); ?>
+		,"data": <?= json_encode($data, $pretty); ?>
 
-		,"included": <?= map( $included )->flat( 1 )->toJson( $pretty ) ?>
+		,"included": <?= map($included)->flat(1)->toJson($pretty) ?>
 
 	<?php endif; ?>
 

Braces +1 added lines, -2 removed lines

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

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

Spacing +8 added lines, -8 removed lines

@@ -15,8 +15,8 @@ 
 	{
 		$context = \TestHelperJapi::getContext();
 
-		$client = \Aimeos\Client\JsonApi\Cms\Factory::create( $context, 'cms' );
-		$this->assertInstanceOf( \Aimeos\Client\JsonApi\Iface::class, $client );
+		$client = \Aimeos\Client\JsonApi\Cms\Factory::create($context, 'cms');
+		$this->assertInstanceOf(\Aimeos\Client\JsonApi\Iface::class, $client);
 	}
 
 
@@ -24,8 +24,8 @@ 
 	{
 		$context = \TestHelperJapi::getContext();
 
-		$this->expectException( \Aimeos\Client\JsonApi\Exception::class );
-		\Aimeos\Client\JsonApi\Cms\Factory::create( $context, '' );
+		$this->expectException(\Aimeos\Client\JsonApi\Exception::class);
+		\Aimeos\Client\JsonApi\Cms\Factory::create($context, '');
 	}
 
 
@@ -33,8 +33,8 @@ 
 	{
 		$context = \TestHelperJapi::getContext();
 
-		$this->expectException( \Aimeos\Client\JsonApi\Exception::class );
-		\Aimeos\Client\JsonApi\Cms\Factory::create( $context, '%^' );
+		$this->expectException(\Aimeos\Client\JsonApi\Exception::class);
+		\Aimeos\Client\JsonApi\Cms\Factory::create($context, '%^');
 	}
 
 
@@ -42,7 +42,7 @@ 
 	{
 		$context = \TestHelperJapi::getContext();
 
-		$this->expectException( \Aimeos\Client\JsonApi\Exception::class );
-		\Aimeos\Client\JsonApi\Cms\Factory::create( $context, 'cms', '%^' );
+		$this->expectException(\Aimeos\Client\JsonApi\Exception::class);
+		\Aimeos\Client\JsonApi\Cms\Factory::create($context, 'cms', '%^');
 	}
 }

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

Spacing +71 added lines, -71 removed lines

@@ -19,18 +19,18 @@ 
 	protected function setUp() : void
 	{
 		$this->context = \TestHelperJapi::getContext();
-		$this->context->getLocale()->setLanguageId( 'en' );
+		$this->context->getLocale()->setLanguageId('en');
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Client\JsonApi\Cms\Standard( $this->context, 'cms' );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Client\JsonApi\Cms\Standard($this->context, 'cms');
+		$this->object->setView($this->view);
 	}
 
 
 	public function testGetItem()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'cms' );
-		$pageId = $manager->find( '/contact' )->getId();
+		$manager = \Aimeos\MShop::create($this->context, 'cms');
+		$pageId = $manager->find('/contact')->getId();
 
 		$params = array(
 			'id' => $pageId,
@@ -41,22 +41,22 @@ 
 			'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( 'Allow' ) ) );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Allow')));
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 'cms', $result['data']['type'] );
-		$this->assertEquals( 3, count( $result['data']['relationships']['text']['data'] ) );
-		$this->assertEquals( 3, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals('cms', $result['data']['type']);
+		$this->assertEquals(3, count($result['data']['relationships']['text']['data']));
+		$this->assertEquals(3, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -64,7 +64,7 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'=~' => array( 'cms.url' => '/cont' ),
+				'=~' => array('cms.url' => '/cont'),
 			),
 			'fields' => array(
 				'cms' => 'cms.id,cms.label,cms.url'
@@ -72,23 +72,23 @@ 
 			'include' => 'text',
 			'sort' => 'cms.label,-cms.id',
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Allow' ) ) );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Allow')));
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'cms', $result['data'][0]['type'] );
-		$this->assertEquals( 3, count( $result['data'][0]['attributes'] ) );
-		$this->assertEquals( 3, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('cms', $result['data'][0]['type']);
+		$this->assertEquals(3, count($result['data'][0]['attributes']));
+		$this->assertEquals(3, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -96,78 +96,78 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'=~' => array( 'cms.url' => '/contact' ),
+				'=~' => array('cms.url' => '/contact'),
 			),
 			'sort' => 'cms.label',
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testGetMShopException()
 	{
-		$object = $this->getMockBuilder( \Aimeos\Client\JsonApi\Cms\Standard::class )
-			->setConstructorArgs( [$this->context, 'cms'] )
-			->setMethods( ['getItems'] )
+		$object = $this->getMockBuilder(\Aimeos\Client\JsonApi\Cms\Standard::class)
+			->setConstructorArgs([$this->context, 'cms'])
+			->setMethods(['getItems'])
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getItems' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception() ) );
+		$object->expects($this->once())->method('getItems')
+			->will($this->throwException(new \Aimeos\MShop\Exception()));
 
-		$object->setView( $this->view );
+		$object->setView($this->view);
 
-		$response = $object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 404, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(404, $response->getStatusCode());
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
 	public function testGetException()
 	{
-		$object = $this->getMockBuilder( \Aimeos\Client\JsonApi\Cms\Standard::class )
-			->setConstructorArgs( [$this->context, 'cms'] )
-			->setMethods( ['getItems'] )
+		$object = $this->getMockBuilder(\Aimeos\Client\JsonApi\Cms\Standard::class)
+			->setConstructorArgs([$this->context, 'cms'])
+			->setMethods(['getItems'])
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getItems' )
-			->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('getItems')
+			->will($this->throwException(new \Exception()));
 
-		$object->setView( $this->view );
+		$object->setView($this->view);
 
-		$response = $object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 500, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(500, $response->getStatusCode());
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
 	public function testOptions()
 	{
-		$response = $this->object->options( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
-
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Allow' ) ) );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
-
-		$this->assertEquals( null, $result['meta']['prefix'] );
-		$this->assertArrayNotHasKey( 'attributes', $result['meta'] );
-		$this->assertArrayNotHasKey( 'filter', $result['meta'] );
-		$this->assertArrayNotHasKey( 'sort', $result['meta'] );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$response = $this->object->options($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
+
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Allow')));
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
+
+		$this->assertEquals(null, $result['meta']['prefix']);
+		$this->assertArrayNotHasKey('attributes', $result['meta']);
+		$this->assertArrayNotHasKey('filter', $result['meta']);
+		$this->assertArrayNotHasKey('sort', $result['meta']);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }

client/jsonapi/tests/TestHelperJapi.php

Spacing +40 added lines, -40 removed lines

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