aimeos / ai-admin-jsonadm

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

Braces +2 added lines, -4 removed lines

@@ -118,16 +118,14 @@
 		{
 			$response = $this->getItems( $view, $request, $response );
 			$status = 200;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(

Spacing +19 added lines, -19 removed lines

@@ -110,30 +110,30 @@ 
 	 * @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(),
-			) );
+			));
 		}
 
 		/** admin/jsonadm/service/config/template-get
@@ -158,11 +158,11 @@ 
 		$tplconf = 'admin/jsonadm/service/config/template-get';
 		$default = 'config-standard';
 
-		$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);
 	}
 
 
@@ -174,16 +174,16 @@ 
 	 * @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)
 	{
-		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);
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-		$item = $manager->createItem()->setProvider( $id );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
+		$item = $manager->createItem()->setProvider($id);
 
-		$view->configItems = $manager->getProvider( $item, $view->param( 'type', 'payment' ) )->getConfigBE();
+		$view->configItems = $manager->getProvider($item, $view->param('type', 'payment'))->getConfigBE();
 
 		return $response;
 	}

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

Braces +2 added lines, -4 removed lines

@@ -118,16 +118,14 @@
 		{
 			$response = $this->getItems( $view, $request, $response );
 			$status = 200;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$status = 404;
 			$view->errors = array( array(
 				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(

Spacing +19 added lines, -19 removed lines

@@ -110,30 +110,30 @@ 
 	 * @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(),
-			) );
+			));
 		}
 
 		/** admin/jsonadm/plugin/config/template-get
@@ -158,11 +158,11 @@ 
 		$tplconf = 'admin/jsonadm/plugin/config/template-get';
 		$default = 'config-standard';
 
-		$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);
 	}
 
 
@@ -174,16 +174,16 @@ 
 	 * @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)
 	{
-		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);
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'plugin' );
-		$item = $manager->createItem()->setProvider( $id );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'plugin');
+		$item = $manager->createItem()->setProvider($id);
 
-		$view->configItems = $manager->getProvider( $item, 'order' )->getConfigBE();
+		$view->configItems = $manager->getProvider($item, 'order')->getConfigBE();
 
 		return $response;
 	}

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

Spacing +19 added lines, -19 removed lines

@@ -110,7 +110,7 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function get( ServerRequestInterface $request, ResponseInterface $response )
+	public function get(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		/** admin/jsonadm/partials/locale/site/template-data
 		 * Relative path to the data partial template file for the locale site  client
@@ -127,9 +127,9 @@ 
 		 * @since 2016.07
 		 * @category Developer
 		 */
-		$this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/locale/site/template-data' ) );
+		$this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/locale/site/template-data'));
 
-		return parent::get( $request, $response );
+		return parent::get($request, $response);
 	}
 
 
@@ -141,16 +141,16 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'locale/site' );
-		$search = $this->initCriteria( $manager->createSearch(), $view->param() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'locale/site');
+		$search = $this->initCriteria($manager->createSearch(), $view->param());
 		$total = 1;
 
-		if( ( $id = $view->param( 'id' ) ) == null ) {
-			$view->data = $manager->searchItems( $search, [], $total );
+		if (($id = $view->param('id')) == null) {
+			$view->data = $manager->searchItems($search, [], $total);
 		} else {
-			$view->data = $manager->getTree( $id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $search );
+			$view->data = $manager->getTree($id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $search);
 		}
 
 		$view->childItems = [];
@@ -169,25 +169,25 @@ 
 	 * @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 ) )
+		if (isset($entry->id))
 		{
-			$item = $manager->getItem( $entry->id );
-			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$item = $manager->saveItem( $item );
+			$item = $manager->getItem($entry->id);
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$item = $manager->saveItem($item);
 		}
 		else
 		{
 			$item = $manager->createItem();
-			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$manager->insertItem( $item );
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$manager->insertItem($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());
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -176,8 +176,7 @@
 			$item = $manager->getItem( $entry->id );
 			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
 			$item = $manager->saveItem( $item );
-		}
-		else
+		} else
 		{
 			$item = $manager->createItem();
 			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );

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

Spacing +42 added lines, -42 removed lines

