aimeos / ai-admin-jsonadm

admin/jsonadm/tests/Admin/JsonAdm/FactoryTest.php

Spacing +39 added lines, -39 removed lines

@@ -16,9 +16,9 @@ 
 		$context = \TestHelperJadm::getContext();
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 
-		$client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Order\\Standard', $client );
+		$client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Order\\Standard', $client);
 	}
 
 
@@ -27,9 +27,9 @@ 
 		$context = \TestHelperJadm::getContext();
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 
-		$client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order/base' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Order\\Base\\Standard', $client );
+		$client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order/base');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Order\\Base\\Standard', $client);
 	}
 
 
@@ -38,9 +38,9 @@ 
 		$context = \TestHelperJadm::getContext();
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 
-		$client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'stock/type' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Standard', $client );
+		$client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'stock/type');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Standard', $client);
 	}
 
 
@@ -49,9 +49,9 @@ 
 		$context = \TestHelperJadm::getContext();
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 
-		$client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, '' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Standard', $client );
+		$client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, '');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Standard', $client);
 	}
 
 
@@ -60,8 +60,8 @@ 
 		$context = \TestHelperJadm::getContext();
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
-		\Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, '%^' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
+		\Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, '%^');
 	}
 
 
@@ -70,68 +70,68 @@ 
 		$context = \TestHelperJadm::getContext();
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
-		\Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, '', '%^' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
+		\Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, '', '%^');
 	}
 
 
 	public function testClear()
 	{
-		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true );
+		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true);
 
 		$context = \TestHelperJadm::getContext();
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 
-		$client1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' );
+		$client1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order');
 		\Aimeos\Admin\JsonAdm\Factory::clear();
-		$client2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' );
+		$client2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order');
 
-		\Aimeos\Admin\JsonAdm\Factory::setCache( $cache );
+		\Aimeos\Admin\JsonAdm\Factory::setCache($cache);
 
-		$this->assertNotSame( $client1, $client2 );
+		$this->assertNotSame($client1, $client2);
 	}
 
 
 	public function testClearSite()
 	{
-		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true );
+		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true);
 
 		$context = \TestHelperJadm::getContext();
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 
-		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' );
-		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order/base' );
-		\Aimeos\Admin\JsonAdm\Factory::clear( (string) $context );
+		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order');
+		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order/base');
+		\Aimeos\Admin\JsonAdm\Factory::clear((string) $context);
 
-		$cntlA2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' );
-		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order/base' );
+		$cntlA2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order');
+		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order/base');
 
-		\Aimeos\Admin\JsonAdm\Factory::setCache( $cache );
+		\Aimeos\Admin\JsonAdm\Factory::setCache($cache);
 
-		$this->assertNotSame( $cntlA1, $cntlA2 );
-		$this->assertNotSame( $cntlB1, $cntlB2 );
+		$this->assertNotSame($cntlA1, $cntlA2);
+		$this->assertNotSame($cntlB1, $cntlB2);
 	}
 
 
 	public function testClearSpecific()
 	{
-		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true );
+		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true);
 
 		$context = \TestHelperJadm::getContext();
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 
-		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' );
-		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order/base' );
+		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order');
+		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order/base');
 
-		\Aimeos\Admin\JsonAdm\Factory::clear( (string) $context, 'order' );
+		\Aimeos\Admin\JsonAdm\Factory::clear((string) $context, 'order');
 
-		$cntlA2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' );
-		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order/base' );
+		$cntlA2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order');
+		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order/base');
 
-		\Aimeos\Admin\JsonAdm\Factory::setCache( $cache );
+		\Aimeos\Admin\JsonAdm\Factory::setCache($cache);
 
-		$this->assertNotSame( $cntlA1, $cntlA2 );
-		$this->assertSame( $cntlB1, $cntlB2 );
+		$this->assertNotSame($cntlA1, $cntlA2);
+		$this->assertSame($cntlB1, $cntlB2);
 	}
 
 }
\ No newline at end of file

admin/jsonadm/templates/options-default.php

Spacing +15 added lines, -15 removed lines

@@ -8,32 +8,32 @@ 
  */
 
 
