aimeos / ai-admin-jsonadm

admin/jsonadm/templates/put-default.php

Spacing +2 added lines, -2 removed lines

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

admin/jsonadm/templates/get-default.php

Spacing +29 added lines, -29 removed lines

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

admin/jsonadm/templates/delete-default.php

Spacing +3 added lines, -3 removed lines

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

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

Doc Comments +5 added lines

@@ -49,6 +49,7 @@ 
 	 * @param string $body Request body
 	 * @param array &$header Variable which contains the HTTP headers and the new ones afterwards
 	 * @param integer &$status Variable which contains the HTTP status afterwards
+	 * @param integer $status
 	 * @return string Content for response body
 	 */
 	public function delete( $body, array &$header, &$status )
@@ -252,6 +253,7 @@ 
 	 * @param string $body Request body
 	 * @param array &$header Variable which contains the HTTP headers and the new ones afterwards
 	 * @param integer &$status Variable which contains the HTTP status afterwards
+	 * @param integer $status
 	 * @return string Content for response body
 	 */
 	public function patch( $body, array &$header, &$status )
@@ -380,6 +382,7 @@ 
 	 * @param string $body Request body
 	 * @param array &$header Variable which contains the HTTP headers and the new ones afterwards
 	 * @param integer &$status Variable which contains the HTTP status afterwards
+	 * @param integer $status
 	 * @return string Content for response body
 	 */
 	public function post( $body, array &$header, &$status )
@@ -508,6 +511,7 @@ 
 	 * @param string $body Request body
 	 * @param array &$header Variable which contains the HTTP headers and the new ones afterwards
 	 * @param integer &$status Variable which contains the HTTP status afterwards
+	 * @param integer $status
 	 * @return string Content for response body
 	 */
 	public function put( $body, array &$header, &$status )
@@ -559,6 +563,7 @@ 
 	 * @param string $body Request body
 	 * @param array &$header Variable which contains the HTTP headers and the new ones afterwards
 	 * @param integer &$status Variable which contains the HTTP status afterwards
+	 * @param integer $status
 	 * @return string Content for response body
 	 */
 	public function options( $body, array &$header, &$status )

Braces +22 added lines, -44 removed lines

@@ -61,32 +61,28 @@ 
 		{
 			$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' => $context->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		} catch( \Aimeos\MAdmin\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		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(
@@ -143,24 +139,21 @@ 
 		{
 			$view = $this->getItem( $view );
 			$status = 200;
-		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		} catch( \Aimeos\MAdmin\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $this->getContext()->getI18n()->dt( 'mshop', $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(
@@ -218,32 +211,28 @@ 
 		{
 			$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' => $context->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		} catch( \Aimeos\MAdmin\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		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(
@@ -301,32 +290,28 @@ 
 		{
 			$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' => $context->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		} catch( \Aimeos\MAdmin\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		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(
@@ -449,24 +434,21 @@ 
 				'Allow' => 'DELETE,GET,POST,OPTIONS'
 			);
 			$status = 200;
-		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		} catch( \Aimeos\MAdmin\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		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(
@@ -535,8 +517,7 @@ 
 
 			$manager->deleteItems( $ids );
 			$view->total = count( $ids );
-		}
-		else
+		} else
 		{
 			$manager->deleteItem( $id );
 			$view->total = 1;
@@ -564,8 +545,7 @@ 
 			$view->data = $manager->searchItems( $search, array(), $total );
 			$view->childItems = $this->getChildItems( $view->data, $include );
 			$view->listItems = $this->getListItems( $view->data, $include );
-		}
-		else
+		} else
 		{
 			$view->data = $manager->getItem( $id, array() );
 			$view->childItems = $this->getChildItems( array( $id => $view->data ), $include );
@@ -816,8 +796,7 @@ 
 			$view->data = $data;
 			$view->total = count( $data );
 			$header['Content-Type'] = 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"';
-		}
-		else
+		} else
 		{
 			if( ( $id = $view->param( 'id' ) ) == null ) {
 				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 );
@@ -862,8 +841,7 @@ 
 			$view->data = $data;
 			$view->total = count( $data );
 			$header['Content-Type'] = 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"';
-		}
-		else
+		} else
 		{
 			$request->data->id = null;
 			$data = $this->saveEntry( $manager, $request->data );

Spacing +183 added lines, -183 removed lines

@@ -33,7 +33,7 @@ 
 	 * @param array $templatePaths List of file system paths where the templates are stored
 	 * @param string $path Name of the client separated by slashes, e.g "product/stock"
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path)
 	{
 		$this->view = $view;
 		$this->context = $context;
@@ -50,48 +50,48 @@ 
 	 * @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"');
 		$context = $this->getContext();
 		$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' => $context->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('admin/jsonadm', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		catch (\Aimeos\MAdmin\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( \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-delete
@@ -121,7 +121,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));
 	}
 
 
@@ -133,39 +133,39 @@ 
 	 * @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();
 
 		try
 		{
-			$view = $this->getItem( $view );
+			$view = $this->getItem($view);
 			$status = 200;
 		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		catch (\Aimeos\MAdmin\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( \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-get
@@ -195,7 +195,7 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-get';
 		$default = 'get-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -207,48 +207,48 @@ 
 	 * @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"');
 		$context = $this->getContext();
 		$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' => $context->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('admin/jsonadm', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		catch (\Aimeos\MAdmin\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( \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-patch
@@ -278,7 +278,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));
 	}
 
 
@@ -290,48 +290,48 @@ 
 	 * @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"');
 		$context = $this->getContext();
 		$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' => $context->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $context->getI18n()->dt('admin/jsonadm', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		catch (\Aimeos\MAdmin\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( \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-post
@@ -361,7 +361,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));
 	}
 
 
