aimeos / ai-admin-jsonadm

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

Spacing +27 added lines, -27 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\Order\Item\Iface $item, array $fields, array $childItems )
+$build = function(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Order\Item\Iface $item, array $fields, array $childItems)
 {
 	$id = $item->getId();
 	$baseId = $item->getBaseId();
 	$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', array() );
+	$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', array());
 
-	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,25 +27,25 @@ 
 		'type' => $type,
 		'attributes' => $attributes,
 		'links' => array(
-			'self' => $view->url( $target, $cntl, $action, $params, array(), $config )
+			'self' => $view->url($target, $cntl, $action, $params, array(), $config)
 		),
 		'relationships' => array()
 	);
 
-	foreach( $childItems as $childId => $childItem )
+	foreach ($childItems as $childId => $childItem)
 	{
-		if( $childItem instanceof \Aimeos\MShop\Order\Item\Status\Iface && $childItem->getParentId() == $id
+		if ($childItem instanceof \Aimeos\MShop\Order\Item\Status\Iface && $childItem->getParentId() == $id
 			|| $childItem instanceof \Aimeos\MShop\Order\Item\Base\Iface && $childItem->getId() == $baseId
 		) {
 			$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, array(), $config )
+					'self' => $view->url($target, $cntl, $action, $params, array(), $config)
 				)
-			) );
+			));
 		}
 	}
 
@@ -53,27 +53,27 @@ 
 };
 
 
-$fields = $this->param( 'fields', array() );
+$fields = $this->param('fields', array());
 
-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', array() );
-$childItems = $this->get( 'childItems', array() );
+$data = $this->get('data', array());
+$childItems = $this->get('childItems', array());
 
-if( is_array( $data ) )
+if (is_array($data))
 {
 	$response = array();
 
-	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
 {
@@ -81,4 +81,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

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', array() );
+	$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', array());
 
-	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, array(), $config )
+			'self' => $view->url($target, $cntl, $action, $params, array(), $config)
 		),
 		'relationships' => array()
 	);
 
-	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, array(), $config )
+					'self' => $view->url($target, $cntl, $action, $params, array(), $config)
 				)
-			) );
+			));
 		}
 	}
 
@@ -50,27 +50,27 @@ 
 };
 
 
-$fields = $this->param( 'fields', array() );
+$fields = $this->param('fields', array());
 
-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', array() );
-$childItems = $this->get( 'childItems', array() );
+$data = $this->get('data', array());
+$childItems = $this->get('childItems', array());
 
-if( is_array( $data ) )
+if (is_array($data))
 {
 	$response = array();
 
-	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/catalog/data-standard.php

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', array() );
+	$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', array());
 
-	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, array(), $config )
+			'self' => $view->url($target, $cntl, $action, $params, array(), $config)
 		),
 		'relationships' => array()
 	);
 
-	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, array(), $config )
+					'self' => $view->url($target, $cntl, $action, $params, array(), $config)
 				)
-			) );
+			));
 		}
 	}
 
@@ -58,27 +58,27 @@ 
 };
 
 
-$fields = $this->param( 'fields', array() );
+$fields = $this->param('fields', array());
 
-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', array() );
-$listItems = $this->get( 'listItems', array() );
+$data = $this->get('data', array());
+$listItems = $this->get('listItems', array());
 
