aimeos / ai-admin-jsonadm

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

Spacing +27 added lines, -27 removed lines

@@ -22,7 +22,7 @@ 
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Coupon\Standard( $this->context, $this->view, $templatePaths, 'coupon' );
+		$this->object = new \Aimeos\Admin\JsonAdm\Coupon\Standard($this->context, $this->view, $templatePaths, 'coupon');
 	}
 
 
@@ -30,27 +30,27 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'coupon.code.code' => '90AB' )
+				'==' => array('coupon.code.code' => '90AB')
 			),
 			'include' => 'coupon/code'
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'coupon', $result['data'][0]['type'] );
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['coupon/code'] ) );
-		$this->assertEquals( 1, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('coupon', $result['data'][0]['type']);
+		$this->assertEquals(1, count($result['data'][0]['relationships']['coupon/code']));
+		$this->assertEquals(1, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -63,22 +63,22 @@ 
 			'sort' => 'coupon.id',
 			'include' => 'coupon/code'
 		);
-		$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( 5, $result['meta']['total'] );
-		$this->assertEquals( 5, count( $result['data'] ) );
-		$this->assertEquals( 'coupon', $result['data'][0]['type'] );
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['coupon/code'] ) );
-		$this->assertEquals( 5, count( $result['included'] ) );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(5, $result['meta']['total']);
+		$this->assertEquals(5, count($result['data']));
+		$this->assertEquals('coupon', $result['data'][0]['type']);
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
+		$this->assertEquals(1, count($result['data'][0]['relationships']['coupon/code']));
+		$this->assertEquals(5, count($result['included']));
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

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

Spacing +29 added lines, -29 removed lines

@@ -22,7 +22,7 @@ 
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Customer\Standard( $this->context, $this->view, $templatePaths, 'customer' );
+		$this->object = new \Aimeos\Admin\JsonAdm\Customer\Standard($this->context, $this->view, $templatePaths, 'customer');
 	}
 
 
@@ -30,28 +30,28 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'customer.code' => 'UTC001' )
+				'==' => array('customer.code' => 'UTC001')
 			),
 			'include' => 'text,customer/address'
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'customer', $result['data'][0]['type'] );
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['text'] ) );
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['customer/address'] ) );
-		$this->assertEquals( 2, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('customer', $result['data'][0]['type']);
+		$this->assertEquals(1, count($result['data'][0]['relationships']['text']));
+		$this->assertEquals(1, count($result['data'][0]['relationships']['customer/address']));
+		$this->assertEquals(2, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -59,7 +59,7 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'=~' => array( 'customer.code' => 'UTC' )
+				'=~' => array('customer.code' => 'UTC')
 			),
 			'fields' => array(
 				'customer' => 'customer.id,customer.label'
@@ -67,23 +67,23 @@ 
 			'sort' => 'customer.id',
 			'include' => 'customer/address'
 		);
-		$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( 3, $result['meta']['total'] );
-		$this->assertEquals( 3, count( $result['data'] ) );
-		$this->assertEquals( 'customer', $result['data'][0]['type'] );
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['customer/address'] ) );
-		$this->assertEquals( 4, count( $result['included'] ) );
+		$this->assertEquals(3, $result['meta']['total']);
+		$this->assertEquals(3, count($result['data']));
+		$this->assertEquals('customer', $result['data'][0]['type']);
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
+		$this->assertEquals(1, count($result['data'][0]['relationships']['customer/address']));
+		$this->assertEquals(4, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

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

Spacing +14 added lines, -14 removed lines

@@ -22,7 +22,7 @@ 
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Text\Standard( $this->context, $this->view, $templatePaths, 'text' );
+		$this->object = new \Aimeos\Admin\JsonAdm\Text\Standard($this->context, $this->view, $templatePaths, 'text');
 	}
 
 
@@ -30,26 +30,26 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'text.label' => 'misc_long_desc' )
+				'==' => array('text.label' => 'misc_long_desc')
 			),
 			'include' => 'media'
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'text', $result['data'][0]['type'] );
-		$this->assertEquals( 4, count( $result['data'][0]['relationships']['media'] ) );
-		$this->assertEquals( 4, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('text', $result['data'][0]['type']);
+		$this->assertEquals(4, count($result['data'][0]['relationships']['media']));
+		$this->assertEquals(4, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

admin/jsonadm/templates/partials/data-standard.php

Braces +2 added lines, -4 removed lines

@@ -79,12 +79,10 @@
 	foreach( $data as $item ) {
 		$response[] = $build( $this, $item, $fields, $childItems, $listItems );
 	}
-}
-elseif( $data !== null )
+} elseif( $data !== null )
 {
 	$response = $build( $this, $data, $fields, $childItems, $listItems );
-}
-else
+} else
 {
 	$response = null;
 }

