aimeos / ai-admin-jsonadm

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

Braces +2 added lines, -4 removed lines

@@ -175,8 +175,7 @@ 
 		{
 			$view->data = $manager->searchItems( $search, [], $total );
 			$view->childItems = $this->getChildItems( $view->data, $include );
-		}
-		else
+		} else
 		{
 			$view->data = $manager->getTree( $id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search );
 			$view->childItems = $this->getChildItems( array( $view->data ), $include );
@@ -211,8 +210,7 @@ 
 			if( isset( $entry->parentid ) && $targetId !== null ) {
 				$manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId );
 			}
-		}
-		else
+		} else
 		{
 			$item = $manager->createItem();
 			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );

Spacing +30 added lines, -30 removed lines

@@ -110,7 +110,7 @@ 
 	 * @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)
 	{
 		/** admin/jsonadm/partials/locale/site/template-data
 		 * Relative path to the data partial template file for the locale site  client
@@ -127,9 +127,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( $request, $response );
+		return parent::get($request, $response);
 	}
 
 
@@ -140,14 +140,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 = [];
 
-		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());
 			}
 		}
 
@@ -163,23 +163,23 @@ 
 	 * @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)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'locale/site' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'locale/site');
 
-		$include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : [] );
-		$search = $this->initCriteria( $manager->createSearch(), $view->param() );
+		$include = (($include = $view->param('include')) !== null ? explode(',', $include) : []);
+		$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, [], $total );
-			$view->childItems = $this->getChildItems( $view->data, $include );
+			$view->data = $manager->searchItems($search, [], $total);
+			$view->childItems = $this->getChildItems($view->data, $include);
 		}
 		else
 		{
-			$view->data = $manager->getTree( $id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search );
-			$view->childItems = $this->getChildItems( array( $view->data ), $include );
+			$view->data = $manager->getTree($id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search);
+			$view->childItems = $this->getChildItems(array($view->data), $include);
 		}
 
 		$view->listItems = [];
@@ -197,32 +197,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() );
-			$item = $manager->saveItem( $item );
+			$item = $manager->getItem($entry->id);
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$item = $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/src/Admin/JsonAdm/Order/Base/Standard.php

Spacing +11 added lines, -11 removed lines

@@ -110,7 +110,7 @@ 
 	 * @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)
 	{
 		/** admin/jsonadm/partials/order/base/template-data
 		 * Relative path to the data partial template file for the order base client
@@ -127,9 +127,9 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		$this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/order/base/template-data' ) );
+		$this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/order/base/template-data'));
 
-		return parent::get( $request, $response );
+		return parent::get($request, $response);
 	}
 
 
@@ -140,21 +140,21 @@ 
 	 * @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 = [];
-		$ids = array_keys( $items );
-		$keys = array( 'order/base/address', 'order/base/coupon', 'order/base/product', 'order/base/service' );
-		$include = array_intersect( $include, $keys );
+		$ids = array_keys($items);
+		$keys = array('order/base/address', 'order/base/coupon', 'order/base/product', 'order/base/service');
+		$include = array_intersect($include, $keys);
 
-		foreach( $include as $type )
+		foreach ($include as $type)
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $type );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $type);
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.baseid', $ids ) );
+			$search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.baseid', $ids));
 
-			$list = array_merge( $list, $manager->searchItems( $search ) );
+			$list = array_merge($list, $manager->searchItems($search));
 		}
 
 		return $list;

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

Spacing +14 added lines, -14 removed lines

@@ -110,7 +110,7 @@ 
 	 * @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)
 	{
 		/** admin/jsonadm/partials/order/template-data
 		 * Relative path to the data partial template file for the order client
@@ -127,9 +127,9 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		$this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/order/template-data' ) );
+		$this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/order/template-data'));
 
-		return parent::get( $request, $response );
+		return parent::get($request, $response);
 	}
 
 
@@ -140,35 +140,35 @@ 
 	 * @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 = [];
 
-		if( in_array( 'order/base', $include ) )
+		if (in_array('order/base', $include))
 		{
 			$ids = [];
 
-			foreach( $items as $item ) {
+			foreach ($items as $item) {
 				$ids[] = $item->getBaseId();
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base' );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base');
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', 'order.base.id', $ids ) );
+			$search->setConditions($search->compare('==', 'order.base.id', $ids));
 
-			$list = array_merge( $list, $manager->searchItems( $search ) );
+			$list = array_merge($list, $manager->searchItems($search));
 		}
 
-		if( in_array( 'order/status', $include ) )
+		if (in_array('order/status', $include))
 		{
-			$ids = array_keys( $items );
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/status' );
+			$ids = array_keys($items);
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/status');
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', 'order.status.parentid', $ids ) );
+			$search->setConditions($search->compare('==', 'order.status.parentid', $ids));
 
-			$list = array_merge( $list, $manager->searchItems( $search ) );
+			$list = array_merge($list, $manager->searchItems($search));
 		}
 
 		return $list;

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

Braces +19 added lines, -38 removed lines

@@ -39,24 +39,21 @@ 
 		{
 			$response = $this->deleteItems( $view, $request, $response );
 			$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() ),
 				'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() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(
@@ -116,16 +113,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(
@@ -163,8 +158,7 @@ 
 			 */
 			$tplconf = 'admin/jsonadm/standard/template-aggregate';
 			$default = 'aggregate-default.php';
-		}
-		else
+		} else
 		{
 			/** admin/jsonadm/standard/template-get
 			 * Relative path to the JSON API template for GET requests
@@ -218,24 +212,21 @@ 
 		{
 			$response = $this->patchItems( $view, $request, $response );
 			$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() ),
 				'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() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(
@@ -295,24 +286,21 @@ 
 		{
 			$response = $this->postItems( $view, $request, $response );
 			$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() ),
 				'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() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(
@@ -438,16 +426,14 @@ 
 			$view->attributes = $attributes;
 
 			$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() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(
@@ -517,8 +503,7 @@ 
 			$ids = $this->getIds( $payload );
 			$manager->deleteItems( $ids );
 			$view->total = count( $ids );
-		}
-		else
+		} else
 		{
 			$manager->deleteItem( $id );
 			$view->total = 1;
@@ -556,8 +541,7 @@ 
 			$view->data = $manager->searchItems( $search, [], $total );
 			$view->childItems = $this->getChildItems( $view->data, $include );
 			$view->listItems = $this->getListItems( $view->data, $include );
-		}
-		else
+		} else
 		{
 			$view->data = $manager->getItem( $id, [] );
 			$view->childItems = $this->getChildItems( array( $id => $view->data ), $include );
@@ -597,16 +581,14 @@ 
 			$view->data = $data;
 			$view->total = count( $data );
 			$response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' );
-		}
-		elseif( ( $id = $view->param( 'id' ) ) != null )
+		} elseif( ( $id = $view->param( 'id' ) ) != null )
 		{
 			$payload->data->id = $id;
 			$data = $this->saveEntry( $manager, $payload->data );
 
 			$view->data = $data;
 			$view->total = 1;
-		}
-		else
+		} else
 		{
 			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 );
 		}
@@ -645,8 +627,7 @@ 
 			$view->data = $data;
 			$view->total = count( $data );
 			$response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' );
-		}
-		else
+		} else
 		{
 			$payload->data->id = null;
 			$data = $this->saveEntry( $manager, $payload->data );

Spacing +137 added lines, -137 removed lines

@@ -31,38 +31,38 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function delete( ServerRequestInterface $request, ResponseInterface $response )
+	public function delete(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$view = $this->getView();
 
 		try
 		{
-			$response = $this->deleteItems( $view, $request, $response );
+			$response = $this->deleteItems($view, $request, $response);
 			$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
@@ -93,11 +93,11 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-delete';
 		$default = 'delete-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);
 	}
 
 
@@ -108,33 +108,33 @@ 
 	 * @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(),
-			) );
+			));
 		}
 
-		if( $view->param( 'aggregate' ) !== null )
+		if ($view->param('aggregate') !== null)
 		{
 			/** admin/jsonadm/standard/template-aggregate
 			 * Relative path to the JSON API template for GET aggregate requests
@@ -195,11 +195,11 @@ 
 			$default = 'get-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);
 	}
 
 
@@ -210,38 +210,38 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function patch( ServerRequestInterface $request, ResponseInterface $response )
+	public function patch(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$view = $this->getView();
 
 		try
 		{
-			$response = $this->patchItems( $view, $request, $response );
+			$response = $this->patchItems($view, $request, $response);
 			$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
@@ -272,11 +272,11 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-patch';
 		$default = 'patch-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);
 	}
 
 
@@ -287,38 +287,38 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function post( ServerRequestInterface $request, ResponseInterface $response )
+	public function post(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$view = $this->getView();
 
 		try
 		{
-			$response = $this->postItems( $view, $request, $response );
+			$response = $this->postItems($view, $request, $response);
 			$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,11 +349,11 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-post';
 		$default = 'post-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);
 	}
 
 
@@ -364,14 +364,14 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function put( ServerRequestInterface $request, ResponseInterface $response )
+	public function put(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$status = 501;
 		$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
@@ -401,11 +401,11 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-put';
 		$default = 'put-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);
 	}
 
 
@@ -417,7 +417,7 @@ 
 	 * @param string|null $prefix Form parameter prefix when nesting parameters is required
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function options( ServerRequestInterface $request, ResponseInterface $response, $prefix = null )
+	public function options(ServerRequestInterface $request, ResponseInterface $response, $prefix = null)
 	{
 		$context = $this->getContext();
 		$view = $this->getView();
@@ -426,14 +426,14 @@ 
 		{
 			$resources = $attributes = [];
 
-			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));
 			}
 
-			foreach( $this->getResources( $view ) as $resource ) {
+			foreach ($this->getResources($view) as $resource) {
 				$resources[] = $resource;
 			}
 
@@ -443,21 +443,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
@@ -488,12 +488,12 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-options';
 		$default = 'options-default.php';
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Allow', 'DELETE,GET,PATCH,POST,OPTIONS' )
-			->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Allow', 'DELETE,GET,PATCH,POST,OPTIONS')
+			->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 
 
@@ -506,25 +506,25 @@ 
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the request body is invalid
 	 */
-	protected function deleteItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function deleteItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
-		$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)
 		{
 			$body = (string) $request->getBody();
 
-			if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) || !is_array( $payload->data ) ) {
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 );
+			if (($payload = json_decode($body)) === null || !isset($payload->data) || !is_array($payload->data)) {
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400);
 			}
 
