aimeos / ai-admin-jsonadm

admin/jsonadm/templates/patch-standard.php

Spacing +6 added lines, -6 removed lines

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

admin/jsonadm/templates/aggregate-standard.php

Spacing +9 added lines, -9 removed lines

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

admin/jsonadm/templates/config-standard.php

Spacing +14 added lines, -14 removed lines

@@ -9,29 +9,29 @@ 
 
 
 $options = 0;
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
+if (defined('JSON_PRETTY_PRINT')) {
 	$options = JSON_PRETTY_PRINT;
 }
 
 
-$fields = $this->param( 'fields', [] );
+$fields = $this->param('fields', []);
 
-foreach( (array) $fields as $resource => $list ) {
-	$fields[$resource] = array_flip( explode( ',', $list ) );
+foreach ((array) $fields as $resource => $list) {
+	$fields[$resource] = array_flip(explode(',', $list));
 }
 
 
-$build = function( array $attrItems, $id ) use ( $fields )
+$build = function(array $attrItems, $id) use ($fields)
 {
 	$result = [];
 	$type = 'criteria/attribute';
 
-	foreach( $attrItems as $attrItem )
+	foreach ($attrItems as $attrItem)
 	{
-		$attributes = $attrItem->toArray( true );
+		$attributes = $attrItem->toArray(true);
 
-		if( isset( $fields[$type] ) ) {
-			$attributes = array_intersect_key( $attributes, $fields[$type] );
+		if (isset($fields[$type])) {
+			$attributes = array_intersect_key($attributes, $fields[$type]);
 		}
 
 		$result[] = array(
@@ -45,23 +45,23 @@ 
 };
 
 
-$configItems = $this->get( 'configItems', [] );
+$configItems = $this->get('configItems', []);
 
 
 ?>
 {
 	"meta": {
-		"total": <?= count( $configItems ); ?>
+		"total": <?= count($configItems); ?>
 
 	}
 
-	<?php if( isset( $this->errors ) ) : ?>
+	<?php if (isset($this->errors)) : ?>
 
-		, "errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
+		, "errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
 
 	<?php else : ?>
 
-		, "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options ); ?>
+		, "data": <?= json_encode($build($configItems, $this->param('id')), $options); ?>
 
 	<?php endif; ?>
 }

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

Spacing +16 added lines, -16 removed lines

@@ -21,9 +21,9 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Price\Standard( $this->context, 'price' );
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JsonAdm\Price\Standard($this->context, 'price');
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
+		$this->object->setView($this->view);
 	}
 
 
@@ -31,26 +31,26 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'price.value' => '12.95' )
+				'==' => array('price.value' => '12.95')
 			),
 			'include' => 'attribute'
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertGreaterThan( 1, $result['meta']['total'] );
-		$this->assertGreaterThan( 1, count( $result['data'] ) );
-		$this->assertEquals( 'price', $result['data'][0]['type'] );
-		$this->assertEquals( 0, count( $result['data'][0]['relationships'] ) );
-		$this->assertEquals( 0, count( $result['included'] ) );
+		$this->assertGreaterThan(1, $result['meta']['total']);
+		$this->assertGreaterThan(1, count($result['data']));
+		$this->assertEquals('price', $result['data'][0]['type']);
+		$this->assertEquals(0, count($result['data'][0]['relationships']));
+		$this->assertEquals(0, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

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

Spacing +138 added lines, -138 removed lines

@@ -31,38 +31,38 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function delete( ServerRequestInterface $request, ResponseInterface $response )
+	public function delete(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$view = $this->getView();
 
 		try
 		{
-			$response = $this->deleteItems( $view, $request, $response );
+			$response = $this->deleteItems($view, $request, $response);
 			$status = 200;
 		}
-		catch( \Aimeos\Admin\JsonAdm\Exception $e )
+		catch (\Aimeos\Admin\JsonAdm\Exception $e)
 		{
 			$status = $e->getCode();
-			$view->errors = array( array(
-				'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$status = 500;
-			$view->errors = array( array(
+			$view->errors = array(array(
 				'title' => $e->getMessage(),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
 
 		/** admin/jsonadm/standard/template-delete
@@ -93,11 +93,11 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-delete';
 		$default = 'delete-standard.php';
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 
 
@@ -108,33 +108,33 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function get( ServerRequestInterface $request, ResponseInterface $response )
+	public function get(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$view = $this->getView();
 
 		try
 		{
-			$response = $this->getItems( $view, $request, $response );
+			$response = $this->getItems($view, $request, $response);
 			$status = 200;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$status = 500;
-			$view->errors = array( array(
+			$view->errors = array(array(
 				'title' => $e->getMessage(),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
 
-		if( $view->param( 'aggregate' ) !== null )
+		if ($view->param('aggregate') !== null)
 		{
 			/** admin/jsonadm/standard/template-aggregate
 			 * Relative path to the JSON API template for GET aggregate requests
@@ -195,11 +195,11 @@ 
 			$default = 'get-standard.php';
 		}
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 
 
@@ -210,38 +210,38 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function patch( ServerRequestInterface $request, ResponseInterface $response )
+	public function patch(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$view = $this->getView();
 
 		try
 		{
-			$response = $this->patchItems( $view, $request, $response );
+			$response = $this->patchItems($view, $request, $response);
 			$status = 200;
 		}
-		catch( \Aimeos\Admin\JsonAdm\Exception $e )
+		catch (\Aimeos\Admin\JsonAdm\Exception $e)
 		{
 			$status = $e->getCode();
-			$view->errors = array( array(
-				'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$status = 500;
-			$view->errors = array( array(
+			$view->errors = array(array(
 				'title' => $e->getMessage(),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
 
 		/** admin/jsonadm/standard/template-patch
@@ -272,11 +272,11 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-patch';
 		$default = 'patch-standard.php';
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 
 
@@ -287,38 +287,38 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function post( ServerRequestInterface $request, ResponseInterface $response )
+	public function post(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$view = $this->getView();
 
 		try
 		{
-			$response = $this->postItems( $view, $request, $response );
+			$response = $this->postItems($view, $request, $response);
 			$status = 201;
 		}
-		catch( \Aimeos\Admin\JsonAdm\Exception $e )
+		catch (\Aimeos\Admin\JsonAdm\Exception $e)
 		{
 			$status = $e->getCode();
-			$view->errors = array( array(
-				'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$status = 500;
-			$view->errors = array( array(
+			$view->errors = array(array(
 				'title' => $e->getMessage(),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
 
 		/** admin/jsonadm/standard/template-post
@@ -349,11 +349,11 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-post';
 		$default = 'post-standard.php';
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 
 
@@ -364,14 +364,14 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function put( ServerRequestInterface $request, ResponseInterface $response )
+	public function put(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$status = 501;
 		$view = $this->getView();
 
-		$view->errors = array( array(
-			'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', 'Not implemented, use PATCH instead' ),
-		) );
+		$view->errors = array(array(
+			'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', 'Not implemented, use PATCH instead'),
+		));
 
 		/** admin/jsonadm/standard/template-put
 		 * Relative path to the JSON API template for PUT requests
@@ -401,11 +401,11 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-put';
 		$default = 'put-standard.php';
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 
 
@@ -416,7 +416,7 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function options( ServerRequestInterface $request, ResponseInterface $response )
+	public function options(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$context = $this->getContext();
 		$view = $this->getView();
@@ -425,37 +425,37 @@ 
 		{
 			$resources = $attributes = [];
 
-			foreach( $this->getDomains( $view ) as $domain )
+			foreach ($this->getDomains($view) as $domain)
 			{
-				$manager = \Aimeos\MShop\Factory::createManager( $context, $domain );
-				$resources = array_merge( $resources, $manager->getResourceType( true ) );
-				$attributes = array_merge( $attributes, $manager->getSearchAttributes( true ) );
+				$manager = \Aimeos\MShop\Factory::createManager($context, $domain);
+				$resources = array_merge($resources, $manager->getResourceType(true));
+				$attributes = array_merge($attributes, $manager->getSearchAttributes(true));
 			}
 
-			foreach( $this->getResources( $view ) as $resource ) {
+			foreach ($this->getResources($view) as $resource) {
 				$resources[] = $resource;
 			}
 
-			$view->resources = $this->getAllowedResources( $view, $resources );
+			$view->resources = $this->getAllowedResources($view, $resources);
 			$view->attributes = $attributes;
 
 			$status = 200;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$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
@@ -486,12 +486,12 @@ 
 		$tplconf = 'admin/jsonadm/standard/template-options';
 		$default = 'options-standard.php';
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Allow', 'DELETE,GET,PATCH,POST,OPTIONS' )
-			->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Allow', 'DELETE,GET,PATCH,POST,OPTIONS')
+			->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 
 
@@ -504,25 +504,25 @@ 
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the request body is invalid
 	 */
-	protected function deleteItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function deleteItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath());
 
-		if( ( $id = $view->param( 'id' ) ) == null )
+		if (($id = $view->param('id')) == null)
 		{
 			$body = (string) $request->getBody();
 
-			if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) || !is_array( $payload->data ) ) {
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 );
+			if (($payload = json_decode($body)) === null || !isset($payload->data) || !is_array($payload->data)) {
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400);
 			}
 
-			$ids = $this->getIds( $payload );
-			$manager->deleteItems( $ids );
-			$view->total = count( $ids );
+			$ids = $this->getIds($payload);
+			$manager->deleteItems($ids);
+			$view->total = count($ids);
 		}
 		else
 		{
-			$manager->deleteItem( $id );
+			$manager->deleteItem($id);
 			$view->total = 1;
 		}
 
@@ -538,35 +538,35 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath());
 
-		if( ( $key = $view->param( 'aggregate' ) ) !== null )
+		if (($key = $view->param('aggregate')) !== null)
 		{
-			$search = $this->initCriteria( $manager->createSearch(), $view->param() );
-			$view->data = $manager->aggregate( $search, $key, $view->param( 'value' ), $view->param( 'type' ) );
+			$search = $this->initCriteria($manager->createSearch(), $view->param());
+			$view->data = $manager->aggregate($search, $key, $view->param('value'), $view->param('type'));
 			return $response;
 		}
 
 		$total = 1;
-		$include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : [] );
+		$include = (($include = $view->param('include')) !== null ? explode(',', $include) : []);
 
-		if( ( $id = $view->param( 'id' ) ) == null )
+		if (($id = $view->param('id')) == null)
 		{
-			$search = $this->initCriteria( $manager->createSearch(), $view->param() );
-			$view->data = $manager->searchItems( $search, [], $total );
-			$view->childItems = $this->getChildItems( $view->data, $include );
-			$view->listItems = $this->getListItems( $view->data, $include );
+			$search = $this->initCriteria($manager->createSearch(), $view->param());
+			$view->data = $manager->searchItems($search, [], $total);
+			$view->childItems = $this->getChildItems($view->data, $include);
+			$view->listItems = $this->getListItems($view->data, $include);
 		}
 		else
 		{
-			$view->data = $manager->getItem( $id, [] );
-			$view->childItems = $this->getChildItems( array( $id => $view->data ), $include );
-			$view->listItems = $this->getListItems( array( $id => $view->data ), $include );
+			$view->data = $manager->getItem($id, []);
+			$view->childItems = $this->getChildItems(array($id => $view->data), $include);
+			$view->listItems = $this->getListItems(array($id => $view->data), $include);
 		}
 
-		$view->refItems = $this->getRefItems( $view->listItems );
+		$view->refItems = $this->getRefItems($view->listItems);
 		$view->total = $total;
 
 		return $response;
@@ -582,35 +582,35 @@ 
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If "id" parameter isn't available or the body is invalid
 	 */
-	protected function patchItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function patchItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$body = (string) $request->getBody();
 
-		if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 );
+		if (($payload = json_decode($body)) === null || !isset($payload->data)) {
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400);
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath());
 
-		if( is_array( $payload->data ) )
+		if (is_array($payload->data))
 		{
-			$data = $this->saveData( $manager, $payload );
+			$data = $this->saveData($manager, $payload);
 
 			$view->data = $data;
-			$view->total = count( $data );
-			$response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' );
+			$view->total = count($data);
+			$response = $response->withHeader('Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"');
 		}
-		elseif( ( $id = $view->param( 'id' ) ) != null )
+		elseif (($id = $view->param('id')) != null)
 		{
 			$payload->data->id = $id;
-			$data = $this->saveEntry( $manager, $payload->data );
+			$data = $this->saveEntry($manager, $payload->data);
 
 			$view->data = $data;
 			$view->total = 1;
 		}
 		else
 		{
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 );
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400);
 		}
 
 		return $response;
