aimeos / ai-cms-grapesjs

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;
 	}

client/html/src/Client/Html/Cms/Page/Factory.php

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return \Aimeos\Client\Html\Iface Page part implementing \Aimeos\Client\Html\Iface
 	 * @throws \Aimeos\Client\Html\Exception If requested client implementation couldn't be found or initialisation fails
 	 */
-	public static function create( \Aimeos\MShop\Context\Item\Iface $context, string $name = null ) : \Aimeos\Client\Html\Iface
+	public static function create(\Aimeos\MShop\Context\Item\Iface $context, string $name = null) : \Aimeos\Client\Html\Iface
 	{
 		/** client/html/cms/page/name
 		 * Class name of the used cms page client implementation
@@ -64,20 +64,20 @@ 
 		 * @since 2021.04
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/html/cms/page/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('client/html/cms/page/name', 'Standard');
 		}
 
 		$iface = '\\Aimeos\\Client\\Html\\Iface';
 		$classname = '\\Aimeos\\Client\\Html\\Cms\\Page\\' . $name;
 
-		if( ctype_alnum( $name ) === false ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+		if (ctype_alnum($name) === false) {
+			throw new \Aimeos\Client\Html\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
-		$client = self::createClient( $context, $classname, $iface );
-		$client = self::addClientDecorators( $context, $client, 'cms/page' );
+		$client = self::createClient($context, $classname, $iface);
+		$client = self::addClientDecorators($context, $client, 'cms/page');
 
-		return $client->setObject( $client );
+		return $client->setObject($client);
 	}
 }

client/html/src/Client/Html/Cms/Page/Standard.php

Spacing +56 added lines, -56 removed lines

@@ -68,7 +68,7 @@ 
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @return string HTML code
 	 */
-	public function getBody( string $uid = '' ) : string
+	public function getBody(string $uid = '') : string
 	{
 		$prefixes = ['path'];
 		$context = $this->getContext();
@@ -100,7 +100,7 @@ 
 		 */
 		$confkey = 'client/html/cms/page';
 
-		if( ( $html = $this->getCached( 'body', $uid, $prefixes, $confkey ) ) === null )
+		if (($html = $this->getCached('body', $uid, $prefixes, $confkey)) === null)
 		{
 			$view = $this->getView();
 
@@ -131,47 +131,47 @@ 
 			{
 				$html = '';
 
-				if( !isset( $this->view ) ) {
-					$view = $this->view = $this->getObject()->addData( $view, $this->tags, $this->expire );
+				if (!isset($this->view)) {
+					$view = $this->view = $this->getObject()->addData($view, $this->tags, $this->expire);
 				}
 
-				foreach( $this->getSubClients() as $subclient ) {
-					$html .= $subclient->setView( $view )->getBody( $uid );
+				foreach ($this->getSubClients() as $subclient) {
+					$html .= $subclient->setView($view)->getBody($uid);
 				}
 				$view->pageBody = $html;
 
-				$html = $view->render( $view->config( $tplconf, $default ) );
-				$this->setCached( 'body', $uid, $prefixes, $confkey, $html, $this->tags, $this->expire );
+				$html = $view->render($view->config($tplconf, $default));
+				$this->setCached('body', $uid, $prefixes, $confkey, $html, $this->tags, $this->expire);
 
 				return $html;
 			}
-			catch( \Aimeos\Client\Html\Exception $e )
+			catch (\Aimeos\Client\Html\Exception $e)
 			{
-				$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
-				$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );
+				$error = array($context->getI18n()->dt('client', $e->getMessage()));
+				$view->pageErrorList = array_merge($view->get('pageErrorList', []), $error);
 			}
-			catch( \Aimeos\Controller\Frontend\Exception $e )
+			catch (\Aimeos\Controller\Frontend\Exception $e)
 			{
-				$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-				$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );
+				$error = array($context->getI18n()->dt('controller/frontend', $e->getMessage()));
+				$view->pageErrorList = array_merge($view->get('pageErrorList', []), $error);
 			}
-			catch( \Aimeos\MShop\Exception $e )
+			catch (\Aimeos\MShop\Exception $e)
 			{
-				$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-				$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );
+				$error = array($context->getI18n()->dt('mshop', $e->getMessage()));
+				$view->pageErrorList = array_merge($view->get('pageErrorList', []), $error);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
-				$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
-				$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );
-				$this->logException( $e );
+				$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+				$view->pageErrorList = array_merge($view->get('pageErrorList', []), $error);
+				$this->logException($e);
 			}
 
-			$html = $view->render( $view->config( $tplconf, $default ) );
+			$html = $view->render($view->config($tplconf, $default));
 		}
 		else
 		{
-			$html = $this->modifyBody( $html, $uid );
+			$html = $this->modifyBody($html, $uid);
 		}
 
 		return $html;