@@ -110,7 +110,7 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function get( ServerRequestInterface $request, ResponseInterface $response )
+	public function get(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		/** admin/jsonadm/partials/catalog/template-data
 		 * Relative path to the data partial template file for the catalog client
@@ -127,9 +127,9 @@ 
 		 * @since 2016.07
 		 * @category Developer
 		 */
-		$this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/catalog/template-data' ) );
+		$this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/catalog/template-data'));
 
-		return parent::get( $request, $response );
+		return parent::get($request, $response);
 	}
 
 
@@ -140,14 +140,14 @@ 
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface
 	 */
-	protected function getChildItems( array $items, array $include )
+	protected function getChildItems(array $items, array $include)
 	{
 		$list = [];
 
-		if( in_array( 'catalog', $include ) )
+		if (in_array('catalog', $include))
 		{
-			foreach( $items as $item ) {
-				$list = array_merge( $list, [$item], $this->getChildItems( $item->getChildren(), $include ) );
+			foreach ($items as $item) {
+				$list = array_merge($list, [$item], $this->getChildItems($item->getChildren(), $include));
 			}
 		}
 
@@ -162,40 +162,40 @@ 
 	 * @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(), 'catalog' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog');
 
-		if( ( $key = $view->param( 'aggregate' ) ) !== null )
+		if (($key = $view->param('aggregate')) !== null)
 		{
-			$search = $this->initCriteria( $manager->createSearch(), $view->param() );
-			$view->data = $manager->aggregate( $search, $key );
+			$search = $this->initCriteria($manager->createSearch(), $view->param());
+			$view->data = $manager->aggregate($search, $key);
 			return $response;
 		}
 
-		$include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : [] );
-		$search = $this->initCriteria( $manager->createSearch(), $view->param() );
+		$include = (($include = $view->param('include')) !== null ? explode(',', $include) : []);
+		$search = $this->initCriteria($manager->createSearch(), $view->param());
 		$total = 1;
 
-		if( ( $id = $view->param( 'id' ) ) == null )
+		if (($id = $view->param('id')) == null)
 		{
-			$view->data = $manager->searchItems( $search, [], $total );
-			$view->listItems = $this->getListItems( $view->data, $include );
+			$view->data = $manager->searchItems($search, [], $total);
+			$view->listItems = $this->getListItems($view->data, $include);
 			$view->childItems = [];
 		}
 		else
 		{
 			$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE;
-			if( in_array( 'catalog', $include ) ) {
+			if (in_array('catalog', $include)) {
 				$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST;
 			}
 
-			$view->data = $manager->getTree( $id, $include, $level, $search );
-			$view->listItems = $this->getListItems( array( $id => $view->data ), $include );
-			$view->childItems = $this->getChildItems( $view->data->getChildren(), $include );
+			$view->data = $manager->getTree($id, $include, $level, $search);
+			$view->listItems = $this->getListItems(array($id => $view->data), $include);
+			$view->childItems = $this->getChildItems($view->data->getChildren(), $include);
 		}
 
-		$view->refItems = $this->getRefItems( $view->listItems );
+		$view->refItems = $this->getRefItems($view->listItems);
 		$view->total = $total;
 
 		return $response;
@@ -209,18 +209,18 @@ 
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 */
-	protected function getListItems( array $items, array $include )
+	protected function getListItems(array $items, array $include)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'catalog.lists.parentid', array_keys( $items ) ),
-			$search->compare( '==', 'catalog.lists.domain', $include ),
+			$search->compare('==', 'catalog.lists.parentid', array_keys($items)),
+			$search->compare('==', 'catalog.lists.domain', $include),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -231,32 +231,32 @@ 
 	 * @param \stdClass $entry Object including "id" and "attributes" elements
 	 * @return \Aimeos\MShop\Common\Item\Iface New or updated item
 	 */
-	protected function saveEntry( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry )
+	protected function saveEntry(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry)
 	{
-		$targetId = ( isset( $entry->targetid ) ? $entry->targetid : null );
-		$refId = ( isset( $entry->refid ) ? $entry->refid : null );
+		$targetId = (isset($entry->targetid) ? $entry->targetid : null);
+		$refId = (isset($entry->refid) ? $entry->refid : null);
 
-		if( isset( $entry->id ) )
+		if (isset($entry->id))
 		{
-			$item = $manager->getItem( $entry->id );
-			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$item = $manager->saveItem( $item );
+			$item = $manager->getItem($entry->id);
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$item = $manager->saveItem($item);
 
-			if( isset( $entry->parentid ) && $targetId !== null ) {
-				$manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId );
+			if (isset($entry->parentid) && $targetId !== null) {
+				$manager->moveItem($item->getId(), $entry->parentid, $targetId, $refId);
 			}
 		}
 		else
 		{
 			$item = $manager->createItem();
-			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$manager->insertItem( $item, $targetId, $refId );
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$manager->insertItem($item, $targetId, $refId);
 		}
 
-		if( isset( $entry->relationships ) ) {
-			$this->saveRelationships( $manager, $item, $entry->relationships );
+		if (isset($entry->relationships)) {
+			$this->saveRelationships($manager, $item, $entry->relationships);
 		}
 
-		return $manager->getItem( $item->getId() );
+		return $manager->getItem($item->getId());
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -182,8 +182,7 @@ 
 			$view->data = $manager->searchItems( $search, [], $total );
 			$view->listItems = $this->getListItems( $view->data, $include );
 			$view->childItems = [];
-		}
-		else
+		} else
 		{
 			$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE;
 			if( in_array( 'catalog', $include ) ) {
@@ -245,8 +244,7 @@ 
 			if( isset( $entry->parentid ) && $targetId !== null ) {
 				$manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId );
 			}
-		}
-		else
+		} else
 		{
 			$item = $manager->createItem();
 			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );

admin/jsonadm/tests/TestHelperJadm.php

Spacing +50 added lines, -50 removed lines

@@ -15,15 +15,15 @@ 
 	public static function bootstrap()
 	{
 		self::getAimeos();
-		\Aimeos\MShop\Factory::setCache( false );
-		\Aimeos\Admin\JsonAdm\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
+		\Aimeos\Admin\JsonAdm\Factory::setCache(false);
 	}
 
 
-	public static function getContext( $site = 'unittest' )
+	public static function getContext($site = 'unittest')
 	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
+		if (!isset(self::$context[$site])) {
+			self::$context[$site] = self::createContext($site);
 		}
 
 		return clone self::$context[$site];
@@ -32,13 +32,13 @@ 
 
 	public static function getAimeos()
 	{
-		if( !isset( self::$aimeos ) )
+		if (!isset(self::$aimeos))
 		{
 			require_once 'Bootstrap.php';
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
 
-			$extdir = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), false );
+			$extdir = dirname(dirname(dirname(dirname(__FILE__))));
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), false);
 		}
 
 		return self::$aimeos;
@@ -47,88 +47,88 @@ 
 
 	public static function getJsonadmPaths()
 	{
-		return self::getAimeos()->getCustomPaths( 'admin/jsonadm/templates' );
+		return self::getAimeos()->getCustomPaths('admin/jsonadm/templates');
 	}
 
 
-	private static function createContext( $site )
+	private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 		$aimeos = self::getAimeos();
 
 
-		$paths = $aimeos->getConfigPaths( 'mysql' );
+		$paths = $aimeos->getConfigPaths('mysql');
 		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
 		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
-		$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf );
-		$conf = new \Aimeos\MW\Config\Decorator\Documentor( $conf, $file );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray([], $paths);
+		$conf = new \Aimeos\MW\Config\Decorator\Memory($conf);
+		$conf = new \Aimeos\MW\Config\Decorator\Documentor($conf, $file);
+		$ctx->setConfig($conf);
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
-		$ctx->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
+		$ctx->setDatabaseManager($dbm);
 
 
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
-		$ctx->setLogger( $logger );
+		$logger = new \Aimeos\MW\Logger\File($site . '.log', \Aimeos\MW\Logger\Base::DEBUG);
+		$ctx->setLogger($logger);
 
 
 		$session = new \Aimeos\MW\Session\None();
-		$ctx->setSession( $session );
+		$ctx->setSession($session);
 
 
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
-		$ctx->setI18n( array( 'de' => $i18n ) );
+		$i18n = new \Aimeos\MW\Translation\None('de');
+		$ctx->setI18n(array('de' => $i18n));
 
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
-		$locale = $localeManager->bootstrap( $site, 'de', '', false );
-		$ctx->setLocale( $locale );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
+		$locale = $localeManager->bootstrap($site, 'de', '', false);
+		$ctx->setLocale($locale);
 
 
-		$view = self::createView( $conf );
-		$ctx->setView( $view );
+		$view = self::createView($conf);
+		$ctx->setView($view);
 
 
-		$ctx->setEditor( 'core:admin/jsonadm' );
+		$ctx->setEditor('core:admin/jsonadm');
 
 		return $ctx;
 	}
 
 