@@ -373,17 +373,17 @@ 
 	 * @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)
 	{
-		$header = array( 'Content-Type' => 'application/vnd.api+json; supported-ext="bulk"' );
+		$header = array('Content-Type' => 'application/vnd.api+json; supported-ext="bulk"');
 		$status = 501;
 
 		$context = $this->getContext();
 		$view = $this->getView();
 
-		$view->errors = array( array(
-			'title' => $context->getI18n()->dt( 'admin/jsonadm', 'Not implemented, use PATCH instead' ),
-		) );
+		$view->errors = array(array(
+			'title' => $context->getI18n()->dt('admin/jsonadm', 'Not implemented, use PATCH instead'),
+		));
 
 		/** admin/jsonadm/standard/template-put
 		 * Relative path to the JSON API template for PUT requests
@@ -412,7 +412,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));
 	}
 
 
@@ -424,7 +424,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();
@@ -433,11 +433,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;
@@ -449,29 +449,29 @@ 
 			);
 			$status = 200;
 		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		catch (\Aimeos\MAdmin\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( \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
@@ -501,7 +501,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));
 	}
 
 
@@ -513,23 +513,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;
 		}
 
@@ -543,27 +543,27 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance
 	 * @return \Aimeos\MW\View\Iface View instance with additional data assigned
 	 */
-	protected function getItem( \Aimeos\MW\View\Iface $view )
+	protected function getItem(\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;
 
@@ -588,11 +588,11 @@ 
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 * @return \Aimeos\MW\Criteria\Iface Initialized criteria object
 	 */
-	protected function initCriteria( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	protected function initCriteria(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		$this->initCriteriaConditions( $criteria, $params );
-		$this->initCriteriaSortations( $criteria, $params );
-		$this->initCriteriaSlice( $criteria, $params );
+		$this->initCriteriaConditions($criteria, $params);
+		$this->initCriteriaSortations($criteria, $params);
+		$this->initCriteriaSlice($criteria, $params);
 
 		return $criteria;
 	}
@@ -604,15 +604,15 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 */
-	private function initCriteriaConditions( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	private function initCriteriaConditions(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		if( isset( $params['filter'] ) && is_array( $params['filter'] ) )
+		if (isset($params['filter']) && is_array($params['filter']))
 		{
 			$existing = $criteria->getConditions();
-			$criteria->setConditions( $criteria->toConditions( (array) $params['filter'] ) );
+			$criteria->setConditions($criteria->toConditions((array) $params['filter']));
 
-			$expr = array( $criteria->getConditions(), $existing );
-			$criteria->setConditions( $criteria->combine( '&&', $expr ) );
+			$expr = array($criteria->getConditions(), $existing);
+			$criteria->setConditions($criteria->combine('&&', $expr));
 		}
 	}
 
@@ -623,12 +623,12 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 */
-	private function initCriteriaSlice( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	private function initCriteriaSlice(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		$start = ( isset( $params['page']['offset'] ) ? $params['page']['offset'] : 0 );
-		$size = ( isset( $params['page']['limit'] ) ? $params['page']['limit'] : 25 );
+		$start = (isset($params['page']['offset']) ? $params['page']['offset'] : 0);
+		$size = (isset($params['page']['limit']) ? $params['page']['limit'] : 25);
 
-		$criteria->setSlice( $start, $size );
+		$criteria->setSlice($start, $size);
 	}
 
 
@@ -638,24 +638,24 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 */
-	private function initCriteriaSortations( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	private function initCriteriaSortations(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		if( !isset( $params['sort'] ) ) {
+		if (!isset($params['sort'])) {
 			return;
 		}
 
 		$sortation = array();
 
-		foreach( explode( ',', $params['sort'] ) as $sort )
+		foreach (explode(',', $params['sort']) as $sort)
 		{
-			if( $sort[0] === '-' ) {
-				$sortation[] = $criteria->sort( '-', substr( $sort, 1 ) );
+			if ($sort[0] === '-') {
+				$sortation[] = $criteria->sort('-', substr($sort, 1));
 			} else {
-				$sortation[] = $criteria->sort( '+', $sort ); break;
+				$sortation[] = $criteria->sort('+', $sort); break;
 			}
 		}
 
-		$criteria->setSortations( $sortation );
+		$criteria->setSortations($sortation);
 	}
 
 
@@ -665,9 +665,9 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with "resource" parameter
 	 * @return array List of domain names
 	 */
-	protected function getDomains( \Aimeos\MW\View\Iface $view )
+	protected function getDomains(\Aimeos\MW\View\Iface $view)
 	{
-		if( ( $domains = $view->param( 'resource' ) ) == '' )
+		if (($domains = $view->param('resource')) == '')
 		{
 			/** admin/jsonadm/domains
 			 * A list of domain names whose clients are available for the JSON API
@@ -689,7 +689,7 @@ 
 				'attribute', 'catalog', 'coupon', 'customer', 'locale', 'media',
 				'order', 'plugin', 'price', 'product', 'service', 'supplier', 'tag', 'text'
 			);
-			$domains = $this->getContext()->getConfig()->get( 'admin/jsonadm/domains', $default );
+			$domains = $this->getContext()->getConfig()->get('admin/jsonadm/domains', $default);
 		}
 
 		return (array) $domains;
@@ -703,7 +703,7 @@ 
 	 * @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)
 	{
 		return array();
 	}
@@ -716,7 +716,7 @@ 
 	 * @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)
 	{
 		return array();
 	}
@@ -728,22 +728,22 @@ 
 	 * @param array $listItems List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface
 	 */
-	protected function getRefItems( array $listItems )
+	protected function getRefItems(array $listItems)
 	{
 		$list = $map = array();
 
-		foreach( $listItems as $listItem ) {
+		foreach ($listItems as $listItem) {
 			$map[$listItem->getDomain()][] = $listItem->getRefId();
 		}
 
-		foreach( $map as $domain => $ids )
+		foreach ($map as $domain => $ids)
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $domain );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $domain);
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', $domain . '.id', $ids ) );
+			$search->setConditions($search->compare('==', $domain . '.id', $ids));
 
-			$list = array_merge( $list, $manager->searchItems( $search ) );
+			$list = array_merge($list, $manager->searchItems($search));
 		}
 
 		return $list;
@@ -756,15 +756,15 @@ 
 	 * @param \stdClass $request Decoded request body
 	 * @return array List of item IDs
 	 */
-	protected function getIds( $request )
+	protected function getIds($request)
 	{
 		$ids = array();
 
-		if( isset( $request->data ) )
+		if (isset($request->data))
 		{
-			foreach( $request->data as $entry )
+			foreach ($request->data as $entry)
 			{
-				if( isset( $entry->id ) ) {
+				if (isset($entry->id)) {
 					$ids[] = $entry->id;
 				}
 			}
@@ -816,30 +816,30 @@ 
 	 * @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"';
 		}
 		else
 		{
-			if( ( $id = $view->param( 'id' ) ) == null ) {
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 );
+			if (($id = $view->param('id')) == null) {
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400);
 			}
 
 			$request->data->id = $id;
-			$data = $this->saveEntry( $manager, $request->data );
+			$data = $this->saveEntry($manager, $request->data);
 
 			$view->data = $data;
 			$view->total = 1;
@@ -857,31 +857,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;
@@ -898,14 +898,14 @@ 
 	 * @param \stdClass $request Object with request body data
 	 * @return array List of items
 	 */
-	protected function saveData( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $request )
+	protected function saveData(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $request)
 	{
 		$data = array();
 
-		if( isset( $request->data ) )
+		if (isset($request->data))
 		{
-			foreach( (array) $request->data as $entry ) {
-				$data[] = $this->saveEntry( $manager, $entry );
+			foreach ((array) $request->data as $entry) {
+				$data[] = $this->saveEntry($manager, $entry);
 			}
 		}
 
@@ -920,19 +920,19 @@ 
 	 * @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)
 	{
-		$attr = ( isset( $entry->attributes ) ? (array) $entry->attributes : array() );
+		$attr = (isset($entry->attributes) ? (array) $entry->attributes : array());
 
-		if( isset( $entry->id ) && $entry->id !== null ) {
-			$item = $manager->getItem( $entry->id );
+		if (isset($entry->id) && $entry->id !== null) {
+			$item = $manager->getItem($entry->id);
 		} else {
 			$item = $manager->createItem();
 		}
 
-		$item->fromArray( $attr );
-		$manager->saveItem( $item );
+		$item->fromArray($attr);
+		$manager->saveItem($item);
 
-		return $manager->getItem( $item->getId() );
+		return $manager->getItem($item->getId());
 	}
 }

admin/jsonadm/templates/post-default.php

Spacing +5 added lines, -5 removed lines

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

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

Spacing +322 added lines, -322 removed lines

@@ -22,7 +22,7 @@ 
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Standard( $this->context, $this->view, $templatePaths, 'product' );
+		$this->object = new \Aimeos\Admin\JsonAdm\Standard($this->context, $this->view, $templatePaths, 'product');
 	}
 
 
@@ -34,42 +34,42 @@ 
 
 	public function testDelete()
 	{
-		$this->getProductMock( array( 'deleteItem' ) )->expects( $this->once() )->method( 'deleteItem' );
+		$this->getProductMock(array('deleteItem'))->expects($this->once())->method('deleteItem');
 
-		$params = array( 'id' => $this->getProductItem()->getId() );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$params = array('id' => $this->getProductItem()->getId());
+		$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->delete( '', $header, $status ), true );
+		$result = json_decode($this->object->delete('', $header, $status), true);
 
-		$this->assertEquals( 200, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'data', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('data', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testDeleteBulk()
 	{
-		$this->getProductMock( array( 'deleteItems' ) )->expects( $this->once() )->method( 'deleteItems' );
+		$this->getProductMock(array('deleteItems'))->expects($this->once())->method('deleteItems');
 
 		$body = '{"data":[{"type": "product", "id": "-1"},{"type": "product", "id": "-2"}]}';
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->delete( $body, $header, $status ), true );
+		$result = json_decode($this->object->delete($body, $header, $status), true);
 
-		$this->assertEquals( 200, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertEquals( 2, $result['meta']['total'] );
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'data', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(2, $result['meta']['total']);
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('data', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -79,71 +79,71 @@ 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->delete( $body, $header, $status ), true );
+		$result = json_decode($this->object->delete($body, $header, $status), true);
 
-		$this->assertEquals( 400, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertEquals( 0, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'errors', $result );
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'data', $result );
+		$this->assertEquals(400, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(0, $result['meta']['total']);
+		$this->assertArrayHasKey('errors', $result);
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('data', $result);
 	}
 
 
 	public function testDeleteException()
 	{
-		$this->getProductMock( array( 'deleteItem' ) )->expects( $this->once() )->method( 'deleteItem' )
-			->will( $this->throwException( new \Exception( 'test exception' ) ) );
+		$this->getProductMock(array('deleteItem'))->expects($this->once())->method('deleteItem')
+			->will($this->throwException(new \Exception('test exception')));
 
-		$params = array( 'id' => $this->getProductItem()->getId() );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$params = array('id' => $this->getProductItem()->getId());
+		$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->delete( '', $header, $status ), true );
+		$result = json_decode($this->object->delete('', $header, $status), true);
 
-		$this->assertEquals( 500, $status );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(500, $status);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
 	public function testDeleteMAdminException()
 	{
-		$this->getProductMock( array( 'deleteItem' ) )->expects( $this->once() )->method( 'deleteItem' )
-			->will( $this->throwException( new \Aimeos\MAdmin\Exception( 'test exception' ) ) );
+		$this->getProductMock(array('deleteItem'))->expects($this->once())->method('deleteItem')
+			->will($this->throwException(new \Aimeos\MAdmin\Exception('test exception')));
 
-		$params = array( 'id' => $this->getProductItem()->getId() );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$params = array('id' => $this->getProductItem()->getId());
+		$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->delete( '', $header, $status ), true );
+		$result = json_decode($this->object->delete('', $header, $status), true);
 
-		$this->assertEquals( 404, $status );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(404, $status);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
 	public function testDeleteMShopException()
 	{
-		$this->getProductMock( array( 'deleteItem' ) )->expects( $this->once() )->method( 'deleteItem' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception( 'test exception' ) ) );
+		$this->getProductMock(array('deleteItem'))->expects($this->once())->method('deleteItem')
+			->will($this->throwException(new \Aimeos\MShop\Exception('test exception')));
 
-		$params = array( 'id' => $this->getProductItem()->getId() );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$params = array('id' => $this->getProductItem()->getId());
+		$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->delete( '', $header, $status ), true );
+		$result = json_decode($this->object->delete('', $header, $status), true);
 
-		$this->assertEquals( 404, $status );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(404, $status);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
@@ -152,18 +152,18 @@ 
 		$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( 28, $result['meta']['total'] );
-		$this->assertEquals( 25, count( $result['data'] ) );
-		$this->assertEquals( 'product', $result['data'][0]['type'] );
-		$this->assertEquals( 0, count( $result['included'] ) );
-		$this->assertArrayHasKey( 'next', $result['links'] );
-		$this->assertArrayHasKey( 'last', $result['links'] );
-		$this->assertArrayHasKey( 'self', $result['links'] );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(28, $result['meta']['total']);
+		$this->assertEquals(25, count($result['data']));
+		$this->assertEquals('product', $result['data'][0]['type']);
+		$this->assertEquals(0, count($result['included']));
+		$this->assertArrayHasKey('next', $result['links']);
+		$this->assertArrayHasKey('last', $result['links']);
+		$this->assertArrayHasKey('self', $result['links']);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -173,17 +173,17 @@ 
 		$status = 500;
 
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
-		$object = new \Aimeos\Admin\JsonAdm\Standard( $this->context, $this->view, $templatePaths, 'product/stock/warehouse' );
+		$object = new \Aimeos\Admin\JsonAdm\Standard($this->context, $this->view, $templatePaths, 'product/stock/warehouse');
 
-		$result = json_decode( $object->get( '', $header, $status ), true );
+		$result = json_decode($object->get('', $header, $status), true);
 
-		$this->assertEquals( 200, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertEquals( 6, $result['meta']['total'] );
-		$this->assertEquals( 6, count( $result['data'] ) );
-		$this->assertEquals( 'product/stock/warehouse', $result['data'][0]['type'] );
-		$this->assertEquals( 0, count( $result['included'] ) );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(6, $result['meta']['total']);
+		$this->assertEquals(6, count($result['data']));
+		$this->assertEquals('product/stock/warehouse', $result['data'][0]['type']);
+		$this->assertEquals(0, count($result['included']));
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -193,74 +193,74 @@ 
 		$status = 500;
 
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
-		$object = new \Aimeos\Admin\JsonAdm\Standard( $this->context, $this->view, $templatePaths, 'invalid' );
+		$object = new \Aimeos\Admin\JsonAdm\Standard($this->context, $this->view, $templatePaths, 'invalid');
 
-		$result = json_decode( $object->get( '', $header, $status ), true );
+		$result = json_decode($object->get('', $header, $status), true);
 
-		$this->assertEquals( 404, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertEquals( 1, count( $result['errors'] ) );
-		$this->assertArrayHasKey( 'title', $result['errors'][0] );
-		$this->assertArrayHasKey( 'detail', $result['errors'][0] );
-		$this->assertArrayNotHasKey( 'data', $result );
-		$this->assertArrayNotHasKey( 'indluded', $result );
+		$this->assertEquals(404, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(1, count($result['errors']));
+		$this->assertArrayHasKey('title', $result['errors'][0]);
+		$this->assertArrayHasKey('detail', $result['errors'][0]);
+		$this->assertArrayNotHasKey('data', $result);
+		$this->assertArrayNotHasKey('indluded', $result);
 	}
 
 
 	public function testGetException()
 	{
-		$this->getProductMock( array( 'getItem' ) )->expects( $this->once() )->method( 'getItem' )
-			->will( $this->throwException( new \Exception( 'test exception' ) ) );
+		$this->getProductMock(array('getItem'))->expects($this->once())->method('getItem')
+			->will($this->throwException(new \Exception('test exception')));
 
-		$params = array( 'id' => -1 );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$params = array('id' => -1);
+		$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( 500, $status );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(500, $status);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
 	public function testGetMAdminException()
 	{
-		$this->getProductMock( array( 'getItem' ) )->expects( $this->once() )->method( 'getItem' )
-			->will( $this->throwException( new \Aimeos\MAdmin\Exception( 'test exception' ) ) );
+		$this->getProductMock(array('getItem'))->expects($this->once())->method('getItem')
+			->will($this->throwException(new \Aimeos\MAdmin\Exception('test exception')));
 
-		$params = array( 'id' => -1 );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$params = array('id' => -1);
+		$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( 404, $status );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(404, $status);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
 	public function testGetMShopException()
 	{
-		$this->getProductMock( array( 'getItem' ) )->expects( $this->once() )->method( 'getItem' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception( 'test exception' ) ) );
+		$this->getProductMock(array('getItem'))->expects($this->once())->method('getItem')
+			->will($this->throwException(new \Aimeos\MShop\Exception('test exception')));
 
-		$params = array( 'id' => -1 );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$params = array('id' => -1);
+		$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( 404, $status );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(404, $status);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
@@ -268,24 +268,24 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'product.type.code' => 'select' )
+				'==' => array('product.type.code' => 'select')
 			)
 		);
-		$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( 3, $result['meta']['total'] );
-		$this->assertEquals( 3, count( $result['data'] ) );
-		$this->assertEquals( 'product', $result['data'][0]['type'] );
-		$this->assertEquals( 0, count( $result['included'] ) );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(3, $result['meta']['total']);
+		$this->assertEquals(3, count($result['data']));
+		$this->assertEquals('product', $result['data'][0]['type']);
+		$this->assertEquals(0, count($result['included']));
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -294,26 +294,26 @@ 
 		$params = array(
 			'filter' => array(
 				'&&' => array(
-					array( '=~' => array( 'product.label' => 'Unittest: Test' ) ),
-					array( '==' => array( 'product.type.code' => 'select' ) ),
+					array('=~' => array('product.label' => 'Unittest: Test')),
+					array('==' => array('product.type.code' => 'select')),
 				)
 			)
 		);
-		$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( 2, $result['meta']['total'] );
-		$this->assertEquals( 2, count( $result['data'] ) );
-		$this->assertEquals( 'product', $result['data'][0]['type'] );
-		$this->assertEquals( 0, count( $result['included'] ) );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(2, $result['meta']['total']);
+		$this->assertEquals(2, count($result['data']));
+		$this->assertEquals('product', $result['data'][0]['type']);
+		$this->assertEquals(0, count($result['included']));
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -325,24 +325,24 @@ 
 				'limit' => 25
 			)
 		);
-		$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( 28, $result['meta']['total'] );
-		$this->assertEquals( 3, count( $result['data'] ) );
-		$this->assertEquals( 'product', $result['data'][0]['type'] );
-		$this->assertEquals( 0, count( $result['included'] ) );
-		$this->assertArrayHasKey( 'first', $result['links'] );
-		$this->assertArrayHasKey( 'prev', $result['links'] );
-		$this->assertArrayHasKey( 'self', $result['links'] );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(28, $result['meta']['total']);
+		$this->assertEquals(3, count($result['data']));
+		$this->assertEquals('product', $result['data'][0]['type']);
+		$this->assertEquals(0, count($result['included']));
+		$this->assertArrayHasKey('first', $result['links']);
+		$this->assertArrayHasKey('prev', $result['links']);
+		$this->assertArrayHasKey('self', $result['links']);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -351,23 +351,23 @@ 
 		$params = array(
 			'sort' => 'product.label,-product.code'
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
 		$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( 28, $result['meta']['total'] );
-		$this->assertEquals( 25, count( $result['data'] ) );
-		$this->assertEquals( 'product', $result['data'][0]['type'] );
-		$this->assertEquals( 'ABCD', $result['data'][0]['attributes']['product.code'] );
-		$this->assertEquals( '16 discs', $result['data'][0]['attributes']['product.label'] );
-		$this->assertEquals( 0, count( $result['included'] ) );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(28, $result['meta']['total']);
+		$this->assertEquals(25, count($result['data']));
+		$this->assertEquals('product', $result['data'][0]['type']);
+		$this->assertEquals('ABCD', $result['data'][0]['attributes']['product.code']);
+		$this->assertEquals('16 discs', $result['data'][0]['attributes']['product.label']);
+		$this->assertEquals(0, count($result['included']));
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -380,88 +380,88 @@ 
 			'sort' => 'product.id',
 			'include' => 'product'
 		);
-		$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( 28, $result['meta']['total'] );
-		$this->assertEquals( 25, count( $result['data'] ) );
-		$this->assertEquals( 'product', $result['data'][0]['type'] );
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(28, $result['meta']['total']);
+		$this->assertEquals(25, count($result['data']));
+		$this->assertEquals('product', $result['data'][0]['type']);
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testPatch()
 	{
-		$productManagerStub = $this->getProductMock( array( 'getItem', 'saveItem' ) );
+		$productManagerStub = $this->getProductMock(array('getItem', 'saveItem'));
 
 		$item = $productManagerStub->createItem();
-		$item->setLabel( 'test' );
-		$item->setId( '-1' );
+		$item->setLabel('test');
+		$item->setId('-1');
 
-		$productManagerStub->expects( $this->once() )->method( 'saveItem' );
-		$productManagerStub->expects( $this->exactly( 3 ) )->method( 'getItem' ) // 3x due to decorator
-			->will( $this->returnValue( $item ) );
+		$productManagerStub->expects($this->once())->method('saveItem');
+		$productManagerStub->expects($this->exactly(3))->method('getItem') // 3x due to decorator
+			->will($this->returnValue($item));
 
 
-		$params = array( 'id' => '-1' );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$params = array('id' => '-1');
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
 		$body = '{"data": {"type": "product", "attributes": {"product.label": "test"}}}';
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->patch( $body, $header, $status ), true );
+		$result = json_decode($this->object->patch($body, $header, $status), true);
 
-		$this->assertEquals( 200, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'data', $result );
-		$this->assertEquals( '-1', $result['data']['id'] );
-		$this->assertEquals( 'product', $result['data']['type'] );
-		$this->assertEquals( 'test', $result['data']['attributes']['product.label'] );
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertArrayHasKey('data', $result);
+		$this->assertEquals('-1', $result['data']['id']);
+		$this->assertEquals('product', $result['data']['type']);
+		$this->assertEquals('test', $result['data']['attributes']['product.label']);
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testPatchBulk()
 	{
-		$productManagerStub = $this->getProductMock( array( 'getItem', 'saveItem' ) );
+		$productManagerStub = $this->getProductMock(array('getItem', 'saveItem'));
 
 		$item = $productManagerStub->createItem();
-		$item->setLabel( 'test' );
-		$item->setId( '-1' );
+		$item->setLabel('test');
+		$item->setId('-1');
 
-		$productManagerStub->expects( $this->exactly( 2 ) )->method( 'saveItem' );
-		$productManagerStub->expects( $this->exactly( 6 ) )->method( 'getItem' ) // 6x due to decorator
-			->will( $this->returnValue( $item ) );
+		$productManagerStub->expects($this->exactly(2))->method('saveItem');
+		$productManagerStub->expects($this->exactly(6))->method('getItem') // 6x due to decorator
+			->will($this->returnValue($item));
 
 
 		$body = '{"data": [{"id": "-1", "type": "product", "attributes": {"product.label": "test"}}, {"id": "-1", "type": "product", "attributes": {"product.label": "test"}}]}';
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->patch( $body, $header, $status ), true );
+		$result = json_decode($this->object->patch($body, $header, $status), true);
 
-		$this->assertEquals( 200, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertEquals( 2, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'data', $result );
-		$this->assertEquals( 2, count( $result['data'] ) );
-		$this->assertEquals( '-1', $result['data'][0]['id'] );
-		$this->assertEquals( 'product', $result['data'][0]['type'] );
-		$this->assertEquals( 'test', $result['data'][0]['attributes']['product.label'] );
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(2, $result['meta']['total']);
+		$this->assertArrayHasKey('data', $result);
+		$this->assertEquals(2, count($result['data']));
+		$this->assertEquals('-1', $result['data'][0]['id']);
+		$this->assertEquals('product', $result['data'][0]['type']);
+		$this->assertEquals('test', $result['data'][0]['attributes']['product.label']);
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -471,14 +471,14 @@ 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->patch( $body, $header, $status ), true );
+		$result = json_decode($this->object->patch($body, $header, $status), true);
 
-		$this->assertEquals( 400, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertEquals( 0, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'errors', $result );
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'data', $result );
+		$this->assertEquals(400, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(0, $result['meta']['total']);
+		$this->assertArrayHasKey('errors', $result);
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('data', $result);
 	}
 
 
@@ -488,120 +488,120 @@ 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->patch( $body, $header, $status ), true );
+		$result = json_decode($this->object->patch($body, $header, $status), true);
 
-		$this->assertEquals( 400, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertEquals( 0, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(400, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(0, $result['meta']['total']);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
 	public function testPatchException()
 	{
-		$this->getProductMock( array( 'getItem' ) )->expects( $this->once() )->method( 'getItem' )
-			->will( $this->throwException( new \Exception( 'test exception' ) ) );
+		$this->getProductMock(array('getItem'))->expects($this->once())->method('getItem')
+			->will($this->throwException(new \Exception('test exception')));
 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->patch( '{"data":[{"id":-1}]}', $header, $status ), true );
+		$result = json_decode($this->object->patch('{"data":[{"id":-1}]}', $header, $status), true);
 
-		$this->assertEquals( 500, $status );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(500, $status);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
 	public function testPatchMAdminException()
 	{
-		$this->getProductMock( array( 'getItem' ) )->expects( $this->once() )->method( 'getItem' )
-			->will( $this->throwException( new \Aimeos\MAdmin\Exception( 'test exception' ) ) );
+		$this->getProductMock(array('getItem'))->expects($this->once())->method('getItem')
+			->will($this->throwException(new \Aimeos\MAdmin\Exception('test exception')));
 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->patch( '{"data":[{"id":-1}]}', $header, $status ), true );
+		$result = json_decode($this->object->patch('{"data":[{"id":-1}]}', $header, $status), true);
 
-		$this->assertEquals( 404, $status );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(404, $status);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
 	public function testPatchMShopException()
 	{
-		$this->getProductMock( array( 'getItem' ) )->expects( $this->once() )->method( 'getItem' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception( 'test exception' ) ) );
+		$this->getProductMock(array('getItem'))->expects($this->once())->method('getItem')
+			->will($this->throwException(new \Aimeos\MShop\Exception('test exception')));
 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->patch( '{"data":[{"id":-1}]}', $header, $status ), true );
+		$result = json_decode($this->object->patch('{"data":[{"id":-1}]}', $header, $status), true);
 
-		$this->assertEquals( 404, $status );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(404, $status);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
 	public function testPost()
 	{
-		$productManagerStub = $this->getProductMock( array( 'getItem', 'saveItem' ) );
+		$productManagerStub = $this->getProductMock(array('getItem', 'saveItem'));
 
 		$item = $productManagerStub->createItem();
-		$item->setLabel( 'test' );
-		$item->setId( '-1' );
+		$item->setLabel('test');
+		$item->setId('-1');
 
-		$productManagerStub->expects( $this->once() )->method( 'saveItem' );
-		$productManagerStub->expects( $this->once() )->method( 'getItem' )
-			->will( $this->returnValue( $item ) );
+		$productManagerStub->expects($this->once())->method('saveItem');
+		$productManagerStub->expects($this->once())->method('getItem')
+			->will($this->returnValue($item));
 
 
 		$body = '{"data": {"type": "product", "attributes": {"product.label": "test"}}}';
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->post( $body, $header, $status ), true );
+		$result = json_decode($this->object->post($body, $header, $status), true);
 
-		$this->assertEquals( 201, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'data', $result );
-		$this->assertEquals( '-1', $result['data']['id'] );
-		$this->assertEquals( 'product', $result['data']['type'] );
-		$this->assertEquals( 'test', $result['data']['attributes']['product.label'] );
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(201, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertArrayHasKey('data', $result);
+		$this->assertEquals('-1', $result['data']['id']);
+		$this->assertEquals('product', $result['data']['type']);
+		$this->assertEquals('test', $result['data']['attributes']['product.label']);
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testPostBulk()
 	{
-		$productManagerStub = $this->getProductMock( array( 'getItem', 'saveItem' ) );
+		$productManagerStub = $this->getProductMock(array('getItem', 'saveItem'));
 
 		$item = $productManagerStub->createItem();
-		$item->setLabel( 'test' );
-		$item->setId( '-1' );
+		$item->setLabel('test');
+		$item->setId('-1');
 
-		$productManagerStub->expects( $this->exactly( 2 ) )->method( 'saveItem' );
-		$productManagerStub->expects( $this->exactly( 2 ) )->method( 'getItem' )
-			->will( $this->returnValue( $item ) );
+		$productManagerStub->expects($this->exactly(2))->method('saveItem');
+		$productManagerStub->expects($this->exactly(2))->method('getItem')
+			->will($this->returnValue($item));
 
 
 		$body = '{"data": [{"type": "product", "attributes": {"product.label": "test"}}, {"type": "product", "attributes": {"product.label": "test"}}]}';
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->post( $body, $header, $status ), true );
+		$result = json_decode($this->object->post($body, $header, $status), true);
 
-		$this->assertEquals( 201, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertEquals( 2, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'data', $result );
-		$this->assertEquals( 2, count( $result['data'] ) );
-		$this->assertEquals( '-1', $result['data'][0]['id'] );
-		$this->assertEquals( 'product', $result['data'][0]['type'] );
-		$this->assertEquals( 'test', $result['data'][0]['attributes']['product.label'] );
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(201, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(2, $result['meta']['total']);
+		$this->assertArrayHasKey('data', $result);
+		$this->assertEquals(2, count($result['data']));
+		$this->assertEquals('-1', $result['data'][0]['id']);
+		$this->assertEquals('product', $result['data'][0]['type']);
+		$this->assertEquals('test', $result['data'][0]['attributes']['product.label']);
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -611,14 +611,14 @@ 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->post( $body, $header, $status ), true );
+		$result = json_decode($this->object->post($body, $header, $status), true);
 
-		$this->assertEquals( 400, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertEquals( 0, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'errors', $result );
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'data', $result );
+		$this->assertEquals(400, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(0, $result['meta']['total']);
+		$this->assertArrayHasKey('errors', $result);
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('data', $result);
 	}
 
 
@@ -628,57 +628,57 @@ 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->post( $body, $header, $status ), true );
+		$result = json_decode($this->object->post($body, $header, $status), true);
 
-		$this->assertEquals( 403, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertEquals( 0, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(403, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertEquals(0, $result['meta']['total']);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
 	public function testPostException()
 	{
-		$this->getProductMock( array( 'saveItem' ) )->expects( $this->once() )->method( 'saveItem' )
-			->will( $this->throwException( new \Exception( 'test exception' ) ) );
+		$this->getProductMock(array('saveItem'))->expects($this->once())->method('saveItem')
+			->will($this->throwException(new \Exception('test exception')));
 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->post( '{"data":{}}', $header, $status ), true );
+		$result = json_decode($this->object->post('{"data":{}}', $header, $status), true);
 
-		$this->assertEquals( 500, $status );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(500, $status);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
 	public function testPostMAdminException()
 	{
-		$this->getProductMock( array( 'saveItem' ) )->expects( $this->once() )->method( 'saveItem' )
-			->will( $this->throwException( new \Aimeos\MAdmin\Exception( 'test exception' ) ) );
+		$this->getProductMock(array('saveItem'))->expects($this->once())->method('saveItem')
+			->will($this->throwException(new \Aimeos\MAdmin\Exception('test exception')));
 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->post( '{"data":{}}', $header, $status ), true );
+		$result = json_decode($this->object->post('{"data":{}}', $header, $status), true);
 
-		$this->assertEquals( 404, $status );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(404, $status);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
 	public function testPostMShopException()
 	{
-		$this->getProductMock( array( 'saveItem' ) )->expects( $this->once() )->method( 'saveItem' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception( 'test exception' ) ) );
+		$this->getProductMock(array('saveItem'))->expects($this->once())->method('saveItem')
+			->will($this->throwException(new \Aimeos\MShop\Exception('test exception')));
 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->post( '{"data":{}}', $header, $status ), true );
+		$result = json_decode($this->object->post('{"data":{}}', $header, $status), true);
 
-		$this->assertEquals( 404, $status );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(404, $status);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
@@ -688,11 +688,11 @@ 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->put( $body, $header, $status ), true );
+		$result = json_decode($this->object->put($body, $header, $status), true);
 
-		$this->assertEquals( 501, $status );
-		$this->assertEquals( 1, count( $header ) );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(501, $status);
+		$this->assertEquals(1, count($header));
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
@@ -701,86 +701,86 @@ 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->options( '', $header, $status ), true );
+		$result = json_decode($this->object->options('', $header, $status), true);
 
-		$this->assertEquals( 200, $status );
-		$this->assertEquals( 2, count( $header ) );
-		$this->assertEquals( 59, count( $result['meta']['resources'] ) );
-		$this->assertGreaterThan( 0, count( $result['meta']['attributes'] ) );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertEquals(200, $status);
+		$this->assertEquals(2, count($header));
+		$this->assertEquals(59, count($result['meta']['resources']));
+		$this->assertGreaterThan(0, count($result['meta']['attributes']));
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testOptionsException()
 	{
-		$this->getProductMock( array( 'getResourceType' ) )->expects( $this->once() )->method( 'getResourceType' )
-			->will( $this->throwException( new \Exception( 'test exception' ) ) );
+		$this->getProductMock(array('getResourceType'))->expects($this->once())->method('getResourceType')
+			->will($this->throwException(new \Exception('test exception')));
 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->options( '', $header, $status ), true );
+		$result = json_decode($this->object->options('', $header, $status), true);
 
-		$this->assertEquals( 500, $status );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(500, $status);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
 	public function testOptionsMAdminException()
 	{
-		$this->getProductMock( array( 'getResourceType' ) )->expects( $this->once() )->method( 'getResourceType' )
-			->will( $this->throwException( new \Aimeos\MAdmin\Exception( 'test exception' ) ) );
+		$this->getProductMock(array('getResourceType'))->expects($this->once())->method('getResourceType')
+			->will($this->throwException(new \Aimeos\MAdmin\Exception('test exception')));
 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->options( '', $header, $status ), true );
+		$result = json_decode($this->object->options('', $header, $status), true);
 
-		$this->assertEquals( 404, $status );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(404, $status);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
 	public function testOptionsMShopException()
 	{
-		$this->getProductMock( array( 'getResourceType' ) )->expects( $this->once() )->method( 'getResourceType' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception( 'test exception' ) ) );
+		$this->getProductMock(array('getResourceType'))->expects($this->once())->method('getResourceType')
+			->will($this->throwException(new \Aimeos\MShop\Exception('test exception')));
 
 		$header = array();
 		$status = 500;
 
-		$result = json_decode( $this->object->options( '', $header, $status ), true );
+		$result = json_decode($this->object->options('', $header, $status), true);
 
-		$this->assertEquals( 404, $status );
-		$this->assertArrayHasKey( 'errors', $result );
+		$this->assertEquals(404, $status);
+		$this->assertArrayHasKey('errors', $result);
 	}
 
 
-	protected function getProductMock( array $methods )
+	protected function getProductMock(array $methods)
 	{
 		$name = 'ClientJsonAdmStandard';
-		$this->context->getConfig()->set( 'mshop/product/manager/name', $name );
+		$this->context->getConfig()->set('mshop/product/manager/name', $name);
 
-		$productManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Product\\Manager\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( $methods )
+		$productManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Product\\Manager\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods($methods)
 			->getMock();
 
-		\Aimeos\MShop\Product\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Product\\Manager\\' . $name, $productManagerStub );
+		\Aimeos\MShop\Product\Manager\Factory::injectManager('\\Aimeos\\MShop\\Product\\Manager\\' . $name, $productManagerStub);
 
 		return $productManagerStub;
 	}
 
 
-	protected function getProductItem( $code = 'CNC' )
+	protected function getProductItem($code = 'CNC')
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $code ) );
-		$items = $manager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'product.code', $code));
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( sprintf( 'No product item with code "%1$s" found', $code ) );
+		if (($item = reset($items)) === false) {
+			throw new \Exception(sprintf('No product item with code "%1$s" found', $code));
 		}
 
 		return $item;

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

Spacing +33 added lines, -33 removed lines

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

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

Spacing +34 added lines, -34 removed lines

@@ -33,11 +33,11 @@ 
 	 * @param integer $id Context ID the objects have been created with (string of \Aimeos\MShop\Context\Item\Iface)
 	 * @param string $path Path describing the client to clear, e.g. "product/lists/type"
 	 */
-	static public function clear( $id = null, $path = null )
+	static public function clear($id = null, $path = null)
 	{
-		if( $id !== null )
+		if ($id !== null)
 		{
-			if( $path !== null ) {
+			if ($path !== null) {
 				self::$clients[$id][$path] = null;
 			} else {
 				self::$clients[$id] = array();
@@ -65,19 +65,19 @@ 
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid
 	 */
-	static public function createClient( \Aimeos\MShop\Context\Item\Iface $context,
-		array $templatePaths, $path, $name = null )
+	static public function createClient(\Aimeos\MShop\Context\Item\Iface $context,
+		array $templatePaths, $path, $name = null)
 	{
-		$path = strtolower( trim( $path, "/ \n\t\r\0\x0B" ) );
+		$path = strtolower(trim($path, "/ \n\t\r\0\x0B"));
 
-		if( empty( $path ) ) {
-			return self::createClientRoot( $context, $context->getView(), $templatePaths, $path, $name );
+		if (empty($path)) {
+			return self::createClientRoot($context, $context->getView(), $templatePaths, $path, $name);
 		}
 
 		$id = (string) $context;
 
-		if( self::$cache === false || !isset( self::$clients[$id][$path] ) ) {
-			self::$clients[$id][$path] = self::createClientNew( $context, $templatePaths, $path, $name );
+		if (self::$cache === false || !isset(self::$clients[$id][$path])) {
+			self::$clients[$id][$path] = self::createClientNew($context, $templatePaths, $path, $name);
 		}
 
 		return self::$clients[$id][$path];
@@ -90,7 +90,7 @@ 
 	 * @param boolean $value True to enable caching, false to disable it.
 	 * @return boolean Previous cache setting
 	 */
-	static public function setCache( $value )
+	static public function setCache($value)
 	{
 		$old = self::$cache;
 		self::$cache = (boolean) $value;
@@ -109,37 +109,37 @@ 
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid
 	 */
-	protected static function createClientNew( \Aimeos\MShop\Context\Item\Iface $context,
-		array $templatePaths, $path, $name )
+	protected static function createClientNew(\Aimeos\MShop\Context\Item\Iface $context,
+		array $templatePaths, $path, $name)
 	{
-		$parts = explode( '/', $path );
+		$parts = explode('/', $path);
 
-		foreach( $parts as $key => $part )
+		foreach ($parts as $key => $part)
 		{
-			if( ctype_alnum( $part ) === false )
+			if (ctype_alnum($part) === false)
 			{
-				$msg = sprintf( 'Invalid client "%1$s" in "%2$s"', $part, $path );
-				throw new \Aimeos\Admin\JsonAdm\Exception( $msg, 400 );
+				$msg = sprintf('Invalid client "%1$s" in "%2$s"', $part, $path);
+				throw new \Aimeos\Admin\JsonAdm\Exception($msg, 400);
 			}
 
-			$parts[$key] = ucwords( $part );
+			$parts[$key] = ucwords($part);
 		}
 
 
 		$view = $context->getView();
-		$factory = '\\Aimeos\\Admin\\JsonAdm\\' . join( '\\', $parts ) . '\\Factory';
+		$factory = '\\Aimeos\\Admin\\JsonAdm\\' . join('\\', $parts) . '\\Factory';
 
-		if( class_exists( $factory ) === true )
+		if (class_exists($factory) === true)
 		{
-			$args = array( $context, $view, $templatePaths, $path, $name );
+			$args = array($context, $view, $templatePaths, $path, $name);
 
-			if( ( $client = @call_user_func_array( array( $factory, 'createClient' ), $args ) ) === false ) {
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid factory "%1$s"', $factory ), 400 );
+			if (($client = @call_user_func_array(array($factory, 'createClient'), $args)) === false) {
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid factory "%1$s"', $factory), 400);
 			}
 		}
 		else
 		{
-			$client = self::createClientRoot( $context, $view, $templatePaths, $path, $name );
+			$client = self::createClientRoot($context, $view, $templatePaths, $path, $name);
 		}
 
 		return $client;
@@ -157,8 +157,8 @@ 
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the client couldn't be created
 	 */
-	protected static function createClientRoot( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\MW\View\Iface $view, array $templatePaths, $path, $name = null )
+	protected static function createClientRoot(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\MW\View\Iface $view, array $templatePaths, $path, $name = null)
 	{
 		/** admin/jsonadm/name
 		 * Class name of the used JSON API client implementation
@@ -193,20 +193,20 @@ 
 		 * @since 2015.12
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'admin/jsonadm/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('admin/jsonadm/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>';
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>';
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Admin\\JsonAdm\\Iface';
 		$classname = '\\Aimeos\\Admin\\JsonAdm\\' . $name;
 
-		$client = self::createClientBase( $classname, $iface, $context, $view, $templatePaths, $path );
+		$client = self::createClientBase($classname, $iface, $context, $view, $templatePaths, $path);
 
 		/** admin/jsonadm/decorators/excludes
 		 * Excludes decorators added by the "common" option from the JSON API clients
@@ -286,6 +286,6 @@ 
 		 * @see admin/jsonadm/decorators/global
 		 */
 
-		return self::addClientDecorators( $client, $context, $view, $templatePaths, $path );
+		return self::addClientDecorators($client, $context, $view, $templatePaths, $path);
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -136,8 +136,7 @@
 			if( ( $client = @call_user_func_array( array( $factory, 'createClient' ), $args ) ) === false ) {
 				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid factory "%1$s"', $factory ), 400 );
 			}
-		}
-		else
+		} else
 		{
 			$client = self::createClientRoot( $context, $view, $templatePaths, $path, $name );
 		}

admin/jsonadm/tests/Admin/JsonAdm/Common/Factory/BaseTest.php

Spacing +35 added lines, -35 removed lines

@@ -19,77 +19,77 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$config = $this->context->getConfig();
 
-		$config->set( 'admin/jsonadm/common/decorators/default', array() );
-		$config->set( 'admin/jsonadm/decorators/global', array() );
-		$config->set( 'admin/jsonadm/decorators/local', array() );
+		$config->set('admin/jsonadm/common/decorators/default', array());
+		$config->set('admin/jsonadm/decorators/global', array());
+		$config->set('admin/jsonadm/decorators/local', array());
 
 	}
 
 
 	public function testInjectClient()
 	{
-		$cntl = \Aimeos\Admin\JsonAdm\Factory::createClient( $this->context, array(), 'attribute', 'Standard' );
-		\Aimeos\Admin\JsonAdm\Factory::injectClient( '\\Aimeos\\Admin\\JsonAdm\\Standard', $cntl );
+		$cntl = \Aimeos\Admin\JsonAdm\Factory::createClient($this->context, array(), 'attribute', 'Standard');
+		\Aimeos\Admin\JsonAdm\Factory::injectClient('\\Aimeos\\Admin\\JsonAdm\\Standard', $cntl);
 
-		$iCntl = \Aimeos\Admin\JsonAdm\Factory::createClient( $this->context, array(), 'attribute', 'Standard' );
+		$iCntl = \Aimeos\Admin\JsonAdm\Factory::createClient($this->context, array(), 'attribute', 'Standard');
 
-		$this->assertSame( $cntl, $iCntl );
+		$this->assertSame($cntl, $iCntl);
 	}
 
 
 	public function testInjectClientReset()
 	{
-		$cntl = \Aimeos\Admin\JsonAdm\Factory::createClient( $this->context, array(), 'attribute', 'Standard' );
-		\Aimeos\Admin\JsonAdm\Factory::injectClient( '\\Aimeos\\Admin\\JsonAdm\\Standard', $cntl );
-		\Aimeos\Admin\JsonAdm\Factory::injectClient( '\\Aimeos\\Admin\\JsonAdm\\Standard', null );
+		$cntl = \Aimeos\Admin\JsonAdm\Factory::createClient($this->context, array(), 'attribute', 'Standard');
+		\Aimeos\Admin\JsonAdm\Factory::injectClient('\\Aimeos\\Admin\\JsonAdm\\Standard', $cntl);
+		\Aimeos\Admin\JsonAdm\Factory::injectClient('\\Aimeos\\Admin\\JsonAdm\\Standard', null);
 
-		$new = \Aimeos\Admin\JsonAdm\Factory::createClient( $this->context, array(), 'attribute', 'Standard' );
+		$new = \Aimeos\Admin\JsonAdm\Factory::createClient($this->context, array(), 'attribute', 'Standard');
 
-		$this->assertNotSame( $cntl, $new );
+		$this->assertNotSame($cntl, $new);
 	}
 
 
 	public function testAddDecoratorsInvalidName()
 	{
-		$decorators = array( '$' );
+		$decorators = array('$');
 		$view = $this->context->getView();
-		$cntl = \Aimeos\Admin\JsonAdm\Factory::createClient( $this->context, array(), 'attribute', 'Standard' );
+		$cntl = \Aimeos\Admin\JsonAdm\Factory::createClient($this->context, array(), 'attribute', 'Standard');
 
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
-		\Aimeos\Admin\JsonAdm\Common\Factory\TestAbstract::addDecoratorsPublic( $cntl, $decorators, 'Test', $this->context, $view, array(), 'attribute' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
+		\Aimeos\Admin\JsonAdm\Common\Factory\TestAbstract::addDecoratorsPublic($cntl, $decorators, 'Test', $this->context, $view, array(), 'attribute');
 	}
 
 
 	public function testAddDecoratorsInvalidClass()
 	{
-		$decorators = array( 'Test' );
+		$decorators = array('Test');
 		$view = $this->context->getView();
-		$cntl = \Aimeos\Admin\JsonAdm\Factory::createClient( $this->context, array(), 'attribute', 'Standard' );
+		$cntl = \Aimeos\Admin\JsonAdm\Factory::createClient($this->context, array(), 'attribute', 'Standard');
 
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
-		\Aimeos\Admin\JsonAdm\Common\Factory\TestAbstract::addDecoratorsPublic( $cntl, $decorators, 'TestDecorator', $this->context, $view, array(), 'attribute' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
+		\Aimeos\Admin\JsonAdm\Common\Factory\TestAbstract::addDecoratorsPublic($cntl, $decorators, 'TestDecorator', $this->context, $view, array(), 'attribute');
 	}
 
 
 	public function testAddDecoratorsInvalidInterface()
 	{
-		$decorators = array( 'Test' );
+		$decorators = array('Test');
 		$view = $this->context->getView();
-		$cntl = \Aimeos\Admin\JsonAdm\Factory::createClient( $this->context, array(), 'attribute', 'Standard' );
+		$cntl = \Aimeos\Admin\JsonAdm\Factory::createClient($this->context, array(), 'attribute', 'Standard');
 
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
-		\Aimeos\Admin\JsonAdm\Common\Factory\TestAbstract::addDecoratorsPublic( $cntl, $decorators,
-			'\\Aimeos\\Admin\\Jsonadm\\Common\\Decorator\\', $this->context, $view, array(), 'attribute' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
+		\Aimeos\Admin\JsonAdm\Common\Factory\TestAbstract::addDecoratorsPublic($cntl, $decorators,
+			'\\Aimeos\\Admin\\Jsonadm\\Common\\Decorator\\', $this->context, $view, array(), 'attribute');
 	}
 
 
 	public function testAddClientDecoratorsExcludes()
 	{
-		$this->context->getConfig()->set( 'admin/jsonadm/decorators/excludes', array( 'TestDecorator' ) );
-		$this->context->getConfig()->set( 'admin/jsonadm/common/decorators/default', array( 'TestDecorator' ) );
+		$this->context->getConfig()->set('admin/jsonadm/decorators/excludes', array('TestDecorator'));
+		$this->context->getConfig()->set('admin/jsonadm/common/decorators/default', array('TestDecorator'));
 
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
-		\Aimeos\Admin\JsonAdm\Factory::createClient( $this->context, array(), 'attribute', 'Standard' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
+		\Aimeos\Admin\JsonAdm\Factory::createClient($this->context, array(), 'attribute', 'Standard');
 	}
 }
 
@@ -101,16 +101,16 @@ 
 	 * @param string $classprefix
 	 * @param string $path
 	 */
-	public static function addDecoratorsPublic( \Aimeos\Admin\JsonAdm\Iface $client, array $decorators, $classprefix,
-		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, $templatePaths, $path )
+	public static function addDecoratorsPublic(\Aimeos\Admin\JsonAdm\Iface $client, array $decorators, $classprefix,
+		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, $templatePaths, $path)
 	{
-		self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );
+		self::addDecorators($client, $decorators, $classprefix, $context, $view, $templatePaths, $path);
 	}
 
-	public static function addClientDecoratorsPublic( \Aimeos\Admin\JsonAdm\Iface $client,
-		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, $templatePaths, $path )
+	public static function addClientDecoratorsPublic(\Aimeos\Admin\JsonAdm\Iface $client,
+		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, $templatePaths, $path)
 	{
-		self::addClientDecorators( $client, $context, $view, $templatePaths, $path );
+		self::addClientDecorators($client, $context, $view, $templatePaths, $path);
 	}
 }