-if( is_array( $data ) )
+if (is_array($data))
 {
 	$response = array();
 
-	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/src/Admin/JsonAdm/Catalog/Standard.php

Spacing +39 added lines, -39 removed lines

@@ -108,7 +108,7 @@ 
 	 * @param integer &$status Variable which contains the HTTP status afterwards
 	 * @return string Content for response body
 	 */
-	public function get( $body, array &$header, &$status )
+	public function get($body, array &$header, &$status)
 	{
 		/** admin/jsonadm/partials/catalog/template-data
 		 * Relative path to the data partial template file for the catalog client
@@ -125,9 +125,9 @@ 
 		 * @since 2016.07
 		 * @category Developer
 		 */
-		$this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/catalog/template-data' ) );
+		$this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/catalog/template-data'));
 
-		return parent::get( $body, $header, $status );
+		return parent::get($body, $header, $status);
 	}
 
 
@@ -138,14 +138,14 @@ 
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface
 	 */
-	protected function getChildItems( array $items, array $include )
+	protected function getChildItems(array $items, array $include)
 	{
 		$list = array();
 
-		if( in_array( 'catalog', $include ) )
+		if (in_array('catalog', $include))
 		{
-			foreach( $items as $item ) {
-				$list = array_merge( $list, $item->getChildren() );
+			foreach ($items as $item) {
+				$list = array_merge($list, $item->getChildren());
 			}
 		}
 
@@ -159,27 +159,27 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance
 	 * @return \Aimeos\MW\View\Iface View instance with additional data assigned
 	 */
-	protected function getItems( \Aimeos\MW\View\Iface $view )
+	protected function getItems(\Aimeos\MW\View\Iface $view)
 	{
-		$include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : array() );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' );
-		$search = $this->initCriteria( $manager->createSearch(), $view->param() );
+		$include = (($include = $view->param('include')) !== null ? explode(',', $include) : array());
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog');
+		$search = $this->initCriteria($manager->createSearch(), $view->param());
 		$total = 1;
 
-		if( ( $id = $view->param( 'id' ) ) == null )
+		if (($id = $view->param('id')) == null)
 		{
-			$view->data = $manager->searchItems( $search, array(), $total );
-			$view->listItems = $this->getListItems( $view->data, $include );
-			$view->childItems = $this->getChildItems( $view->data, $include );
+			$view->data = $manager->searchItems($search, array(), $total);
+			$view->listItems = $this->getListItems($view->data, $include);
+			$view->childItems = $this->getChildItems($view->data, $include);
 		}
 		else
 		{
-			$view->data = $manager->getTree( $id, array(), \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search );
-			$view->listItems = $this->getListItems( array( $id => $view->data ), $include );
-			$view->childItems = $this->getChildItems( array( $view->data ), $include );
+			$view->data = $manager->getTree($id, array(), \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search);
+			$view->listItems = $this->getListItems(array($id => $view->data), $include);
+			$view->childItems = $this->getChildItems(array($view->data), $include);
 		}
 
-		$view->refItems = $this->getRefItems( $view->listItems );
+		$view->refItems = $this->getRefItems($view->listItems);
 		$view->total = $total;
 
 		return $view;
@@ -193,18 +193,18 @@ 
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 */
-	protected function getListItems( array $items, array $include )
+	protected function getListItems(array $items, array $include)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'catalog.lists.parentid', array_keys( $items ) ),
-			$search->compare( '==', 'catalog.lists.domain', $include ),
+			$search->compare('==', 'catalog.lists.parentid', array_keys($items)),
+			$search->compare('==', 'catalog.lists.domain', $include),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -215,32 +215,32 @@ 
 	 * @param \stdClass $entry Object including "id" and "attributes" elements
 	 * @return \Aimeos\MShop\Common\Item\Iface New or updated item
 	 */
-	protected function saveEntry( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry )
+	protected function saveEntry(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry)
 	{
-		$targetId = ( isset( $entry->targetid ) ? $entry->targetid : null );
-		$refId = ( isset( $entry->refid ) ? $entry->refid : null );
+		$targetId = (isset($entry->targetid) ? $entry->targetid : null);
+		$refId = (isset($entry->refid) ? $entry->refid : null);
 
-		if( isset( $entry->id ) )
+		if (isset($entry->id))
 		{
-			$item = $manager->getItem( $entry->id );
-			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$manager->saveItem( $item );
+			$item = $manager->getItem($entry->id);
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$manager->saveItem($item);
 
-			if( isset( $entry->parentid ) && $targetId !== null ) {
-				$manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId );
+			if (isset($entry->parentid) && $targetId !== null) {
+				$manager->moveItem($item->getId(), $entry->parentid, $targetId, $refId);
 			}
 		}
 		else
 		{
 			$item = $manager->createItem();
-			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$manager->insertItem( $item, $targetId, $refId );
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$manager->insertItem($item, $targetId, $refId);
 		}
 
-		if( isset( $entry->relationships ) ) {
-			$this->saveRelationships( $manager, $item, $entry->relationships );
+		if (isset($entry->relationships)) {
+			$this->saveRelationships($manager, $item, $entry->relationships);
 		}
 
-		return $manager->getItem( $item->getId() );
+		return $manager->getItem($item->getId());
 	}
 }

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

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', array() );
+	$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', array());
 
-	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, array(), $config )
+			'self' => $view->url($target, $cntl, $action, $params, array(), $config)
 		),
 		'relationships' => array()
 	);
 