@@ -625,33 +625,33 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function postItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function postItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$body = (string) $request->getBody();
 
-		if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 );
+		if (($payload = json_decode($body)) === null || !isset($payload->data)) {
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400);
 		}
 
-		if( isset( $payload->data->id ) || $view->param( 'id' ) != null ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Client generated IDs are not supported' ), 403 );
+		if (isset($payload->data->id) || $view->param('id') != null) {
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Client generated IDs are not supported'), 403);
 		}
 
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath());
 
-		if( is_array( $payload->data ) )
+		if (is_array($payload->data))
 		{
-			$data = $this->saveData( $manager, $payload );
+			$data = $this->saveData($manager, $payload);
 
 			$view->data = $data;
-			$view->total = count( $data );
-			$response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' );
+			$view->total = count($data);
+			$response = $response->withHeader('Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"');
 		}
 		else
 		{
 			$payload->data->id = null;
-			$data = $this->saveEntry( $manager, $payload->data );
+			$data = $this->saveEntry($manager, $payload->data);
 
 			$view->data = $data;
 			$view->total = 1;

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

Spacing +80 added lines, -80 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context MShop context object
 	 * @param string $path Name of the client separated by slashes, e.g "product/property"
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, $path )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, $path)
 	{
 		$this->context = $context;
 		$this->path = $path;
@@ -45,9 +45,9 @@ 
 	 * @param array $param List of method parameter
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If method call failed
 	 */
-	public function __call( $name, array $param )
+	public function __call($name, array $param)
 	{
-		throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Unable to call method "%1$s"', $name ) );
+		throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Unable to call method "%1$s"', $name));
 	}
 
 
@@ -58,8 +58,8 @@ 
 	 */
 	public function getAimeos()
 	{
-		if( !isset( $this->aimeos ) ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Aimeos object not available' ) );
+		if (!isset($this->aimeos)) {
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Aimeos object not available'));
 		}
 
 		return $this->aimeos;
@@ -72,7 +72,7 @@ 
 	 * @param \Aimeos\Bootstrap $aimeos The Aimeos bootstrap object
 	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
 	 */
-	public function setAimeos( \Aimeos\Bootstrap $aimeos )
+	public function setAimeos(\Aimeos\Bootstrap $aimeos)
 	{
 		$this->aimeos = $aimeos;
 		return $this;
@@ -86,8 +86,8 @@ 
 	 */
 	public function getView()
 	{
-		if( !isset( $this->view ) ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No view available' ) );
+		if (!isset($this->view)) {
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No view available'));
 		}
 
 		return $this->view;
@@ -100,7 +100,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the admin output
 	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
 	 */
-	public function setView( \Aimeos\MW\View\Iface $view )
+	public function setView(\Aimeos\MW\View\Iface $view)
 	{
 		$this->view = $view;
 		return $this;
@@ -114,7 +114,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 [];
 	}
@@ -137,9 +137,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
@@ -162,7 +162,7 @@ 
 				'attribute', 'catalog', 'coupon', 'customer', 'locale', 'media', 'order',
 				'plugin', 'price', 'product', 'service', 'supplier', 'stock', 'tag', 'text'
 			);
-			$domains = $this->getContext()->getConfig()->get( 'admin/jsonadm/domains', $default );
+			$domains = $this->getContext()->getConfig()->get('admin/jsonadm/domains', $default);
 		}
 
 		return (array) $domains;
@@ -175,15 +175,15 @@ 
 	 * @param \stdClass $request Decoded request body
 	 * @return array List of item IDs
 	 */
-	protected function getIds( $request )
+	protected function getIds($request)
 	{
 		$ids = [];
 
-		if( isset( $request->data ) )
+		if (isset($request->data))
 		{
-			foreach( (array) $request->data as $entry )
+			foreach ((array) $request->data as $entry)
 			{
-				if( isset( $entry->id ) ) {
+				if (isset($entry->id)) {
 					$ids[] = $entry->id;
 				}
 			}
@@ -200,7 +200,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 [];
 	}
@@ -223,23 +223,23 @@ 
 	 * @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 = [];
 		$context = $this->getContext();
 
-		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( $context, $domain );
+			$manager = \Aimeos\MShop\Factory::createManager($context, $domain);
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', str_replace( '/', '.', $domain ) . '.id', $ids ) );
+			$search->setConditions($search->compare('==', str_replace('/', '.', $domain) . '.id', $ids));
 
-			$list = array_merge( $list, $manager->searchItems( $search ) );
+			$list = array_merge($list, $manager->searchItems($search));
 		}
 
 		return $list;
@@ -253,14 +253,14 @@ 
 	 * @param array List of all available resources
 	 * @return array List of allowed resources
 	 */
-	protected function getAllowedResources( \Aimeos\MW\View\Iface $view, array $resources )
+	protected function getAllowedResources(\Aimeos\MW\View\Iface $view, array $resources)
 	{
 		$config = $this->getContext()->getConfig();
 		$allowed = [];
 
-		foreach( $resources as $resource )
+		foreach ($resources as $resource)
 		{
-			if( $view->access( $config->get( 'admin/jsonadm/resource/' . $resource . '/groups', [] ) ) === true ) {
+			if ($view->access($config->get('admin/jsonadm/resource/' . $resource . '/groups', [])) === true) {
 				$allowed[] = $resource;
 			}
 		}
@@ -275,7 +275,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with "resource" parameter
 	 * @return array List of domain names
 	 */
-	protected function getResources( \Aimeos\MW\View\Iface $view )
+	protected function getResources(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jsonadm/resources
 		 * A list of additional resources name whose clients are available for the JSON API
@@ -293,7 +293,7 @@ 
 		 * @category Developer
 		 * @see admin/jsonadm/domains
 		 */
-		return (array) $view->config( 'admin/jsonadm/resources', ['coupon/config', 'plugin/config', 'service/config'] );
+		return (array) $view->config('admin/jsonadm/resources', ['coupon/config', 'plugin/config', 'service/config']);
 	}
 
 
@@ -304,11 +304,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;
 	}
@@ -320,17 +320,17 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 */
-	protected function initCriteriaConditions( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	protected function initCriteriaConditions(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		if( !isset( $params['filter'] ) ) {
+		if (!isset($params['filter'])) {
 			return;
 		}
 
 		$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));
 	}
 
 
@@ -340,12 +340,12 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 */
-	protected function initCriteriaSlice( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	protected function initCriteriaSlice(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		$start = ( isset( $params['page']['offset'] ) ? (int) $params['page']['offset'] : 0 );
-		$size = ( isset( $params['page']['limit'] ) ? (int) $params['page']['limit'] : 25 );
+		$start = (isset($params['page']['offset']) ? (int) $params['page']['offset'] : 0);
+		$size = (isset($params['page']['limit']) ? (int) $params['page']['limit'] : 25);
 
-		$criteria->setSlice( $start, $size );
+		$criteria->setSlice($start, $size);
 	}
 
 
@@ -355,24 +355,24 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 */
-	protected function initCriteriaSortations( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	protected function initCriteriaSortations(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		if( !isset( $params['sort'] ) ) {
+		if (!isset($params['sort'])) {
 			return;
 		}
 
 		$sortation = [];
 
-		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 );
+				$sortation[] = $criteria->sort('+', $sort);
 			}
 		}
 
-		$criteria->setSortations( $sortation );
+		$criteria->setSortations($sortation);
 	}
 
 
@@ -383,14 +383,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 = [];
 
-		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);
 			}
 		}
 
@@ -405,22 +405,22 @@ 
 	 * @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)
 	{
-		if( isset( $entry->id ) ) {
-			$item = $manager->getItem( $entry->id );
+		if (isset($entry->id)) {
+			$item = $manager->getItem($entry->id);
 		} else {
 			$item = $manager->createItem();
 		}
 
-		$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-		$item = $manager->saveItem( $item );
+		$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+		$item = $manager->saveItem($item);
 
-		if( isset( $entry->relationships ) ) {
-			$this->saveRelationships( $manager, $item, $entry->relationships );
+		if (isset($entry->relationships)) {
+			$this->saveRelationships($manager, $item, $entry->relationships);
 		}
 
-		return $manager->getItem( $item->getId() );
+		return $manager->getItem($item->getId());
 	}
 
 
@@ -431,28 +431,28 @@ 
 	 * @param \Aimeos\MShop\Common\Item\Iface $item Domain item with an unique ID set
 	 * @param \stdClass $relationships Object including the <domain>/data/attributes structure
 	 */
-	protected function saveRelationships( \Aimeos\MShop\Common\Manager\Iface $manager,
-		\Aimeos\MShop\Common\Item\Iface $item, \stdClass $relationships )
+	protected function saveRelationships(\Aimeos\MShop\Common\Manager\Iface $manager,
+		\Aimeos\MShop\Common\Item\Iface $item, \stdClass $relationships)
 	{
 		$id = $item->getId();
-		$listManager = $manager->getSubManager( 'lists' );
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( (array) $relationships as $domain => $list )
+		foreach ((array) $relationships as $domain => $list)
 		{
-			if( isset( $list->data ) )
+			if (isset($list->data))
 			{
-				foreach( (array) $list->data as $data )
+				foreach ((array) $list->data as $data)
 				{
-					$listItem = $this->addItemData( $listManager, $listManager->createItem(), $data, $domain );
+					$listItem = $this->addItemData($listManager, $listManager->createItem(), $data, $domain);
 
-					if( isset( $data->id ) ) {
-						$listItem->setRefId( $data->id );
+					if (isset($data->id)) {
+						$listItem->setRefId($data->id);
 					}
 
-					$listItem->setParentId( $id );
-					$listItem->setDomain( $domain );
+					$listItem->setParentId($id);
+					$listItem->setDomain($domain);
 
-					$listManager->saveItem( $listItem, false );
+					$listManager->saveItem($listItem, false);
 				}
 			}
 		}
@@ -469,20 +469,20 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Iface Item including the data
 	 */
 	protected function addItemData(\Aimeos\MShop\Common\Manager\Iface $manager,
-		\Aimeos\MShop\Common\Item\Iface $item, \stdClass $data, $domain )
+		\Aimeos\MShop\Common\Item\Iface $item, \stdClass $data, $domain)
 	{
-		if( isset( $data->attributes ) )
+		if (isset($data->attributes))
 		{
 			$attr = (array) $data->attributes;
-			$key = str_replace( '/', '.', $item->getResourceType() );
+			$key = str_replace('/', '.', $item->getResourceType());
 
-			if( isset( $attr[$key.'.type'] ) )
+			if (isset($attr[$key . '.type']))
 			{
-				$typeItem = $manager->getSubManager( 'type' )->findItem( $attr[$key.'.type'], [], $domain );
-				$attr[$key.'.typeid'] = $typeItem->getId();
+				$typeItem = $manager->getSubManager('type')->findItem($attr[$key . '.type'], [], $domain);
+				$attr[$key . '.typeid'] = $typeItem->getId();
 			}
 
-			$item->fromArray( $attr );
+			$item->fromArray($attr);
 		}
 
 		return $item;

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

Spacing +29 added lines, -29 removed lines

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

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

Spacing +35 added lines, -35 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string $classname Full name of the class for which the object should be returned
 	 * @param \Aimeos\Admin\JsonAdm\Iface|null $client JSON API client object
 	 */
-	public static function injectClient( $classname, \Aimeos\Admin\JsonAdm\Iface $client = null )
+	public static function injectClient($classname, \Aimeos\Admin\JsonAdm\Iface $client = null)
 	{
 		self::$objects[$classname] = $client;
 	}
@@ -45,8 +45,8 @@ 
 	 * @param string $path Name of the client separated by slashes, e.g "product/property"
 	 * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object
 	 */
-	protected static function addClientDecorators( \Aimeos\Admin\JsonAdm\Iface $client,
-		\Aimeos\MShop\Context\Item\Iface $context, $path )
+	protected static function addClientDecorators(\Aimeos\Admin\JsonAdm\Iface $client,
+		\Aimeos\MShop\Context\Item\Iface $context, $path)
 	{
 		$config = $context->getConfig();
 
@@ -72,38 +72,38 @@ 
 		 * @since 2015.12
 		 * @category Developer
 		 */
-		$decorators = $config->get( 'admin/jsonadm/common/decorators/default', [] );
+		$decorators = $config->get('admin/jsonadm/common/decorators/default', []);
 
-		if( $path !== null && is_string( $path ) )
+		if ($path !== null && is_string($path))
 		{
-			$dpath = trim( $path, '/' );
-			$dpath = ( $dpath !== '' ? $dpath . '/' : $dpath );
+			$dpath = trim($path, '/');
+			$dpath = ($dpath !== '' ? $dpath . '/' : $dpath);
 
-			$excludes = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/excludes', [] );
-			$localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) );
+			$excludes = $config->get('admin/jsonadm/' . $dpath . 'decorators/excludes', []);
+			$localClass = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $path)));
 
-			foreach( $decorators as $key => $name )
+			foreach ($decorators as $key => $name)
 			{
-				if( in_array( $name, $excludes ) ) {
-					unset( $decorators[$key] );
+				if (in_array($name, $excludes)) {
+					unset($decorators[$key]);
 				}
 			}
 
 			$classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
-			$decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/global', [] );
-			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $path );
+			$decorators = $config->get('admin/jsonadm/' . $dpath . 'decorators/global', []);
+			$client = self::addDecorators($client, $decorators, $classprefix, $context, $path);
 
-			if( !empty( $path ) )
+			if (!empty($path))
 			{
-				$classprefix = '\\Aimeos\\Admin\\JsonAdm\\' . ucfirst( $localClass ) . '\\Decorator\\';
-				$decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/local', [] );
-				$client = self::addDecorators( $client, $decorators, $classprefix, $context, $path );
+				$classprefix = '\\Aimeos\\Admin\\JsonAdm\\' . ucfirst($localClass) . '\\Decorator\\';
+				$decorators = $config->get('admin/jsonadm/' . $dpath . 'decorators/local', []);
+				$client = self::addDecorators($client, $decorators, $classprefix, $context, $path);
 			}
 		}
 		else
 		{
 			$classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
-			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $path );
+			$client = self::addDecorators($client, $decorators, $classprefix, $context, $path);
 		}
 
 		return $client;
@@ -120,26 +120,26 @@ 
 	 * @param string $path Name of the client separated by slashes, e.g "product/stock"
 	 * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object
 	 */
-	protected static function addDecorators( \Aimeos\Admin\JsonAdm\Iface $client, array $decorators, $classprefix,
-			\Aimeos\MShop\Context\Item\Iface $context, $path )
+	protected static function addDecorators(\Aimeos\Admin\JsonAdm\Iface $client, array $decorators, $classprefix,
+			\Aimeos\MShop\Context\Item\Iface $context, $path)
 	{
-		foreach( $decorators as $name )
+		foreach ($decorators as $name)
 		{
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
-				$classname = is_string( $name ) ? $classprefix . $name : '<not a string>';
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ), 404 );
+				$classname = is_string($name) ? $classprefix . $name : '<not a string>';
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname), 404);
 			}
 
 			$classname = $classprefix . $name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" not found', $classname), 404);
 			}
 