-			$ids = $this->getIds( $payload );
-			$manager->deleteItems( $ids );
-			$view->total = count( $ids );
+			$ids = $this->getIds($payload);
+			$manager->deleteItems($ids);
+			$view->total = count($ids);
 		}
 		else
 		{
-			$manager->deleteItem( $id );
+			$manager->deleteItem($id);
 			$view->total = 1;
 		}
 
@@ -540,35 +540,35 @@ 
 	 * @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)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath());
 
-		if( ( $key = $view->param( 'aggregate' ) ) !== null )
+		if (($key = $view->param('aggregate')) !== null)
 		{
-			$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 $response;
 		}
 
 		$total = 1;
-		$include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : [] );
+		$include = (($include = $view->param('include')) !== null ? explode(',', $include) : []);
 
-		if( ( $id = $view->param( 'id' ) ) == null )
+		if (($id = $view->param('id')) == null)
 		{
-			$search = $this->initCriteria( $manager->createSearch(), $view->param() );
-			$view->data = $manager->searchItems( $search, [], $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, [], $total);
+			$view->childItems = $this->getChildItems($view->data, $include);
+			$view->listItems = $this->getListItems($view->data, $include);
 		}
 		else
 		{
-			$view->data = $manager->getItem( $id, [] );
-			$view->childItems = $this->getChildItems( array( $id => $view->data ), $include );
-			$view->listItems = $this->getListItems( array( $id => $view->data ), $include );
+			$view->data = $manager->getItem($id, []);
+			$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 $response;
@@ -584,35 +584,35 @@ 
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If "id" parameter isn't available or the body is invalid
 	 */
-	protected function patchItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function patchItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$body = (string) $request->getBody();
 
-		if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 );
+		if (($payload = json_decode($body)) === null || !isset($payload->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( $payload->data ) )
+		if (is_array($payload->data))
 		{
-			$data = $this->saveData( $manager, $payload );
+			$data = $this->saveData($manager, $payload);
 
 			$view->data = $data;
-			$view->total = count( $data );
-			$response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' );
+			$view->total = count($data);
+			$response = $response->withHeader('Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"');
 		}
-		elseif( ( $id = $view->param( 'id' ) ) != null )
+		elseif (($id = $view->param('id')) != null)
 		{
 			$payload->data->id = $id;
-			$data = $this->saveEntry( $manager, $payload->data );
+			$data = $this->saveEntry($manager, $payload->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 $response;
@@ -627,33 +627,33 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function postItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function postItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$body = (string) $request->getBody();
 
-		if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 );
+		if (($payload = json_decode($body)) === null || !isset($payload->data)) {
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400);
 		}
 
-		if( isset( $payload->data->id ) || $view->param( 'id' ) != null ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Client generated IDs are not supported' ), 403 );
+		if (isset($payload->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( $payload->data ) )
+		if (is_array($payload->data))
 		{
-			$data = $this->saveData( $manager, $payload );
+			$data = $this->saveData($manager, $payload);
 
 			$view->data = $data;
-			$view->total = count( $data );
-			$response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' );
+			$view->total = count($data);
+			$response = $response->withHeader('Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"');
 		}
 		else
 		{
 			$payload->data->id = null;
-			$data = $this->saveEntry( $manager, $payload->data );
+			$data = $this->saveEntry($manager, $payload->data);
 
 			$view->data = $data;
 			$view->total = 1;

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

Spacing +2 added lines, -2 removed lines

@@ -9,9 +9,9 @@
 
 
 $options = 0;
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
+if (defined('JSON_PRETTY_PRINT')) {
 	$options = JSON_PRETTY_PRINT;
 }
 
 
-echo json_encode( $this->get( 'errors', [] ), $options );
\ No newline at end of file
+echo json_encode($this->get('errors', []), $options);
\ No newline at end of file

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

Spacing +18 added lines, -18 removed lines

@@ -9,35 +9,35 @@ 
 
 
 $options = 0;
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
+if (defined('JSON_PRETTY_PRINT')) {
 	$options = JSON_PRETTY_PRINT;
 }
 
 
-$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));
 }
 
 
-$build = function( array $items ) use ( $fields )
+$build = function(array $items) use ($fields)
 {
 	$list = [];
 
-	$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', []);
 
-	foreach( (array) $items as $item )
+	foreach ((array) $items as $item)
 	{
 		$id = $item->getId();
 		$type = $item->getResourceType();
-		$attributes = $item->toArray( true );
+		$attributes = $item->toArray(true);
 
-		if( isset( $fields[$type] ) ) {
-			$attributes = array_intersect_key( $attributes, $fields[$type] );
+		if (isset($fields[$type])) {
+			$attributes = array_intersect_key($attributes, $fields[$type]);
 		}
 
 		$list[] = array(
@@ -45,9 +45,9 @@ 
 			'type' => $type,
 			'attributes' => $attributes,
 			'links' => array(
-				'self' => $this->url( $target, $cntl, $action, array( 'resource' => $type, 'id' => $id ), [], $config ),
+				'self' => $this->url($target, $cntl, $action, array('resource' => $type, 'id' => $id), [], $config),
 				'related' => array(
-					'href' => $this->url( $target, $cntl, $action, array( 'resource' => $type, 'id' => null ), [], $config )
+					'href' => $this->url($target, $cntl, $action, array('resource' => $type, 'id' => null), [], $config)
 				)
 			)
 		);
@@ -58,8 +58,8 @@ 
 
 
 $response = [];
-$response = $build( $this->get( 'childItems', [] ) );
-$response = array_merge( $response, $build( $this->get( 'refItems', [] ) ) );
+$response = $build($this->get('childItems', []));
+$response = array_merge($response, $build($this->get('refItems', [])));
 
 
-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/data-standard.php

Braces +2 added lines, -4 removed lines

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

Spacing +34 added lines, -34 removed lines

@@ -9,32 +9,32 @@ 
 
 
 $options = 0;
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
+if (defined('JSON_PRETTY_PRINT')) {
 	$options = JSON_PRETTY_PRINT;
 }
 
 
-$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));
 }
 
 
-$build = function( \Aimeos\MShop\Common\Item\Iface $item, array $childItems, array $listItems ) use ( $fields )
+$build = function(\Aimeos\MShop\Common\Item\Iface $item, array $childItems, array $listItems) use ($fields)
 {
-	$id = strtoupper( $item->getId() );
+	$id = strtoupper($item->getId());
 	$type = $item->getResourceType();
-	$params = array( 'resource' => $type, 'id' => $id );
-	$attributes = $item->toArray( true );
+	$params = array('resource' => $type, 'id' => $id);
+	$attributes = $item->toArray(true);
 
-	$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', []);
 
-	if( isset( $fields[$type] ) ) {
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
+	if (isset($fields[$type])) {
+		$attributes = array_intersect_key($attributes, $fields[$type]);
 	}
 
 	$result = array(
@@ -42,35 +42,35 @@ 
 		'type' => $type,
 		'attributes' => $attributes,
 		'links' => array(
-			'self' => $this->url( $target, $cntl, $action, $params, [], $config )
+			'self' => $this->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( true ),
+				'attributes' => $listItem->toArray(true),
 				'links' => array(
-					'self' => $this->url( $target, $cntl, $action, $params, [], $config )
+					'self' => $this->url($target, $cntl, $action, $params, [], $config)
 				)
-			) );
+			));
 		}
 	}
 