@@ -184,12 +184,12 @@ 
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( string $uid = '' ) : ?string
+	public function getHeader(string $uid = '') : ?string
 	{
 		$prefixes = ['page'];
 		$confkey = 'client/html/cms/page';
 
-		if( ( $html = $this->getCached( 'header', $uid, $prefixes, $confkey ) ) === null )
+		if (($html = $this->getCached('header', $uid, $prefixes, $confkey)) === null)
 		{
 			$view = $this->getView();
 
@@ -221,28 +221,28 @@ 
 			{
 				$html = '';
 
-				if( !isset( $this->view ) ) {
-					$view = $this->view = $this->getObject()->addData( $view, $this->tags, $this->expire );
+				if (!isset($this->view)) {
+					$view = $this->view = $this->getObject()->addData($view, $this->tags, $this->expire);
 				}
 
-				foreach( $this->getSubClients() as $subclient ) {
-					$html .= $subclient->setView( $view )->getHeader( $uid );
+				foreach ($this->getSubClients() as $subclient) {
+					$html .= $subclient->setView($view)->getHeader($uid);
 				}
 				$view->pageHeader = $html;
 
-				$html = $view->render( $view->config( $tplconf, $default ) );
-				$this->setCached( 'header', $uid, $prefixes, $confkey, $html, $this->tags, $this->expire );
+				$html = $view->render($view->config($tplconf, $default));
+				$this->setCached('header', $uid, $prefixes, $confkey, $html, $this->tags, $this->expire);
 
 				return $html;
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
-				$this->logException( $e );
+				$this->logException($e);
 			}
 		}
 		else
 		{
-			$html = $this->modifyHeader( $html, $uid );
+			$html = $this->modifyHeader($html, $uid);
 		}
 
 		return $html;
@@ -256,7 +256,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Client\Html\Iface Sub-client object
 	 */
-	public function getSubClient( string $type, string $name = null ) : \Aimeos\Client\Html\Iface
+	public function getSubClient(string $type, string $name = null) : \Aimeos\Client\Html\Iface
 	{
 		/** client/html/cms/page/decorators/excludes
 		 * Excludes decorators added by the "common" option from the cms page html client
@@ -331,7 +331,7 @@ 
 		 * @see client/html/cms/page/decorators/excludes
 		 * @see client/html/cms/page/decorators/global
 		 */
-		return $this->createSubClient( 'cms/page/' . $type, $name );
+		return $this->createSubClient('cms/page/' . $type, $name);
 	}
 
 
@@ -350,26 +350,26 @@ 
 		{
 			parent::process();
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );
+			$error = array($context->getI18n()->dt('client', $e->getMessage()));
+			$view->pageErrorList = array_merge($view->get('pageErrorList', []), $error);
 		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Exception $e)
 		{
-			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );
+			$error = array($context->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->pageErrorList = array_merge($view->get('pageErrorList', []), $error);
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );
+			$error = array($context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->pageErrorList = array_merge($view->get('pageErrorList', []), $error);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
-			$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );
-			$this->logException( $e );
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->pageErrorList = array_merge($view->get('pageErrorList', []), $error);
+			$this->logException($e);
 		}
 	}
 