-			$client = new $classname( $client, $context, $path );
+			$client = new $classname($client, $context, $path);
 
-			\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\Iface', $client );
+			\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\Iface', $client);
 		}
 
 		return $client;
@@ -155,19 +155,19 @@ 
 	 * @param string $path Name of the client separated by slashes, e.g "product/property"
 	 * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object
 	 */
-	protected static function createClientBase( $classname, $interface, \Aimeos\MShop\Context\Item\Iface $context, $path )
+	protected static function createClientBase($classname, $interface, \Aimeos\MShop\Context\Item\Iface $context, $path)
 	{
-		if( isset( self::$objects[$classname] ) ) {
+		if (isset(self::$objects[$classname])) {
 			return self::$objects[$classname];
 		}
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" not found', $classname), 404);
 		}
 
-		$client = new $classname( $context, $path );
+		$client = new $classname($context, $path);
 
-		\Aimeos\MW\Common\Base::checkClass( $interface, $client );
+		\Aimeos\MW\Common\Base::checkClass($interface, $client);
 
 		return $client;
 	}

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

Spacing +26 added lines, -26 removed lines

@@ -21,29 +21,29 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->client = new \Aimeos\Admin\JsonAdm\Product\Standard( $this->context, $this->view, [], '' );
+		$this->client = new \Aimeos\Admin\JsonAdm\Product\Standard($this->context, $this->view, [], '');
 