-	protected static function createView( \Aimeos\MW\Config\Iface $config )
+	protected static function createView(\Aimeos\MW\Config\Iface $config)
 	{
-		$tmplpaths = self::getAimeos()->getCustomPaths( 'admin/jsonadm/templates' );
+		$tmplpaths = self::getAimeos()->getCustomPaths('admin/jsonadm/templates');
 
-		$view = new \Aimeos\MW\View\Standard( $tmplpaths );
+		$view = new \Aimeos\MW\View\Standard($tmplpaths);
 
-		$helper = new \Aimeos\MW\View\Helper\Access\All( $view );
-		$view->addHelper( 'access', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Access\All($view);
+		$view->addHelper('access', $helper);
 
-		$trans = new \Aimeos\MW\Translation\None( 'de_DE' );
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $trans );
-		$view->addHelper( 'translate', $helper );
+		$trans = new \Aimeos\MW\Translation\None('de_DE');
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $trans);
+		$view->addHelper('translate', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Url\Standard( $view, 'http://baseurl' );
-		$view->addHelper( 'url', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Url\Standard($view, 'http://baseurl');
+		$view->addHelper('url', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, '.', '' );
-		$view->addHelper( 'number', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, '.', '');
+		$view->addHelper('number', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Date\Standard( $view, 'Y-m-d' );
-		$view->addHelper( 'date', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Date\Standard($view, 'Y-m-d');
+		$view->addHelper('date', $helper);
 
-		$config = new \Aimeos\MW\Config\Decorator\Protect( $config, array( 'admin/jsonadm' ) );
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$config = new \Aimeos\MW\Config\Decorator\Protect($config, array('admin/jsonadm'));
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Request\Standard( $view, new \Zend\Diactoros\ServerRequest() );
-		$view->addHelper( 'request', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Request\Standard($view, new \Zend\Diactoros\ServerRequest());
+		$view->addHelper('request', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Response\Standard( $view, new \Zend\Diactoros\Response() );
-		$view->addHelper( 'response', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Response\Standard($view, new \Zend\Diactoros\Response());
+		$view->addHelper('response', $helper);
 
 		return $view;
 	}

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

Doc Comments -1 removed lines

@@ -77,7 +77,6 @@
 	 *
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
-	 * @param string|null $prefix Form parameter prefix when nesting parameters is required
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
 	public function options( ServerRequestInterface $request, ResponseInterface $response );

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 	 * @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);
 
 
 	/**
@@ -39,7 +39,7 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function get( ServerRequestInterface $request, ResponseInterface $response );
+	public function get(ServerRequestInterface $request, ResponseInterface $response);
 
 
 	/**
@@ -49,7 +49,7 @@ 
 	 * @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);
 
 
 	/**
@@ -59,7 +59,7 @@ 
 	 * @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);
 
 
 	/**
@@ -69,7 +69,7 @@ 
 	 * @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);
 
 
 	/**
@@ -80,5 +80,5 @@ 
 	 * @param string|null $prefix Form parameter prefix when nesting parameters is required
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function options( ServerRequestInterface $request, ResponseInterface $response );
+	public function options(ServerRequestInterface $request, ResponseInterface $response);
 }

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

Doc Comments +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 	 * Sets the Aimeos bootstrap object
 	 *
 	 * @param \Aimeos\Bootstrap $aimeos The Aimeos bootstrap object
-	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
+	 * @return Base Reference to this object for fluent calls
 	 */
 	public function setAimeos( \Aimeos\Bootstrap $aimeos )
 	{
@@ -98,7 +98,7 @@ 
 	 * Sets the view object that will generate the admin output.
 	 *
 	 * @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
+	 * @return Base Reference to this object for fluent calls
 	 */
 	public function setView( \Aimeos\MW\View\Iface $view )
 	{

Spacing +78 added lines, -78 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', [
+		return (array) $view->config('admin/jsonadm/resources', [
 			'coupon/config', 'plugin/config', 'service/config',
 			'attribute/type', 'attribute/list/type', 'attribute/property/type',
 			'catalog/list/type',
@@ -305,7 +305,7 @@ 
 			'service/type', 'service/list/type',
 			'supplier/list/type',
 			'text/type', 'text/list/type',
-		] );
+		]);
 	}
 
 
@@ -316,11 +316,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;
 	}
@@ -332,17 +332,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));
 	}
 
 