@@ -381,7 +381,7 @@ 
 	 */
 	protected function getSubClientNames() : array
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -393,10 +393,10 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	public function addData( \Aimeos\MW\View\Iface $view, array &$tags = [], string &$expire = null ) : \Aimeos\MW\View\Iface
+	public function addData(\Aimeos\MW\View\Iface $view, array &$tags = [], string &$expire = null) : \Aimeos\MW\View\Iface
 	{
 		$context = $this->getContext();
-		$controller = \Aimeos\Controller\Frontend::create( $context, 'cms' );
+		$controller = \Aimeos\Controller\Frontend::create($context, 'cms');
 
 		/** client/html/cms/page/domains
 		 * A list of domain names whose items should be available in the cms page view template
@@ -411,14 +411,14 @@ 
 		 * @param array List of domain names
 		 * @since 2021.04
 		 */
-		$domains = $context->getConfig()->get( 'client/html/cms/page/domains', ['media', 'text'] );
+		$domains = $context->getConfig()->get('client/html/cms/page/domains', ['media', 'text']);
 
-		$page = $controller->uses( $domains )->find( $view->param( 'path', '/' ) );
+		$page = $controller->uses($domains)->find($view->param('path', '/'));
 
-		$this->addMetaItems( $page, $expire, $tags );
+		$this->addMetaItems($page, $expire, $tags);
 
 		$view->pageCmsItem = $page;
 
-		return parent::addData( $view, $tags, $expire );
+		return parent::addData($view, $tags, $expire);
 	}
 }

Braces +11 added lines, -22 removed lines

@@ -144,23 +144,19 @@ 
 				$this->setCached( 'body', $uid, $prefixes, $confkey, $html, $this->tags, $this->expire );
 
 				return $html;
-			}
-			catch( \Aimeos\Client\Html\Exception $e )
+			} catch( \Aimeos\Client\Html\Exception $e )
 			{
 				$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
 				$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );
-			}
-			catch( \Aimeos\Controller\Frontend\Exception $e )
+			} catch( \Aimeos\Controller\Frontend\Exception $e )
 			{
 				$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
 				$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );
-			}
-			catch( \Aimeos\MShop\Exception $e )
+			} catch( \Aimeos\MShop\Exception $e )
 			{
 				$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 				$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
 				$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );
@@ -168,8 +164,7 @@ 
 			}
 
 			$html = $view->render( $view->config( $tplconf, $default ) );
-		}
-		else
+		} else
 		{
 			$html = $this->modifyBody( $html, $uid );
 		}
@@ -234,13 +229,11 @@ 
 				$this->setCached( 'header', $uid, $prefixes, $confkey, $html, $this->tags, $this->expire );
 
 				return $html;
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$this->logException( $e );
 			}
-		}
-		else
+		} else
 		{
 			$html = $this->modifyHeader( $html, $uid );
 		}
@@ -349,23 +342,19 @@ 
 		try
 		{
 			parent::process();
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		} catch( \Aimeos\Client\Html\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
 			$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
 			$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
 			$view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error );

client/html/templates/cms/page/header-standard.php

Spacing +19 added lines, -19 removed lines

@@ -7,10 +7,10 @@ 
 
 $enc = $this->encoder();
 