-		$this->object = $this->getMockBuilder( '\Aimeos\Admin\JsonAdm\Common\Factory\Base' )
+		$this->object = $this->getMockBuilder('\Aimeos\Admin\JsonAdm\Common\Factory\Base')
 			->getMockForAbstractClass();
 	}
 
 
 	public function testinjectClient()
 	{
-		$this->object->injectClient( 'test', $this->client );
+		$this->object->injectClient('test', $this->client);
 	}
 
 
 	public function testAddClientDecorators()
 	{
 		$config = $this->context->getConfig();
-		$config->set( 'client/jsonapi/common/decorators/default', ['Test'] );
-		$config->set( 'client/jsonapi/product/decorators/excludes', ['Test'] );
+		$config->set('client/jsonapi/common/decorators/default', ['Test']);
+		$config->set('client/jsonapi/product/decorators/excludes', ['Test']);
 
 		$params = [$this->client, $this->context, $this->view, [], 'product'];
-		$result = $this->access( 'addClientDecorators' )->invokeArgs( $this->object, $params );
+		$result = $this->access('addClientDecorators')->invokeArgs($this->object, $params);
 
-		$this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result);
 	}
 
 
@@ -52,9 +52,9 @@ 
 		$prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
 		$params = [$this->client, ['Example'], $prefix, $this->context, $this->view, [], ''];
 