@@ -78,21 +78,21 @@ 
 };
 
 
-$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( $item, $childItems, $listItems );
+	foreach ($data as $item) {
+		$response[] = $build($item, $childItems, $listItems);
 	}
 }
-elseif( $data !== null )
+elseif ($data !== null)
 {
-	$response = $build( $data, $childItems, $listItems );
+	$response = $build($data, $childItems, $listItems);
 }
 else
 {
@@ -100,4 +100,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/data-standard.php

Spacing +28 added lines, -28 removed lines

@@ -9,33 +9,33 @@ 
 
 
 $options = 0;
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
+if (defined('JSON_PRETTY_PRINT')) {
 	$options = JSON_PRETTY_PRINT;
 }
 
 
-$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));
 }
 
 
-$build = function( \Aimeos\MShop\Order\Item\Iface $item, array $childItems ) use ( $fields )
+$build = function(\Aimeos\MShop\Order\Item\Iface $item, array $childItems) use ($fields)
 {
 	$id = $item->getId();
 	$baseId = $item->getBaseId();
 	$type = $item->getResourceType();
-	$params = array( 'resource' => $item->getResourceType(), 'id' => $id );
-	$attributes = $item->toArray( true );
+	$params = array('resource' => $item->getResourceType(), 'id' => $id);
+	$attributes = $item->toArray(true);
 
-	$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', []);
 
-	if( isset( $fields[$type] ) ) {
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
+	if (isset($fields[$type])) {
+		$attributes = array_intersect_key($attributes, $fields[$type]);
 	}
 
 	$result = array(
@@ -43,25 +43,25 @@ 
 		'type' => $type,
 		'attributes' => $attributes,
 		'links' => array(
-			'self' => $this->url( $target, $cntl, $action, $params, [], $config )
+			'self' => $this->url($target, $cntl, $action, $params, [], $config)
 		),
 		'relationships' => []
 	);
 
-	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' => $this->url( $target, $cntl, $action, $params, [], $config )
+					'self' => $this->url($target, $cntl, $action, $params, [], $config)
 				)
-			) );
+			));
 		}
 	}
 