Spacing +31 added lines, -31 removed lines

@@ -1,25 +1,25 @@ 
 <?php
 
 $options = 0;
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
+if (defined('JSON_PRETTY_PRINT')) {
 	$options = JSON_PRETTY_PRINT;
 }
 
 
-$build = function( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Common\Item\Iface $item, array $fields, array $childItems, array $listItems )
+$build = function(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Common\Item\Iface $item, array $fields, array $childItems, array $listItems)
 {
 	$id = $item->getId();
 	$attributes = $item->toArray();
 	$type = $item->getResourceType();
-	$params = array( 'resource' => $item->getResourceType(), 'id' => $id );
+	$params = array('resource' => $item->getResourceType(), 'id' => $id);
 
-	$target = $view->config( 'admin/jsonadm/url/target' );
-	$cntl = $view->config( 'admin/jsonadm/url/controller', 'jsonadm' );
-	$action = $view->config( 'admin/jsonadm/url/action', 'get' );
-	$config = $view->config( 'admin/jsonadm/url/config', [] );
+	$target = $view->config('admin/jsonadm/url/target');
+	$cntl = $view->config('admin/jsonadm/url/controller', 'jsonadm');
+	$action = $view->config('admin/jsonadm/url/action', 'get');
+	$config = $view->config('admin/jsonadm/url/config', []);
 
-	if( isset( $fields[$type] ) ) {
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
+	if (isset($fields[$type])) {
+		$attributes = array_intersect_key($attributes, $fields[$type]);
 	}
 
 	$result = array(
@@ -27,33 +27,33 @@ 
 		'type' => $type,
 		'attributes' => $attributes,
 		'links' => array(
-			'self' => $view->url( $target, $cntl, $action, $params, [], $config )
+			'self' => $view->url($target, $cntl, $action, $params, [], $config)
 		),
 		'relationships' => []
 	);
 
-	foreach( $childItems as $childItem )
+	foreach ($childItems as $childItem)
 	{
-		if( $childItem->getParentId() == $id )
+		if ($childItem->getParentId() == $id)
 		{
 			$type = $childItem->getResourceType();
-			$result['relationships'][$type][] = array( 'data' => array( 'id' => $childItem->getId(), 'type' => $type ) );
+			$result['relationships'][$type][] = array('data' => array('id' => $childItem->getId(), 'type' => $type));
 		}
 	}
 
-	foreach( $listItems as $listId => $listItem )
+	foreach ($listItems as $listId => $listItem)
 	{
-		if( $listItem->getParentId() == $id )
+		if ($listItem->getParentId() == $id)
 		{
 			$type = $listItem->getDomain();
-			$params = array( 'resource' => $listItem->getResourceType(), 'id' => $listId );
+			$params = array('resource' => $listItem->getResourceType(), 'id' => $listId);
 
-			$result['relationships'][$type][] = array( 'data' => array(
+			$result['relationships'][$type][] = array('data' => array(
 				'id' => $listItem->getRefId(), 'type' => $type,
 				'attributes' => $listItem->toArray(), 'links' => array(
-					'self' => $view->url( $target, $cntl, $action, $params, [], $config )
+					'self' => $view->url($target, $cntl, $action, $params, [], $config)
 				)
-			) );
+			));
 		}
 	}
 
@@ -61,28 +61,28 @@ 
 };
 
 
-$fields = $this->param( 'fields', [] );
+$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));
 }
 
 
-$data = $this->get( 'data', [] );
-$childItems = $this->get( 'childItems', [] );
-$listItems = $this->get( 'listItems', [] );
+$data = $this->get('data', []);
+$childItems = $this->get('childItems', []);
+$listItems = $this->get('listItems', []);
 
-if( is_array( $data ) )
+if (is_array($data))
 {
 	$response = [];
 
-	foreach( $data as $item ) {
-		$response[] = $build( $this, $item, $fields, $childItems, $listItems );
+	foreach ($data as $item) {
+		$response[] = $build($this, $item, $fields, $childItems, $listItems);
 	}
 }
-elseif( $data !== null )
+elseif ($data !== null)
 {
-	$response = $build( $this, $data, $fields, $childItems, $listItems );
+	$response = $build($this, $data, $fields, $childItems, $listItems);
 }
 else
 {
@@ -90,4 +90,4 @@ 
 }
 
 
-echo json_encode( $response, $options );
\ No newline at end of file
+echo json_encode($response, $options);
\ No newline at end of file

admin/jsonadm/templates/partials/order/base/data-standard.php

Braces +2 added lines, -4 removed lines

@@ -67,12 +67,10 @@
 	foreach( $data as $item ) {
 		$response[] = $build( $this, $item, $fields, $childItems );
 	}
-}
-elseif( $data !== null )
+} elseif( $data !== null )
 {
 	$response = $build( $this, $data, $fields, $childItems );
-}
-else
+} else
 {
 	$response = null;
 }