-		$result = $this->access( 'addDecorators' )->invokeArgs( $this->object, $params );
+		$result = $this->access('addDecorators')->invokeArgs($this->object, $params);
 
-		$this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result);
 	}
 
 
@@ -63,8 +63,8 @@ 
 		$prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
 		$params = [$this->client, ['Test'], $prefix, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( '\Aimeos\Admin\JsonAdm\Exception' );
-		$this->access( 'addDecorators' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException('\Aimeos\Admin\JsonAdm\Exception');
+		$this->access('addDecorators')->invokeArgs($this->object, $params);
 	}
 
 
@@ -73,8 +73,8 @@ 
 		$prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
 		$params = [$this->client, [''], $prefix, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( '\Aimeos\Admin\JsonAdm\Exception' );
-		$this->access( 'addDecorators' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException('\Aimeos\Admin\JsonAdm\Exception');
+		$this->access('addDecorators')->invokeArgs($this->object, $params);
 	}
 
 
@@ -84,9 +84,9 @@ 
 		$class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard';
 		$params = [$class, $iface, $this->context, $this->view, [], ''];
 
-		$result = $this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$result = $this->access('createClientBase')->invokeArgs($this->object, $params);
 
-		$this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result);
 	}
 
 
@@ -95,10 +95,10 @@ 
 		$iface = '\Aimeos\\Admin\\JsonAdm\\Iface';
 		$params = ['test', $iface, $this->context, $this->view, [], ''];
 
-		$this->object->injectClient( 'test', $this->client );
-		$result = $this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$this->object->injectClient('test', $this->client);
+		$result = $this->access('createClientBase')->invokeArgs($this->object, $params);
 
-		$this->assertSame( $this->client, $result );
+		$this->assertSame($this->client, $result);
 	}
 
 
@@ -107,8 +107,8 @@ 
 		$iface = '\Aimeos\\Admin\\JsonAdm\\Iface';
 		$params = ['invalid', $iface, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( '\Aimeos\Admin\JsonAdm\Exception' );
-		$this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException('\Aimeos\Admin\JsonAdm\Exception');
+		$this->access('createClientBase')->invokeArgs($this->object, $params);
 	}
 
 
@@ -118,16 +118,16 @@ 
 		$class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard';
 		$params = [$class, $iface, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( '\Aimeos\MW\Common\Exception' );
-		$this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException('\Aimeos\MW\Common\Exception');
+		$this->access('createClientBase')->invokeArgs($this->object, $params);
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( '\Aimeos\Admin\JsonAdm\Common\Factory\Base' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Admin\JsonAdm\Common\Factory\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}