-	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', array() );
+$fields = $this->param('fields', array());
 
-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', array() );
+$data = $this->get('data', array());
 
-if( is_array( $data ) )
+if (is_array($data))
 {
 	$response = array();
 
-	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/src/Admin/JsonAdm/Locale/Site/Standard.php

Spacing +30 added lines, -30 removed lines

@@ -108,7 +108,7 @@ 
 	 * @param integer &$status Variable which contains the HTTP status afterwards
 	 * @return string Content for response body
 	 */
-	public function get( $body, array &$header, &$status )
+	public function get($body, array &$header, &$status)
 	{
 		/** admin/jsonadm/partials/locale/site/template-data
 		 * Relative path to the data partial template file for the locale site  client
@@ -125,9 +125,9 @@ 
 		 * @since 2016.07
 		 * @category Developer
 		 */
-		$this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/locale/site/template-data' ) );
+		$this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/locale/site/template-data'));
 
-		return parent::get( $body, $header, $status );
+		return parent::get($body, $header, $status);
 	}
 
 
@@ -138,14 +138,14 @@ 
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface
 	 */
-	protected function getChildItems( array $items, array $include )
+	protected function getChildItems(array $items, array $include)
 	{
 		$list = array();
 
-		if( in_array( 'locale/site', $include ) )
+		if (in_array('locale/site', $include))
 		{
-			foreach( $items as $item ) {
-				$list = array_merge( $list, $item->getChildren() );
+			foreach ($items as $item) {
+				$list = array_merge($list, $item->getChildren());
 			}
 		}
 
@@ -159,22 +159,22 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance
 	 * @return \Aimeos\MW\View\Iface View instance with additional data assigned
 	 */
-	protected function getItems( \Aimeos\MW\View\Iface $view )
+	protected function getItems(\Aimeos\MW\View\Iface $view)
 	{
-		$include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : array() );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'locale/site' );
-		$search = $this->initCriteria( $manager->createSearch(), $view->param() );
+		$include = (($include = $view->param('include')) !== null ? explode(',', $include) : array());
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'locale/site');
+		$search = $this->initCriteria($manager->createSearch(), $view->param());
 		$total = 1;
 
-		if( ( $id = $view->param( 'id' ) ) == null )
+		if (($id = $view->param('id')) == null)
 		{
-			$view->data = $manager->searchItems( $search, array(), $total );
-			$view->childItems = $this->getChildItems( $view->data, $include );
+			$view->data = $manager->searchItems($search, array(), $total);
+			$view->childItems = $this->getChildItems($view->data, $include);
 		}
 		else
 		{
-			$view->data = $manager->getTree( $id, array(), \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search );
-			$view->childItems = $this->getChildItems( array( $view->data ), $include );
+			$view->data = $manager->getTree($id, array(), \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search);
+			$view->childItems = $this->getChildItems(array($view->data), $include);
 		}
 
 		$view->listItems = array();
@@ -192,32 +192,32 @@ 
 	 * @param \stdClass $entry Object including "id" and "attributes" elements
 	 * @return \Aimeos\MShop\Common\Item\Iface New or updated item
 	 */
-	protected function saveEntry( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry )
+	protected function saveEntry(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry)
 	{
-		$targetId = ( isset( $entry->targetid ) ? $entry->targetid : null );
-		$refId = ( isset( $entry->refid ) ? $entry->refid : null );
+		$targetId = (isset($entry->targetid) ? $entry->targetid : null);
+		$refId = (isset($entry->refid) ? $entry->refid : null);
 
-		if( isset( $entry->id ) )
+		if (isset($entry->id))
 		{
-			$item = $manager->getItem( $entry->id );
-			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$manager->saveItem( $item );
+			$item = $manager->getItem($entry->id);
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$manager->saveItem($item);
 
-			if( isset( $entry->parentid ) && $targetId !== null ) {
-				$manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId );
+			if (isset($entry->parentid) && $targetId !== null) {
+				$manager->moveItem($item->getId(), $entry->parentid, $targetId, $refId);
 			}
 		}
 		else
 		{
 			$item = $manager->createItem();
-			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$manager->insertItem( $item, $targetId, $refId );
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$manager->insertItem($item, $targetId, $refId);
 		}
 
-		if( isset( $entry->relationships ) ) {
-			$this->saveRelationships( $manager, $item, $entry->relationships );
+		if (isset($entry->relationships)) {
+			$this->saveRelationships($manager, $item, $entry->relationships);
 		}
 
-		return $manager->getItem( $item->getId() );
+		return $manager->getItem($item->getId());
 	}
 }

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

Spacing +39 added lines, -39 removed lines

@@ -22,7 +22,7 @@ 
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Order\Standard( $this->context, $this->view, $templatePaths, 'order' );
+		$this->object = new \Aimeos\Admin\JsonAdm\Order\Standard($this->context, $this->view, $templatePaths, 'order');
 	}
 
 