@@ -352,12 +352,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);
 	}
 
 
@@ -367,24 +367,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);
 	}
 
 
@@ -395,14 +395,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);
 			}
 		}
 
@@ -417,22 +417,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());
 	}
 
 
@@ -443,28 +443,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);
 				}
 			}
 		}
@@ -481,14 +481,14 @@ 
 	 * @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());
 
-			$item->fromArray( $attr );
+			$item->fromArray($attr);
 		}
 
 		return $item;

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

Spacing +24 added lines, -24 removed lines

@@ -21,9 +21,9 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Plugin\Config\Standard( $this->context, 'plugin/config' );
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JsonAdm\Plugin\Config\Standard($this->context, 'plugin/config');
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
+		$this->object->setView($this->view);
 	}
 
 
@@ -32,26 +32,26 @@ 
 		$params = array(
 			'id' => 'Autofill,Log',
 		);
-		$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 );
-
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
-
-		$this->assertEquals( 8, $result['meta']['total'] );
-		$this->assertInternalType( 'array', $result['data'] );
-		$this->assertEquals( 'autofill.address', $result['data'][0]['id'] );
-		$this->assertEquals( 'autofill.delivery', $result['data'][1]['id'] );
-		$this->assertEquals( 'autofill.deliverycode', $result['data'][2]['id'] );
-		$this->assertEquals( 'autofill.payment', $result['data'][3]['id'] );
-		$this->assertEquals( 'autofill.paymentcode', $result['data'][4]['id'] );
-		$this->assertEquals( 'autofill.useorder', $result['data'][5]['id'] );
-		$this->assertEquals( 'autofill.orderaddress', $result['data'][6]['id'] );
-		$this->assertEquals( 'autofill.orderservice', $result['data'][7]['id'] );
-
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$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);
+
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
+
+		$this->assertEquals(8, $result['meta']['total']);
+		$this->assertInternalType('array', $result['data']);
+		$this->assertEquals('autofill.address', $result['data'][0]['id']);
+		$this->assertEquals('autofill.delivery', $result['data'][1]['id']);
+		$this->assertEquals('autofill.deliverycode', $result['data'][2]['id']);
+		$this->assertEquals('autofill.payment', $result['data'][3]['id']);
+		$this->assertEquals('autofill.paymentcode', $result['data'][4]['id']);
+		$this->assertEquals('autofill.useorder', $result['data'][5]['id']);
+		$this->assertEquals('autofill.orderaddress', $result['data'][6]['id']);
+		$this->assertEquals('autofill.orderservice', $result['data'][7]['id']);
+
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

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

Spacing +39 added lines, -39 removed lines

@@ -16,9 +16,9 @@ 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, 'order' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Order\\Standard', $client );
+		$client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, 'order');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Order\\Standard', $client);
 	}
 
 
@@ -27,9 +27,9 @@ 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, 'order/base' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Order\\Base\\Standard', $client );
+		$client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, 'order/base');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Order\\Base\\Standard', $client);
 	}
 
 
@@ -38,9 +38,9 @@ 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, 'stock/type' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Standard', $client );
+		$client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, 'stock/type');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Standard', $client);
 	}
 
 
@@ -49,9 +49,9 @@ 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, '' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Standard', $client );
+		$client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, '');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Standard', $client);
 	}
 
 
@@ -60,8 +60,8 @@ 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
-		\Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, '%^' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
+		\Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, '%^');
 	}
 
 
@@ -70,68 +70,68 @@ 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
-		\Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, '', '%^' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
+		\Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, '', '%^');
 	}
 
 
 	public function testClear()
 	{
-		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true );
+		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true);
 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$client1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, 'order' );
+		$client1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, 'order');
 		\Aimeos\Admin\JsonAdm\Factory::clear();
-		$client2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, 'order' );
+		$client2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, '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();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, 'order' );
-		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, 'order/base' );
-		\Aimeos\Admin\JsonAdm\Factory::clear( (string) $context );
+		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, 'order');
+		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, 'order/base');
+		\Aimeos\Admin\JsonAdm\Factory::clear((string) $context);
 
-		$cntlA2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, 'order' );
-		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, 'order/base' );
+		$cntlA2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, 'order');
+		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, '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();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, 'order' );
-		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, 'order/base' );
+		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, 'order');
+		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, '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, $aimeos, 'order' );
-		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, 'order/base' );
+		$cntlA2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, 'order');
+		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, '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