@@ -69,20 +69,20 @@ 
 };
 
 
-$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( $item, $childItems );
+	foreach ($data as $item) {
+		$response[] = $build($item, $childItems);
 	}
 }
-elseif( $data !== null )
+elseif ($data !== null)
 {
-	$response = $build( $data, $childItems );
+	$response = $build($data, $childItems);
 }
 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

Braces +2 added lines, -4 removed lines

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

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

Spacing +28 added lines, -28 removed lines

@@ -9,32 +9,32 @@ 
 
 
 $options = 0;
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
+if (defined('JSON_PRETTY_PRINT')) {
 	$options = JSON_PRETTY_PRINT;
 }
 
 
-$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));
 }
 
 
-$build = function( \Aimeos\MShop\Order\Item\Base\Iface $item, array $childItems ) use ( $fields )
+$build = function(\Aimeos\MShop\Order\Item\Base\Iface $item, array $childItems) use ($fields)
 {
 	$id = $item->getId();
 	$type = $item->getResourceType();
-	$params = array( 'resource' => $type, 'id' => $id );
-	$attributes = $item->toArray( true );
+	$params = array('resource' => $type, 'id' => $id);
+	$attributes = $item->toArray(true);
 
-	$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', []);
 
-	if( isset( $fields[$type] ) ) {
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
+	if (isset($fields[$type])) {
+		$attributes = array_intersect_key($attributes, $fields[$type]);
 	}
 
 	$result = array(
@@ -42,23 +42,23 @@ 
 		'type' => $type,
 		'attributes' => $attributes,
 		'links' => array(
-			'self' => $this->url( $target, $cntl, $action, $params, [], $config )
+			'self' => $this->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' => $this->url( $target, $cntl, $action, $params, [], $config )
+					'self' => $this->url($target, $cntl, $action, $params, [], $config)
 				)
-			) );
+			));
 		}
 	}
 
@@ -66,20 +66,20 @@ 
 };
 
 
-$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( $item, $childItems );
+	foreach ($data as $item) {
+		$response[] = $build($item, $childItems);
 	}
 }
-elseif( $data !== null )
+elseif ($data !== null)
 {
-	$response = $build( $data, $childItems );
+	$response = $build($data, $childItems);
 }
 else
 {
@@ -87,4 +87,4 @@ 
 }
 
 
-echo json_encode( $response, $options );
\ No newline at end of file
+echo json_encode($response, $options);
\ No newline at end of file

Braces +2 added lines, -4 removed lines

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