-$target = $this->config( 'admin/jsonadm/url/target' );
-$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' );
-$action = $this->config( 'admin/jsonadm/url/action', 'get' );
-$config = $this->config( 'admin/jsonadm/url/config', [] );
+$target = $this->config('admin/jsonadm/url/target');
+$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm');
+$action = $this->config('admin/jsonadm/url/action', 'get');
+$config = $this->config('admin/jsonadm/url/config', []);
 
 
 $resources = $attributes = [];
-$site = $this->param( 'site', 'default' );
+$site = $this->param('site', 'default');
 
-foreach( $this->get( 'resources', [] ) as $resource ) {
-	$resources[$resource] = $this->url( $target, $cntl, $action, ['site' => $site, 'resource' => $resource], [], $config );
+foreach ($this->get('resources', []) as $resource) {
+	$resources[$resource] = $this->url($target, $cntl, $action, ['site' => $site, 'resource' => $resource], [], $config);
 }
 
-foreach( $this->get( 'attributes', [] ) as $attr ) {
-	$attributes[$attr->getCode()] = $attr->toArray( true );
+foreach ($this->get('attributes', []) as $attr) {
+	$attributes[$attr->getCode()] = $attr->toArray(true);
 }
 
 
 ?>
 {
 	"meta": {
-		"prefix": <?= json_encode( $this->get( 'prefix' ) ); ?>,
-		"resources": <?= json_encode( $resources ); ?>,
-		"attributes": <?= json_encode( $attributes ); ?>
+		"prefix": <?= json_encode($this->get('prefix')); ?>,
+		"resources": <?= json_encode($resources); ?>,
+		"attributes": <?= json_encode($attributes); ?>
 
-		<?php if( $this->csrf()->name() != '' ) : ?>
+		<?php if ($this->csrf()->name() != '') : ?>
 			, "csrf": {
 				"name": "<?= $this->csrf()->name(); ?>",
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -41,9 +41,9 @@ 
 		<?php endif; ?>
 	}
 
-	<?php if( isset( $this->errors ) ) : ?>
+	<?php if (isset($this->errors)) : ?>
 
-		,"errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
+		,"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
 
 	<?php endif; ?>
 

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

Spacing +12 added lines, -12 removed lines

@@ -22,7 +22,7 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Coupon\Config\Standard( $this->context, $this->view, $templatePaths, 'coupon/config' );
+		$this->object = new \Aimeos\Admin\JsonAdm\Coupon\Config\Standard($this->context, $this->view, $templatePaths, 'coupon/config');
 	}
 
 
@@ -31,20 +31,20 @@ 
 		$params = array(
 			'id' => 'Example,Required,BasketValues',
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 2, $result['meta']['total'] );
-		$this->assertInternalType( 'array', $result['data'] );
-		$this->assertEquals( 'basketvalues.total-value-min', $result['data'][0]['id'] );
-		$this->assertEquals( 'basketvalues.total-value-max', $result['data'][1]['id'] );
+		$this->assertEquals(2, $result['meta']['total']);
+		$this->assertInternalType('array', $result['data']);
+		$this->assertEquals('basketvalues.total-value-min', $result['data'][0]['id']);
+		$this->assertEquals('basketvalues.total-value-max', $result['data'][1]['id']);
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

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

Braces +2 added lines, -4 removed lines

@@ -118,16 +118,14 @@
 		{
 			$response = $this->getItems( $view, $request, $response );
 			$status = 200;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(

Spacing +19 added lines, -19 removed lines

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

admin/jsonadm/templates/delete-default.php

Spacing +4 added lines, -4 removed lines

@@ -11,9 +11,9 @@ 
 ?>
 {
 	"meta": {
-		"total": <?= $this->get( 'total', 0 ); ?>
+		"total": <?= $this->get('total', 0); ?>
 
-		<?php if( $this->csrf()->name() != '' ) : ?>
+		<?php if ($this->csrf()->name() != '') : ?>
 			, "csrf": {
 				"name": "<?= $this->csrf()->name(); ?>",
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -22,9 +22,9 @@ 
 
 	}
 
-	<?php if( isset( $this->errors ) ) : ?>
+	<?php if (isset($this->errors)) : ?>
 
-		,"errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
+		,"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
 
 	<?php endif; ?>
 

admin/jsonadm/templates/post-default.php

Spacing +6 added lines, -6 removed lines

@@ -11,9 +11,9 @@ 
 ?>
 {
 	"meta": {
-		"total": <?= $this->get( 'total', 0 ); ?>
+		"total": <?= $this->get('total', 0); ?>
 
-		<?php if( $this->csrf()->name() != '' ) : ?>
+		<?php if ($this->csrf()->name() != '') : ?>
 			, "csrf": {
 				"name": "<?= $this->csrf()->name(); ?>",
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -22,13 +22,13 @@ 
 
 	}
 
-	<?php if( isset( $this->errors ) ) : ?>
+	<?php if (isset($this->errors)) : ?>
 
-		, "errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
+		, "errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
 
-	<?php elseif( isset( $this->data ) ) : ?>
+	<?php elseif (isset($this->data)) : ?>
 
-		, "data": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-data', 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ) ) ); ?>
+		, "data": <?= $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard.php'), array('data' => $this->get('data'))); ?>
 
 	<?php endif; ?>
 

admin/jsonadm/templates/get-default.php

Spacing +32 added lines, -32 removed lines

@@ -22,7 +22,7 @@ 
  * @see admin/jsonadm/url/action
  * @see admin/jsonadm/url/config
  */
-$target = $this->config( 'admin/jsonadm/url/target' );
+$target = $this->config('admin/jsonadm/url/target');
 
 /** admin/jsonadm/url/controller
  * Name of the client whose action should be called
@@ -38,7 +38,7 @@ 
  * @see admin/jsonadm/url/action
  * @see admin/jsonadm/url/config
  */
-$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' );
+$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm');
 
 /** admin/jsonadm/url/action
  * Name of the action that should create the output
@@ -54,7 +54,7 @@ 
  * @see admin/jsonadm/url/controller
  * @see admin/jsonadm/url/config
  */
-$action = $this->config( 'admin/jsonadm/url/action', 'get' );
+$action = $this->config('admin/jsonadm/url/action', 'get');
 
 /** admin/jsonadm/url/config
  * Associative list of configuration options used for generating the URL
@@ -76,7 +76,7 @@ 
  * @see admin/jsonadm/url/controller
  * @see admin/jsonadm/url/action
  */
-$config = $this->config( 'admin/jsonadm/url/config', [] );
+$config = $this->config('admin/jsonadm/url/config', []);
 
 
 /** admin/jsonadm/partials/template-errors
@@ -128,22 +128,22 @@ 
  */
 
 
-$total = $this->get( 'total', 0 );
-$offset = max( $this->param( 'page/offset', 0 ), 0 );
-$limit = max( $this->param( 'page/limit', 25 ), 1 );
+$total = $this->get('total', 0);
+$offset = max($this->param('page/offset', 0), 0);
+$limit = max($this->param('page/limit', 25), 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( 'id', 'resource', 'filter', 'page', 'sort', 'include', 'fields' );
-$params = array_intersect_key( $this->param(), array_flip( $ref ) ) + ['id' => ''];
-$fields = $this->param( 'fields', [] );
+$ref = array('id', 'resource', 'filter', 'page', 'sort', 'include', 'fields');
+$params = array_intersect_key($this->param(), array_flip($ref)) + ['id' => ''];
+$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));
 }
 
 
@@ -152,7 +152,7 @@ 
 	"meta": {
 		"total": <?= $total; ?>
 
-		<?php if( $this->csrf()->name() != '' ) : ?>
+		<?php if ($this->csrf()->name() != '') : ?>
 			, "csrf": {
 				"name": "<?= $this->csrf()->name(); ?>",
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -163,42 +163,42 @@ 
 
 	"links": {
 
-		<?php if( is_array( $this->get( 'data' ) ) ) : ?>
+		<?php if (is_array($this->get('data'))) : ?>
 
-			<?php if( $first !== null ) : ?>
+			<?php if ($first !== null) : ?>
 
-				"first": "<?php $params['page']['offset'] = $first; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
+				"first": "<?php $params['page']['offset'] = $first; echo $this->url($target, $cntl, $action, $params, [], $config); ?>",
 
 			<?php endif; ?>
-			<?php if( $prev !== null ) : ?>
+			<?php if ($prev !== null) : ?>
 
-				"prev": "<?php $params['page']['offset'] = $prev; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
+				"prev": "<?php $params['page']['offset'] = $prev; echo $this->url($target, $cntl, $action, $params, [], $config); ?>",
 
 			<?php endif; ?>
-			<?php if( $next !== null ) : ?>
+			<?php if ($next !== null) : ?>
 
-				"next": "<?php $params['page']['offset'] = $next; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
+				"next": "<?php $params['page']['offset'] = $next; echo $this->url($target, $cntl, $action, $params, [], $config); ?>",
 
 			<?php endif; ?>
-			<?php if( $last !== null ) : ?>
+			<?php if ($last !== null) : ?>
 
-				"last": "<?php $params['page']['offset'] = $last; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
+				"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 ) ) : ?>
+	<?php if (isset($this->errors)) : ?>
 
-		"errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
+		"errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
 
-	<?php elseif( isset( $this->data ) ) : ?>
+	<?php elseif (isset($this->data)) : ?>
 
-		"data": <?= $this->partial( $this->config( $this->get( 'partial-data', 'admin/jsonadm/partials/template-data' ), 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ), 'childItems' => $this->get( 'childItems', [] ), 'listItems' => $this->get( 'listItems', [] ) ) ); ?>,
+		"data": <?= $this->partial($this->config($this->get('partial-data', 'admin/jsonadm/partials/template-data'), 'partials/data-standard.php'), array('data' => $this->get('data'), 'childItems' => $this->get('childItems', []), 'listItems' => $this->get('listItems', []))); ?>,
 
-		"included": <?= $this->partial( $this->config( $this->get( 'partial-included', 'admin/jsonadm/partials/template-included' ), 'partials/included-standard.php' ), array( 'childItems' => $this->get( 'childItems', [] ), 'refItems' => $this->get( 'refItems', [] ) ) ); ?>
+		"included": <?= $this->partial($this->config($this->get('partial-included', 'admin/jsonadm/partials/template-included'), 'partials/included-standard.php'), array('childItems' => $this->get('childItems', []), 'refItems' => $this->get('refItems', []))); ?>
 
 	<?php endif; ?>
 

admin/jsonadm/templates/aggregate-default.php

Spacing +9 added lines, -9 removed lines

@@ -8,19 +8,19 @@ 
  */
 
 
-$data = $this->get( 'data', [] );
+$data = $this->get('data', []);
 $entries = [];
 
-foreach( $data as $key => $value ) {
-	$entries[] = array( 'id' => $key, 'type' => 'aggregate', 'attributes' => $value );
+foreach ($data as $key => $value) {
+	$entries[] = array('id' => $key, 'type' => 'aggregate', 'attributes' => $value);
 }
 
 ?>
 {
 	"meta": {
-		"total": <?= count( $data ); ?>
+		"total": <?= count($data); ?>
 
-		<?php if( $this->csrf()->name() != '' ) : ?>
+		<?php if ($this->csrf()->name() != '') : ?>
 			, "csrf": {
 				"name": "<?= $this->csrf()->name(); ?>",
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -29,13 +29,13 @@ 
 
 	},
 
-	<?php if( isset( $this->errors ) ) : ?>
+	<?php if (isset($this->errors)) : ?>
 
-		"errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
+		"errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
 
-	<?php elseif( isset( $this->data ) ) : ?>
+	<?php elseif (isset($this->data)) : ?>
 
-		"data": <?= json_encode( $entries ); ?>
+		"data": <?= json_encode($entries); ?>
 
 	<?php endif; ?>
 }

admin/jsonadm/templates/patch-default.php

Spacing +6 added lines, -6 removed lines

@@ -11,9 +11,9 @@ 
 ?>
 {
 	"meta": {
-		"total": <?= $this->get( 'total', 0 ); ?>
+		"total": <?= $this->get('total', 0); ?>
 
-		<?php if( $this->csrf()->name() != '' ) : ?>
+		<?php if ($this->csrf()->name() != '') : ?>
 			, "csrf": {
 				"name": "<?= $this->csrf()->name(); ?>",
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -22,13 +22,13 @@ 
 
 	}
 
-	<?php if( isset( $this->errors ) ) : ?>
+	<?php if (isset($this->errors)) : ?>
 
-		, "errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
+		, "errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
 
-	<?php elseif( isset( $this->data ) ) : ?>
+	<?php elseif (isset($this->data)) : ?>
 
-		, "data": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-data', 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ) ) ); ?>
+		, "data": <?= $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard.php'), array('data' => $this->get('data'))); ?>
 
 	<?php endif; ?>