@@ -30,25 +30,25 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'order.editor' => 'core:unittest' )
+				'==' => array('order.editor' => 'core:unittest')
 			),
 			'aggregate' => 'order.cdate',
 		);
-		$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);
 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->get( '', $header, $status ), true );
+		$result = json_decode($this->object->get('', $header, $status), true);
 
-		$this->assertEquals( 200, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'aggregate', $result['data'][0]['type'] );
-		$this->assertGreaterThan( 0, count( $result['data'][0]['attributes'] ) );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('aggregate', $result['data'][0]['type']);
+		$this->assertGreaterThan(0, count($result['data'][0]['attributes']));
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -56,27 +56,27 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'order.datepayment' => '2008-02-15 12:34:56' )
+				'==' => array('order.datepayment' => '2008-02-15 12:34:56')
 			),
 			'include' => 'order/base,order/status'
 		);
-		$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);
 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->get( '', $header, $status ), true );
-
-		$this->assertEquals( 200, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'order', $result['data'][0]['type'] );
-		$this->assertEquals( 3, count( $result['data'][0]['relationships']['order/status'] ) );
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['order/base'] ) );
-		$this->assertEquals( 4, count( $result['included'] ) );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$result = json_decode($this->object->get('', $header, $status), true);
+
+		$this->assertEquals(200, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('order', $result['data'][0]['type']);
+		$this->assertEquals(3, count($result['data'][0]['relationships']['order/status']));
+		$this->assertEquals(1, count($result['data'][0]['relationships']['order/base']));
+		$this->assertEquals(4, count($result['included']));
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -89,22 +89,22 @@ 
 			'sort' => 'order.id',
 			'include' => 'order/status'
 		);
-		$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);
 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->get( '', $header, $status ), true );
