aimeos / ai-admin-jsonadm

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());
 	}
 }

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

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/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

admin/jsonadm/tests/Admin/JsonAdm/Attribute/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\Attribute\Standard( $this->context, 'attribute' );
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JsonAdm\Attribute\Standard($this->context, 'attribute');
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
+		$this->object->setView($this->view);
 	}
 
 
@@ -31,26 +31,26 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'attribute.code' => 's' )
+				'==' => array('attribute.code' => 's')
 			),
 			'include' => 'text'
 		);
-		$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( 'attribute', $result['data'][0]['type'] );
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['text'] ) );
-		$this->assertEquals( 1, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('attribute', $result['data'][0]['type']);
+		$this->assertEquals(1, count($result['data'][0]['relationships']['text']));
+		$this->assertEquals(1, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

admin/jsonadm/tests/Admin/JsonAdm/Text/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\Text\Standard( $this->context, 'text' );
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JsonAdm\Text\Standard($this->context, 'text');
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
+		$this->object->setView($this->view);
 	}
 
 
@@ -31,26 +31,26 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'text.label' => 'misc_long_desc' )
+				'==' => array('text.label' => 'misc_long_desc')
 			),
 			'include' => 'media'
 		);
-		$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( 'text', $result['data'][0]['type'] );
-		$this->assertEquals( 4, count( $result['data'][0]['relationships']['media'] ) );
-		$this->assertEquals( 4, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('text', $result['data'][0]['type']);
+		$this->assertEquals(4, count($result['data'][0]['relationships']['media']));
+		$this->assertEquals(4, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

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

Spacing +14 added lines, -14 removed lines

@@ -21,9 +21,9 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Coupon\Config\Standard( $this->context, 'coupon/config' );
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JsonAdm\Coupon\Config\Standard($this->context, 'coupon/config');
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
+		$this->object->setView($this->view);
 	}
 
 
@@ -32,20 +32,20 @@ 
 		$params = array(
 			'id' => 'Example,Required,BasketValues',
 		);
-		$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( 2, $result['meta']['total'] );
-		$this->assertInternalType( 'array', $result['data'] );
-		$this->assertEquals( 'basketvalues.total-value-min', $result['data'][0]['id'] );
-		$this->assertEquals( 'basketvalues.total-value-max', $result['data'][1]['id'] );
+		$this->assertEquals(2, $result['meta']['total']);
+		$this->assertInternalType('array', $result['data']);
+		$this->assertEquals('basketvalues.total-value-min', $result['data'][0]['id']);
+		$this->assertEquals('basketvalues.total-value-max', $result['data'][1]['id']);
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

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

Spacing +14 added lines, -14 removed lines

@@ -21,9 +21,9 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Service\Config\Standard( $this->context, 'service/config' );
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JsonAdm\Service\Config\Standard($this->context, 'service/config');
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
+		$this->object->setView($this->view);
 	}
 
 
@@ -33,20 +33,20 @@ 
 			'id' => 'DirectDebit,Category',
 			'type' => 'payment',
 		);
-		$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( 2, $result['meta']['total'] );
-		$this->assertInternalType( 'array', $result['data'] );
-		$this->assertEquals( 'category.include', $result['data'][0]['id'] );
-		$this->assertEquals( 'category.exclude', $result['data'][1]['id'] );
+		$this->assertEquals(2, $result['meta']['total']);
+		$this->assertInternalType('array', $result['data']);
+		$this->assertEquals('category.include', $result['data'][0]['id']);
+		$this->assertEquals('category.exclude', $result['data'][1]['id']);
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file