Spacing +27 added lines, -27 removed lines

@@ -1,24 +1,24 @@ 
 <?php
 
 $options = 0;
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
+if (defined('JSON_PRETTY_PRINT')) {
 	$options = JSON_PRETTY_PRINT;
 }
 
-$build = function( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Order\Item\Base\Iface $item, array $fields, array $childItems )
+$build = function(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Order\Item\Base\Iface $item, array $fields, array $childItems)
 {
 	$id = $item->getId();
 	$attributes = $item->toArray();
 	$type = $item->getResourceType();
-	$params = array( 'resource' => $item->getResourceType(), 'id' => $id );
+	$params = array('resource' => $item->getResourceType(), 'id' => $id);
 
-	$target = $view->config( 'admin/jsonadm/url/target' );
-	$cntl = $view->config( 'admin/jsonadm/url/controller', 'jsonadm' );
-	$action = $view->config( 'admin/jsonadm/url/action', 'get' );
-	$config = $view->config( 'admin/jsonadm/url/config', [] );
+	$target = $view->config('admin/jsonadm/url/target');
+	$cntl = $view->config('admin/jsonadm/url/controller', 'jsonadm');
+	$action = $view->config('admin/jsonadm/url/action', 'get');
+	$config = $view->config('admin/jsonadm/url/config', []);
 
-	if( isset( $fields[$type] ) ) {
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
+	if (isset($fields[$type])) {
+		$attributes = array_intersect_key($attributes, $fields[$type]);
 	}
 
 	$result = array(
@@ -26,23 +26,23 @@ 
 		'type' => $type,
 		'attributes' => $attributes,
 		'links' => array(
-			'self' => $view->url( $target, $cntl, $action, $params, [], $config )
+			'self' => $view->url($target, $cntl, $action, $params, [], $config)
 		),
 		'relationships' => []
 	);
 
-	foreach( $childItems as $childId => $childItem )
+	foreach ($childItems as $childId => $childItem)
 	{
-		if( $childItem->getBaseId() == $id )
+		if ($childItem->getBaseId() == $id)
 		{
 			$type = $childItem->getResourceType();
-			$params = array( 'resource' => $childItem->getResourceType(), 'id' => $childId );
+			$params = array('resource' => $childItem->getResourceType(), 'id' => $childId);
 
-			$result['relationships'][$type][] = array( 'data' => array(
+			$result['relationships'][$type][] = array('data' => array(
 				'id' => $childId, 'type' => $type, 'links' => array(
-					'self' => $view->url( $target, $cntl, $action, $params, [], $config )
+					'self' => $view->url($target, $cntl, $action, $params, [], $config)
 				)
-			) );
+			));
 		}
 	}
 
@@ -50,27 +50,27 @@ 
 };
 
 
-$fields = $this->param( 'fields', [] );
+$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));
 }
 
 
-$data = $this->get( 'data', [] );
-$childItems = $this->get( 'childItems', [] );
+$data = $this->get('data', []);
+$childItems = $this->get('childItems', []);
 
-if( is_array( $data ) )
+if (is_array($data))
 {
 	$response = [];
 
-	foreach( $data as $item ) {
-		$response[] = $build( $this, $item, $fields, $childItems );
+	foreach ($data as $item) {
+		$response[] = $build($this, $item, $fields, $childItems);
 	}
 }
-elseif( $data !== null )
+elseif ($data !== null)
 {
-	$response = $build( $this, $data, $fields, $childItems );
+	$response = $build($this, $data, $fields, $childItems);
 }
 else
 {
@@ -78,4 +78,4 @@ 
 }
 
 
-echo json_encode( $response, $options );
\ No newline at end of file
+echo json_encode($response, $options);
\ No newline at end of file

admin/jsonadm/templates/partials/locale/site/data-standard.php

Braces +2 added lines, -4 removed lines

@@ -58,12 +58,10 @@
 	foreach( $data as $item ) {
 		$response[] = $build( $this, $item, $fields );
 	}
-}
-elseif( $data !== null )
+} elseif( $data !== null )
 {
 	$response = $build( $this, $data, $fields );
-}
-else
+} else
 {
 	$response = null;
 }