-
-		$this->assertEquals( 200, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertGreaterThanOrEqual( 4, $result['meta']['total'] );
-		$this->assertGreaterThanOrEqual( 4, count( $result['data'] ) );
-		$this->assertEquals( 'order', $result['data'][0]['type'] );
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
-		$this->assertGreaterThanOrEqual( 3, count( $result['data'][0]['relationships']['order/status'] ) );
-		$this->assertGreaterThanOrEqual( 11, count( $result['included'] ) );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$result = json_decode($this->object->get('', $header, $status), true);
+
+		$this->assertEquals(200, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertGreaterThanOrEqual(4, $result['meta']['total']);
+		$this->assertGreaterThanOrEqual(4, count($result['data']));
+		$this->assertEquals('order', $result['data'][0]['type']);
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
+		$this->assertGreaterThanOrEqual(3, count($result['data'][0]['relationships']['order/status']));
+		$this->assertGreaterThanOrEqual(11, count($result['included']));
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }

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

Spacing +127 added lines, -127 removed lines

@@ -29,39 +29,39 @@ 
 	 * @param integer &$status Variable which contains the HTTP status afterwards
 	 * @return string Content for response body
 	 */
-	public function delete( $body, array &$header, &$status )
+	public function delete($body, array &$header, &$status)
 	{
-		$header = array( 'Content-Type' => 'application/vnd.api+json; supported-ext="bulk"' );
+		$header = array('Content-Type' => 'application/vnd.api+json; supported-ext="bulk"');
 		$view = $this->getView();
 
 		try
 		{
-			$view = $this->deleteItems( $view, $body );
+			$view = $this->deleteItems($view, $body);
 			$status = 200;
 		}
-		catch( \Aimeos\Admin\JsonAdm\Exception $e )
+		catch (\Aimeos\Admin\JsonAdm\Exception $e)
 		{
 			$status = $e->getCode();
-			$view->errors = array( array(
-				'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		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/standard/template-delete
@@ -92,7 +92,7 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-delete';
 		$default = 'delete-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -104,41 +104,41 @@ 
 	 * @param integer &$status Variable which contains the HTTP status afterwards
 	 * @return string Content for response body
 	 */
-	public function get( $body, array &$header, &$status )
+	public function get($body, array &$header, &$status)
 	{
-		$header = array( 'Content-Type' => 'application/vnd.api+json; supported-ext="bulk"' );
+		$header = array('Content-Type' => 'application/vnd.api+json; supported-ext="bulk"');
 
 		$view = $this->getView();
-		$aggregate = $view->param( 'aggregate' );
+		$aggregate = $view->param('aggregate');
 
 		try
 		{
-			if( $aggregate !== null ) {
-				$view = $this->getAggregate( $view );
+			if ($aggregate !== null) {
+				$view = $this->getAggregate($view);
 			} else {
-				$view = $this->getItems( $view );
+				$view = $this->getItems($view);
 			}
 
 			$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(),
-			) );
+			));
 		}
 
-		if( $aggregate !== null )
+		if ($aggregate !== null)
 		{
 			/** admin/jsonadm/standard/template-aggregate
 			 * Relative path to the JSON API template for GET aggregate requests
@@ -199,7 +199,7 @@ 
 			$default = 'get-default.php';
 		}
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -211,39 +211,39 @@ 
 	 * @param integer &$status Variable which contains the HTTP status afterwards
 	 * @return string Content for response body
 	 */
-	public function patch( $body, array &$header, &$status )
+	public function patch($body, array &$header, &$status)
 	{
-		$header = array( 'Content-Type' => 'application/vnd.api+json; supported-ext="bulk"' );
+		$header = array('Content-Type' => 'application/vnd.api+json; supported-ext="bulk"');
 		$view = $this->getView();
 
 		try
 		{
-			$view = $this->patchItems( $view, $body, $header );
+			$view = $this->patchItems($view, $body, $header);
 			$status = 200;
 		}
-		catch( \Aimeos\Admin\JsonAdm\Exception $e )
+		catch (\Aimeos\Admin\JsonAdm\Exception $e)
 		{
 			$status = $e->getCode();
-			$view->errors = array( array(
-				'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		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/standard/template-patch
@@ -274,7 +274,7 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-patch';
 		$default = 'patch-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -286,39 +286,39 @@ 
 	 * @param integer &$status Variable which contains the HTTP status afterwards
 	 * @return string Content for response body
 	 */
-	public function post( $body, array &$header, &$status )
+	public function post($body, array &$header, &$status)
 	{
-		$header = array( 'Content-Type' => 'application/vnd.api+json; supported-ext="bulk"' );
+		$header = array('Content-Type' => 'application/vnd.api+json; supported-ext="bulk"');
 		$view = $this->getView();
 
 		try
 		{
-			$view = $this->postItems( $view, $body, $header );
+			$view = $this->postItems($view, $body, $header);
 			$status = 201;
 		}
-		catch( \Aimeos\Admin\JsonAdm\Exception $e )
+		catch (\Aimeos\Admin\JsonAdm\Exception $e)
 		{
 			$status = $e->getCode();
-			$view->errors = array( array(
-				'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		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/standard/template-post
@@ -349,7 +349,7 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-post';
 		$default = 'post-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -361,15 +361,15 @@ 
 	 * @param integer &$status Variable which contains the HTTP status afterwards
 	 * @return string Content for response body
 	 */
-	public function put( $body, array &$header, &$status )
+	public function put($body, array &$header, &$status)
 	{
 		$status = 501;
-		$header = array( 'Content-Type' => 'application/vnd.api+json; supported-ext="bulk"' );
+		$header = array('Content-Type' => 'application/vnd.api+json; supported-ext="bulk"');
 		$view = $this->getView();
 
-		$view->errors = array( array(
-			'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', 'Not implemented, use PATCH instead' ),
-		) );
+		$view->errors = array(array(
+			'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', 'Not implemented, use PATCH instead'),
+		));
 
 		/** admin/jsonadm/standard/template-put
 		 * Relative path to the JSON API template for PUT requests
@@ -399,7 +399,7 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-put';
 		$default = 'put-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -411,7 +411,7 @@ 
 	 * @param integer &$status Variable which contains the HTTP status afterwards
 	 * @return string Content for response body
 	 */
-	public function options( $body, array &$header, &$status )
+	public function options($body, array &$header, &$status)
 	{
 		$context = $this->getContext();
 		$view = $this->getView();
@@ -420,11 +420,11 @@ 
 		{
 			$resources = $attributes = array();
 
-			foreach( $this->getDomains( $view ) as $domain )
+			foreach ($this->getDomains($view) as $domain)
 			{
-				$manager = \Aimeos\MShop\Factory::createManager( $context, $domain );
-				$resources = array_merge( $resources, $manager->getResourceType( true ) );
-				$attributes = array_merge( $attributes, $manager->getSearchAttributes( true ) );
+				$manager = \Aimeos\MShop\Factory::createManager($context, $domain);
+				$resources = array_merge($resources, $manager->getResourceType(true));
+				$attributes = array_merge($attributes, $manager->getSearchAttributes(true));
 			}
 
 			$view->resources = $resources;
@@ -436,21 +436,21 @@ 
 			);
 			$status = 200;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->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/standard/template-options
@@ -481,7 +481,7 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-options';
 		$default = 'options-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -493,23 +493,23 @@ 
 	 * @return \Aimeos\MW\View\Iface $view View object that will contain the "total" property afterwards
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the request body is invalid
 	 */
-	protected function deleteItems( \Aimeos\MW\View\Iface $view, $body )
+	protected function deleteItems(\Aimeos\MW\View\Iface $view, $body)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath());
 
-		if( ( $id = $view->param( 'id' ) ) == null )
+		if (($id = $view->param('id')) == null)
 		{
-			if( ( $request = json_decode( $body ) ) === null || !isset( $request->data ) || !is_array( $request->data ) ) {
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 );
+			if (($request = json_decode($body)) === null || !isset($request->data) || !is_array($request->data)) {
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400);
 			}
 
-			$ids = $this->getIds( $request );
-			$manager->deleteItems( $ids );
-			$view->total = count( $ids );
+			$ids = $this->getIds($request);
+			$manager->deleteItems($ids);
+			$view->total = count($ids);
 		}
 		else
 		{
-			$manager->deleteItem( $id );
+			$manager->deleteItem($id);
 			$view->total = 1;
 		}
 
@@ -523,14 +523,14 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance
 	 * @return \Aimeos\MW\View\Iface View instance with additional data assigned
 	 */
-	protected function getAggregate( \Aimeos\MW\View\Iface $view )
+	protected function getAggregate(\Aimeos\MW\View\Iface $view)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath());
 
-		$key = $view->param( 'aggregate' );
+		$key = $view->param('aggregate');
 
-		$search = $this->initCriteria( $manager->createSearch(), $view->param() );
-		$view->data = $manager->aggregate( $search, $key );
+		$search = $this->initCriteria($manager->createSearch(), $view->param());
+		$view->data = $manager->aggregate($search, $key);
 
 		return $view;
 	}
@@ -542,27 +542,27 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance
 	 * @return \Aimeos\MW\View\Iface View instance with additional data assigned
 	 */
-	protected function getItems( \Aimeos\MW\View\Iface $view )
+	protected function getItems(\Aimeos\MW\View\Iface $view)
 	{
 		$total = 1;
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() );
-		$include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : array() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath());
+		$include = (($include = $view->param('include')) !== null ? explode(',', $include) : array());
 
-		if( ( $id = $view->param( 'id' ) ) == null )
+		if (($id = $view->param('id')) == null)
 		{
-			$search = $this->initCriteria( $manager->createSearch(), $view->param() );
-			$view->data = $manager->searchItems( $search, array(), $total );
-			$view->childItems = $this->getChildItems( $view->data, $include );
-			$view->listItems = $this->getListItems( $view->data, $include );
+			$search = $this->initCriteria($manager->createSearch(), $view->param());
+			$view->data = $manager->searchItems($search, array(), $total);
+			$view->childItems = $this->getChildItems($view->data, $include);
+			$view->listItems = $this->getListItems($view->data, $include);
 		}
 		else
 		{
-			$view->data = $manager->getItem( $id, array() );
-			$view->childItems = $this->getChildItems( array( $id => $view->data ), $include );
-			$view->listItems = $this->getListItems( array( $id => $view->data ), $include );
+			$view->data = $manager->getItem($id, array());
+			$view->childItems = $this->getChildItems(array($id => $view->data), $include);
+			$view->listItems = $this->getListItems(array($id => $view->data), $include);
 		}
 
-		$view->refItems = $this->getRefItems( $view->listItems );
+		$view->refItems = $this->getRefItems($view->listItems);
 		$view->total = $total;
 
 		return $view;
@@ -576,9 +576,9 @@ 
 	 * @return \Aimeos\MW\View\Iface View instance with additional data assigned
 	 * @deprecated 2016.06 Use getItems() instead
 	 */
-	protected function getItem( \Aimeos\MW\View\Iface $view )
+	protected function getItem(\Aimeos\MW\View\Iface $view)
 	{
-		return $this->getItems( $view );
+		return $this->getItems($view);
 	}
 
 	/**
@@ -590,33 +590,33 @@ 
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If "id" parameter isn't available or the body is invalid
 	 * @return \Aimeos\MW\View\Iface Updated view instance
 	 */
-	protected function patchItems( \Aimeos\MW\View\Iface $view, $body, array &$header )
+	protected function patchItems(\Aimeos\MW\View\Iface $view, $body, array &$header)
 	{
-		if( ( $request = json_decode( $body ) ) === null || !isset( $request->data ) ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 );
+		if (($request = json_decode($body)) === null || !isset($request->data)) {
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400);
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath());
 
-		if( is_array( $request->data ) )
+		if (is_array($request->data))
 		{
-			$data = $this->saveData( $manager, $request );
+			$data = $this->saveData($manager, $request);
 
 			$view->data = $data;
-			$view->total = count( $data );
+			$view->total = count($data);
 			$header['Content-Type'] = 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"';
 		}
-		elseif( ( $id = $view->param( 'id' ) ) != null )
+		elseif (($id = $view->param('id')) != null)
 		{
 			$request->data->id = $id;
-			$data = $this->saveEntry( $manager, $request->data );
+			$data = $this->saveEntry($manager, $request->data);
 
 			$view->data = $data;
 			$view->total = 1;
 		}
 		else
 		{
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 );
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400);
 		}
 
 		return $view;
@@ -631,31 +631,31 @@ 
 	 * @param array &$header Associative list of HTTP headers as value/result parameter
 	 * @return \Aimeos\MW\View\Iface Updated view instance
 	 */
-	protected function postItems( \Aimeos\MW\View\Iface $view, $body, array &$header )
+	protected function postItems(\Aimeos\MW\View\Iface $view, $body, array &$header)
 	{
-		if( ( $request = json_decode( $body ) ) === null || !isset( $request->data ) ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 );
+		if (($request = json_decode($body)) === null || !isset($request->data)) {
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400);
 		}
 
-		if( isset( $request->data->id ) || $view->param( 'id' ) != null ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Client generated IDs are not supported' ), 403 );
+		if (isset($request->data->id) || $view->param('id') != null) {
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Client generated IDs are not supported'), 403);
 		}
 
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath());
 
-		if( is_array( $request->data ) )
+		if (is_array($request->data))
 		{
-			$data = $this->saveData( $manager, $request );
+			$data = $this->saveData($manager, $request);
 
 			$view->data = $data;
-			$view->total = count( $data );
+			$view->total = count($data);
 			$header['Content-Type'] = 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"';
 		}
 		else
 		{
 			$request->data->id = null;
-			$data = $this->saveEntry( $manager, $request->data );
+			$data = $this->saveEntry($manager, $request->data);
 
 			$view->data = $data;
 			$view->total = 1;

admin/jsonadm/templates/aggregate-default.php

Spacing +8 added lines, -8 removed lines

@@ -1,21 +1,21 @@
 <?php
 
-$data = $this->get( 'data', array() );
+$data = $this->get('data', array());
 $entries = array();
 
-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": <?php echo count( $data ); ?>
+		"total": <?php echo count($data); ?>
 
 	},
-<?php	if( isset( $this->errors ) ) : ?>
-	"errors": <?php echo $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 ) ) : ?>
-	"data": <?php echo json_encode( $entries ); ?>
+<?php	if (isset($this->errors)) : ?>
+	"errors": <?php echo $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)) : ?>
+	"data": <?php echo json_encode($entries); ?>
 <?php	endif; ?>
 }