-$target = $this->config( 'client/html/cms/page/url/target' );
-$cntl = $this->config( 'client/html/cms/page/url/controller', 'cms' );
-$action = $this->config( 'client/html/cms/page/url/action', 'page' );
-$config = $this->config( 'client/html/cms/page/url/config', [] );
+$target = $this->config('client/html/cms/page/url/target');
+$cntl = $this->config('client/html/cms/page/url/controller', 'cms');
+$action = $this->config('client/html/cms/page/url/action', 'page');
+$config = $this->config('client/html/cms/page/url/config', []);
 
 
 /** client/html/cms/page/metatags
@@ -32,30 +32,30 @@ 
 
 
 ?>
-<?php if( (bool) $this->config( 'client/html/cms/page/metatags', true ) === true ) : ?>
-	<?php if( isset( $this->pageCmsItem ) ) : ?>
-		<title><?= $enc->html( $this->pageCmsItem->getName() ); ?></title>
+<?php if ((bool) $this->config('client/html/cms/page/metatags', true) === true) : ?>
+	<?php if (isset($this->pageCmsItem)) : ?>
+		<title><?= $enc->html($this->pageCmsItem->getName()); ?></title>
 
-		<?php foreach( $this->pageCmsItem->getRefItems( 'text', 'meta-keyword', 'default' ) as $textItem ) : ?>
-			<meta name="keywords" content="<?= $enc->attr( strip_tags( $textItem->getContent() ) ); ?>" />
+		<?php foreach ($this->pageCmsItem->getRefItems('text', 'meta-keyword', 'default') as $textItem) : ?>
+			<meta name="keywords" content="<?= $enc->attr(strip_tags($textItem->getContent())); ?>" />
 		<?php endforeach; ?>
 
-		<?php foreach( $this->pageCmsItem->getRefItems( 'text', 'meta-description', 'default' ) as $textItem ) : ?>
-			<meta name="description" content="<?= $enc->attr( strip_tags( $textItem->getContent() ) ); ?>" />
+		<?php foreach ($this->pageCmsItem->getRefItems('text', 'meta-description', 'default') as $textItem) : ?>
+			<meta name="description" content="<?= $enc->attr(strip_tags($textItem->getContent())); ?>" />
 		<?php endforeach; ?>
 
-		<link rel="canonical" href="<?= $enc->attr( $this->url( $target, $cntl, $action, ['path' => $this->pageCmsItem->getUrl()], $config + ['absoluteUri' => true] ) ); ?>" />
+		<link rel="canonical" href="<?= $enc->attr($this->url($target, $cntl, $action, ['path' => $this->pageCmsItem->getUrl()], $config + ['absoluteUri' => true])); ?>" />
 
 		<meta property="og:type" content="article" />
-		<meta property="og:title" content="<?= $enc->html( $this->pageCmsItem->getName() ); ?>" />
-		<meta property="og:url" content="<?= $enc->attr( $this->url( $target, $cntl, $action, ['path' => $this->pageCmsItem->getUrl()], $config + ['absoluteUri' => true] ) ); ?>" />
+		<meta property="og:title" content="<?= $enc->html($this->pageCmsItem->getName()); ?>" />
+		<meta property="og:url" content="<?= $enc->attr($this->url($target, $cntl, $action, ['path' => $this->pageCmsItem->getUrl()], $config + ['absoluteUri' => true])); ?>" />
 
-		<?php foreach( $this->pageCmsItem->getRefItems( 'text', 'short', 'default' ) as $textItem ) : ?>
-			<meta property="og:description" content="<?= $enc->attr( $textItem->getContent() ) ?>" />
+		<?php foreach ($this->pageCmsItem->getRefItems('text', 'short', 'default') as $textItem) : ?>
+			<meta property="og:description" content="<?= $enc->attr($textItem->getContent()) ?>" />
 		<?php endforeach ?>
 
-		<?php foreach( $this->pageCmsItem->getRefItems( 'media', 'default', 'default' ) as $mediaItem ) : ?>
-			<meta property="og:image" content="<?= $enc->attr( $this->content( $mediaItem->getUrl() ) ) ?>" />
+		<?php foreach ($this->pageCmsItem->getRefItems('media', 'default', 'default') as $mediaItem) : ?>
+			<meta property="og:image" content="<?= $enc->attr($this->content($mediaItem->getUrl())) ?>" />
 		<?php endforeach ?>
 
 		<meta name="twitter:card" content="summary_large_image" />
@@ -65,4 +65,4 @@ 
 
 <?php endif; ?>
 
-<?= $this->get( 'pageHeader' ); ?>
+<?= $this->get('pageHeader'); ?>

client/html/templates/cms/page/body-standard.php

Spacing +6 added lines, -6 removed lines

@@ -14,18 +14,18 @@
 
 
 ?>
-<section class="aimeos cms-page" data-jsonurl="<?= $enc->attr( $this->link( 'client/jsonapi/url' ) ); ?>">
+<section class="aimeos cms-page" data-jsonurl="<?= $enc->attr($this->link('client/jsonapi/url')); ?>">
 
-	<?php if( isset( $this->pageErrorList ) ) : ?>
+	<?php if (isset($this->pageErrorList)) : ?>
 		<ul class="error-list">
-			<?php foreach( (array) $this->pageErrorList as $errmsg ) : ?>
-				<li class="error-item"><?= $enc->html( $errmsg ); ?></li>
+			<?php foreach ((array) $this->pageErrorList as $errmsg) : ?>
+				<li class="error-item"><?= $enc->html($errmsg); ?></li>
 			<?php endforeach; ?>
 		</ul>
 	<?php endif; ?>
 
-	<?php if( isset( $this->pageCmsItem ) ) : ?>
-		<?php foreach( $this->pageCmsItem->getRefItems( 'text', 'content' ) as $textItem ) : ?>
+	<?php if (isset($this->pageCmsItem)) : ?>
+		<?php foreach ($this->pageCmsItem->getRefItems('text', 'content') as $textItem) : ?>
 			<?= $textItem->getContent() ?>
 		<?php endforeach ?>
 	<?php endif; ?>

client/html/tests/Client/Html/Cms/Page/FactoryTest.php

Spacing +9 added lines, -9 removed lines

@@ -22,35 +22,35 @@
 
 	protected function tearDown() : void
 	{
-		unset( $this->context );
+		unset($this->context);
 	}
 
 
 	public function testCreateClient()
 	{
-		$client = \Aimeos\Client\Html\Cms\Page\Factory::create( $this->context );
-		$this->assertInstanceOf( '\\Aimeos\\Client\\Html\\Iface', $client );
+		$client = \Aimeos\Client\Html\Cms\Page\Factory::create($this->context);
+		$this->assertInstanceOf('\\Aimeos\\Client\\Html\\Iface', $client);
 	}
 
 
 	public function testCreateClientName()
 	{
-		$client = \Aimeos\Client\Html\Cms\Page\Factory::create( $this->context, 'Standard' );
-		$this->assertInstanceOf( '\\Aimeos\\Client\\Html\\Iface', $client );
+		$client = \Aimeos\Client\Html\Cms\Page\Factory::create($this->context, 'Standard');
+		$this->assertInstanceOf('\\Aimeos\\Client\\Html\\Iface', $client);
 	}
 
 
 	public function testCreateClientNameInvalid()
 	{
-		$this->expectException( '\\Aimeos\\Client\\Html\\Exception' );
-		\Aimeos\Client\Html\Cms\Page\Factory::create( $this->context, '$$$' );
+		$this->expectException('\\Aimeos\\Client\\Html\\Exception');
+		\Aimeos\Client\Html\Cms\Page\Factory::create($this->context, '$$$');
 	}
 
 
 	public function testCreateClientNameNotFound()
 	{
-		$this->expectException( '\\Aimeos\\Client\\Html\\Exception' );
-		\Aimeos\Client\Html\Cms\Page\Factory::create( $this->context, 'notfound' );
+		$this->expectException('\\Aimeos\\Client\\Html\\Exception');
+		\Aimeos\Client\Html\Cms\Page\Factory::create($this->context, 'notfound');
 	}
 
 }