Spacing +22 added lines, -22 removed lines

@@ -1,25 +1,25 @@ 
 <?php
 
 $options = 0;
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
+if (defined('JSON_PRETTY_PRINT')) {
 	$options = JSON_PRETTY_PRINT;
 }
 
 
-$build = function( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Locale\Item\Site\Iface $item, array $fields )
+$build = function(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Locale\Item\Site\Iface $item, array $fields)
 {
 	$id = $item->getId();
 	$attributes = $item->toArray();
 	$type = $item->getResourceType();
-	$params = array( 'resource' => $item->getResourceType(), 'id' => $id );
+	$params = array('resource' => $item->getResourceType(), 'id' => $id);
 
-	$target = $view->config( 'admin/jsonadm/url/target' );
-	$cntl = $view->config( 'admin/jsonadm/url/controller', 'jsonadm' );
-	$action = $view->config( 'admin/jsonadm/url/action', 'get' );
-	$config = $view->config( 'admin/jsonadm/url/config', [] );
+	$target = $view->config('admin/jsonadm/url/target');
+	$cntl = $view->config('admin/jsonadm/url/controller', 'jsonadm');
+	$action = $view->config('admin/jsonadm/url/action', 'get');
+	$config = $view->config('admin/jsonadm/url/config', []);
 
-	if( isset( $fields[$type] ) ) {
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
+	if (isset($fields[$type])) {
+		$attributes = array_intersect_key($attributes, $fields[$type]);
 	}
 
 	$result = array(
@@ -27,41 +27,41 @@ 
 		'type' => $type,
 		'attributes' => $attributes,
 		'links' => array(
-			'self' => $view->url( $target, $cntl, $action, $params, [], $config )
+			'self' => $view->url($target, $cntl, $action, $params, [], $config)
 		),
 		'relationships' => []
 	);
 
-	foreach( $item->getChildren() as $childItem )
+	foreach ($item->getChildren() as $childItem)
 	{
 		$type = $childItem->getResourceType();
-		$result['relationships'][$type][] = array( 'data' => array( 'id' => $childItem->getId(), 'type' => $type ) );
+		$result['relationships'][$type][] = array('data' => array('id' => $childItem->getId(), 'type' => $type));
 	}
 
 	return $result;
 };
 
 
-$fields = $this->param( 'fields', [] );
+$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));
 }
 
 
-$data = $this->get( 'data', [] );
+$data = $this->get('data', []);
 
-if( is_array( $data ) )
+if (is_array($data))
 {
 	$response = [];
 
-	foreach( $data as $item ) {
-		$response[] = $build( $this, $item, $fields );
+	foreach ($data as $item) {
+		$response[] = $build($this, $item, $fields);
 	}
 }
-elseif( $data !== null )
+elseif ($data !== null)
 {
-	$response = $build( $this, $data, $fields );
+	$response = $build($this, $data, $fields);
 }
 else
 {
@@ -69,4 +69,4 @@ 
 }
 
 
-echo json_encode( $response, $options );
\ No newline at end of file
+echo json_encode($response, $options);
\ No newline at end of file

admin/jsonadm/templates/partials/catalog/data-standard.php

Braces +2 added lines, -4 removed lines

@@ -75,12 +75,10 @@
 	foreach( $data as $item ) {
 		$response[] = $build( $this, $item, $fields, $listItems );
 	}
-}
-elseif( $data !== null )
+} elseif( $data !== null )
 {
 	$response = $build( $this, $data, $fields, $listItems );
-}
-else
+} else
 {
 	$response = null;
 }

Spacing +29 added lines, -29 removed lines

@@ -1,25 +1,25 @@ 
 <?php
 
 $options = 0;
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
+if (defined('JSON_PRETTY_PRINT')) {
 	$options = JSON_PRETTY_PRINT;
 }
 
 
-$build = function( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Catalog\Item\Iface $item, array $fields, array $listItems )
+$build = function(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Catalog\Item\Iface $item, array $fields, array $listItems)
 {
 	$id = $item->getId();
 	$attributes = $item->toArray();
 	$type = $item->getResourceType();
-	$params = array( 'resource' => $item->getResourceType(), 'id' => $id );
+	$params = array('resource' => $item->getResourceType(), 'id' => $id);
 
-	$target = $view->config( 'admin/jsonadm/url/target' );
-	$cntl = $view->config( 'admin/jsonadm/url/controller', 'jsonadm' );
-	$action = $view->config( 'admin/jsonadm/url/action', 'get' );
-	$config = $view->config( 'admin/jsonadm/url/config', [] );
+	$target = $view->config('admin/jsonadm/url/target');
+	$cntl = $view->config('admin/jsonadm/url/controller', 'jsonadm');
+	$action = $view->config('admin/jsonadm/url/action', 'get');
+	$config = $view->config('admin/jsonadm/url/config', []);
 
-	if( isset( $fields[$type] ) ) {
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
+	if (isset($fields[$type])) {
+		$attributes = array_intersect_key($attributes, $fields[$type]);
 	}
 
 	$result = array(
@@ -27,30 +27,30 @@ 
 		'type' => $type,
 		'attributes' => $attributes,
 		'links' => array(
-			'self' => $view->url( $target, $cntl, $action, $params, [], $config )
+			'self' => $view->url($target, $cntl, $action, $params, [], $config)
 		),
 		'relationships' => []
 	);
 
-	foreach( $item->getChildren() as $childItem )
+	foreach ($item->getChildren() as $childItem)
 	{
 		$type = $childItem->getResourceType();
-		$result['relationships'][$type][] = array( 'data' => array( 'id' => $childItem->getId(), 'type' => $type ) );
+		$result['relationships'][$type][] = array('data' => array('id' => $childItem->getId(), 'type' => $type));
 	}
 
-	foreach( $listItems as $listId => $listItem )
+	foreach ($listItems as $listId => $listItem)
 	{
-		if( $listItem->getParentId() == $id )
+		if ($listItem->getParentId() == $id)
 		{
 			$type = $listItem->getDomain();
-			$params = array( 'resource' => $listItem->getResourceType(), 'id' => $listId );
+			$params = array('resource' => $listItem->getResourceType(), 'id' => $listId);
 
-			$result['relationships'][$type][] = array( 'data' => array(
+			$result['relationships'][$type][] = array('data' => array(
 				'id' => $listItem->getRefId(), 'type' => $type,
 				'attributes' => $listItem->toArray(), 'links' => array(
-					'self' => $view->url( $target, $cntl, $action, $params, [], $config )
+					'self' => $view->url($target, $cntl, $action, $params, [], $config)
 				)
-			) );
+			));
 		}
 	}
 
@@ -58,27 +58,27 @@ 
 };
 
 
-$fields = $this->param( 'fields', [] );
+$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));
 }
 
 
-$data = $this->get( 'data', [] );
-$listItems = $this->get( 'listItems', [] );
+$data = $this->get('data', []);
+$listItems = $this->get('listItems', []);
 
-if( is_array( $data ) )
+if (is_array($data))
 {
 	$response = [];
 
-	foreach( $data as $item ) {
-		$response[] = $build( $this, $item, $fields, $listItems );
+	foreach ($data as $item) {
+		$response[] = $build($this, $item, $fields, $listItems);
 	}
 }
-elseif( $data !== null )
+elseif ($data !== null)
 {
-	$response = $build( $this, $data, $fields, $listItems );
+	$response = $build($this, $data, $fields, $listItems);
 }
 else
 {
@@ -86,4 +86,4 @@ 
 }
 
 
-echo json_encode( $response, $options );
\ No newline at end of file
+echo json_encode($response, $options);
\ No newline at end of file

admin/jsonadm/templates/patch-default.php

Spacing +5 added lines, -5 removed lines

@@ -1,12 +1,12 @@
 {
-<?php if( isset( $this->errors ) ) : ?>
-	"errors": <?php echo $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>,
-<?php elseif( isset( $this->data ) ) : ?>
-	"data": <?php echo $this->partial( $this->config( 'admin/jsonadm/partials/template-data', 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ) ) ); ?>,
+<?php if (isset($this->errors)) : ?>
+	"errors": <?php echo $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>,
+<?php elseif (isset($this->data)) : ?>
+	"data": <?php echo $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard.php'), array('data' => $this->get('data'))); ?>,
 <?php endif; ?>
 
 	"meta": {
-		"total": <?php echo $this->get( 'total', 0 ); ?>
+		"total": <?php echo $this->get('total', 0); ?>
 
 	}
 }

admin/jsonadm/src/Admin/JsonAdm/Common/Iface.php

Spacing +2 added lines, -2 removed lines

@@ -28,6 +28,6 @@
 	 * @param array $templatePaths List of file system paths where the templates are stored
 	 * @param string $path Name of the client separated by slashes, e.g "product/stock"
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view,
-		array $templatePaths, $path );
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view,
+		array $templatePaths, $path);
 }