aimeos / ai-admin-jsonadm

admin/jsonadm/templates/partials/locale/site/data-standard.php

Spacing +23 added lines, -23 removed lines

@@ -9,32 +9,32 @@ 
 
 
 $options = 0;
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
+if (defined('JSON_PRETTY_PRINT')) {
 	$options = JSON_PRETTY_PRINT;
 }
 
 
-$fields = $this->param( 'fields', [] );
+$fields = $this->param('fields', []);
 
-foreach( (array) $fields as $resource => $list ) {
-	$fields[$resource] = array_flip( explode( ',', $list ) );
+foreach ((array) $fields as $resource => $list) {
+	$fields[$resource] = array_flip(explode(',', $list));
 }
 
 
-$build = function( \Aimeos\MShop\Locale\Item\Site\Iface $item ) use ( $fields )
+$build = function(\Aimeos\MShop\Locale\Item\Site\Iface $item) use ($fields)
 {
 	$id = $item->getId();
 	$type = $item->getResourceType();
-	$params = array( 'resource' => $type, 'id' => $id );
-	$attributes = $item->toArray( true );
+	$params = array('resource' => $type, 'id' => $id);
+	$attributes = $item->toArray(true);
 
-	$target = $this->config( 'admin/jsonadm/url/target' );
-	$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' );
-	$action = $this->config( 'admin/jsonadm/url/action', 'get' );
-	$config = $this->config( 'admin/jsonadm/url/config', [] );
+	$target = $this->config('admin/jsonadm/url/target');
+	$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm');
+	$action = $this->config('admin/jsonadm/url/action', 'get');
+	$config = $this->config('admin/jsonadm/url/config', []);
 
-	if( isset( $fields[$type] ) ) {
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
+	if (isset($fields[$type])) {
+		$attributes = array_intersect_key($attributes, $fields[$type]);
 	}
 
 	$result = array(
@@ -42,34 +42,34 @@ 
 		'type' => $type,
 		'attributes' => $attributes,
 		'links' => array(
-			'self' => $this->url( $target, $cntl, $action, $params, [], $config )
+			'self' => $this->url($target, $cntl, $action, $params, [], $config)
 		),
 		'relationships' => []
 	);
 
-	foreach( $item->getChildren() as $childItem )
+	foreach ($item->getChildren() as $childItem)
 	{
 		$type = $childItem->getResourceType();
-		$result['relationships'][$type][] = array( 'data' => array( 'id' => $childItem->getId(), 'type' => $type ) );
+		$result['relationships'][$type][] = array('data' => array('id' => $childItem->getId(), 'type' => $type));
 	}
 
 	return $result;
 };
 
 
-$data = $this->get( 'data', [] );
+$data = $this->get('data', []);
 
-if( is_array( $data ) )
+if (is_array($data))
 {
 	$response = [];
 
-	foreach( $data as $item ) {
-		$response[] = $build( $item );
+	foreach ($data as $item) {
+		$response[] = $build($item);
 	}
 }
-elseif( $data !== null )
+elseif ($data !== null)
 {
-	$response = $build( $data );
+	$response = $build($data);
 }
 else
 {
@@ -77,4 +77,4 @@ 
 }
 
 
-echo json_encode( $response, $options );
\ No newline at end of file
+echo json_encode($response, $options);
\ No newline at end of file

Braces +2 added lines, -4 removed lines

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

admin/jsonadm/templates/put-default.php

Spacing +2 added lines, -2 removed lines

@@ -10,9 +10,9 @@
 
 ?>
 {
-	<?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 endif; ?>
 

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

Spacing +39 added lines, -39 removed lines

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

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

Spacing +38 added lines, -38 removed lines

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

admin/jsonadm/templates/options-default.php

Spacing +15 added lines, -15 removed lines

@@ -8,32 +8,32 @@ 
  */
 
 
-$target = $this->config( 'admin/jsonadm/url/target' );
-$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' );
-$action = $this->config( 'admin/jsonadm/url/action', 'get' );
-$config = $this->config( 'admin/jsonadm/url/config', [] );
+$target = $this->config('admin/jsonadm/url/target');
+$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm');
+$action = $this->config('admin/jsonadm/url/action', 'get');
+$config = $this->config('admin/jsonadm/url/config', []);
 
 
 $resources = $attributes = [];
-$site = $this->param( 'site', 'default' );
+$site = $this->param('site', 'default');
 
-foreach( $this->get( 'resources', [] ) as $resource ) {
-	$resources[$resource] = $this->url( $target, $cntl, $action, ['site' => $site, 'resource' => $resource], [], $config );
+foreach ($this->get('resources', []) as $resource) {
+	$resources[$resource] = $this->url($target, $cntl, $action, ['site' => $site, 'resource' => $resource], [], $config);
 }
 
-foreach( $this->get( 'attributes', [] ) as $attr ) {
-	$attributes[$attr->getCode()] = $attr->toArray( true );
+foreach ($this->get('attributes', []) as $attr) {
+	$attributes[$attr->getCode()] = $attr->toArray(true);
 }
 
 
 ?>
 {
 	"meta": {
-		"prefix": <?= json_encode( $this->get( 'prefix' ) ); ?>,
-		"resources": <?= json_encode( $resources ); ?>,
-		"attributes": <?= json_encode( $attributes ); ?>
+		"prefix": <?= json_encode($this->get('prefix')); ?>,
+		"resources": <?= json_encode($resources); ?>,
+		"attributes": <?= json_encode($attributes); ?>
 
-		<?php if( $this->csrf()->name() != '' ) : ?>
+		<?php if ($this->csrf()->name() != '') : ?>
 			, "csrf": {
 				"name": "<?= $this->csrf()->name(); ?>",
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -41,9 +41,9 @@ 
 		<?php endif; ?>
 	}
 
-	<?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 endif; ?>
 

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

Spacing +75 added lines, -75 removed lines

@@ -22,7 +22,7 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Locale\Site\Standard( $this->context, $this->view, $templatePaths, 'locale/site' );
+		$this->object = new \Aimeos\Admin\JsonAdm\Locale\Site\Standard($this->context, $this->view, $templatePaths, 'locale/site');
 	}
 
 
@@ -30,153 +30,153 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'locale.site.code' => 'unittest' )
+				'==' => array('locale.site.code' => 'unittest')
 			),
 		);
-		$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( 'locale/site', $result['data'][0]['type'] );
-		$this->assertEquals( 0, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('locale/site', $result['data'][0]['type']);
+		$this->assertEquals(0, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testGetTree()
 	{
 		$params = array(
-			'id' => $this->getSiteItem( 'unittest' )->getId(),
+			'id' => $this->getSiteItem('unittest')->getId(),
 			'filter' => array(
-				'==' => array( 'locale.status' => 0 )
+				'==' => array('locale.status' => 0)
 			),
 			'include' => 'locale/site'
 		);
-		$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( 'locale/site', $result['data']['type'] );
-		$this->assertEquals( 0, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals('locale/site', $result['data']['type']);
+		$this->assertEquals(0, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testPatch()
 	{
-		$stub = $this->getSiteMock( array( 'getItem', 'moveItem', 'saveItem' ) );
+		$stub = $this->getSiteMock(array('getItem', 'moveItem', 'saveItem'));
 		$item = $stub->createItem();
 
-		$stub->expects( $this->once() )->method( 'moveItem' );
-		$stub->expects( $this->once() )->method( 'saveItem' )
-			->will( $this->returnValue( $stub->createItem() ) );
-		$stub->expects( $this->exactly( 2 ) )->method( 'getItem' ) // 2x due to decorator
-			->will( $this->returnValue( $item ) );
+		$stub->expects($this->once())->method('moveItem');
+		$stub->expects($this->once())->method('saveItem')
+			->will($this->returnValue($stub->createItem()));
+		$stub->expects($this->exactly(2))->method('getItem') // 2x due to decorator
+			->will($this->returnValue($item));
 
 
-		$params = array( 'id' => '-1' );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$params = array('id' => '-1');
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
 		$body = '{"data": {"parentid": "1", "targetid": 2, "type": "locale/site", "attributes": {"locale.site.label": "test"}}}';
-		$request = $this->view->request()->withBody( $this->view->response()->createStreamFromString( $body ) );
+		$request = $this->view->request()->withBody($this->view->response()->createStreamFromString($body));
 
-		$response = $this->object->patch( $request, $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->patch($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->assertArrayHasKey( 'data', $result );
-		$this->assertEquals( 'locale/site', $result['data']['type'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertArrayHasKey('data', $result);
+		$this->assertEquals('locale/site', $result['data']['type']);
 
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testPost()
 	{
-		$stub = $this->getSiteMock( array( 'getItem', 'insertItem' ) );
+		$stub = $this->getSiteMock(array('getItem', 'insertItem'));
 		$item = $stub->createItem();
 
-		$stub->expects( $this->any() )->method( 'getItem' )
-			->will( $this->returnValue( $item ) );
-		$stub->expects( $this->once() )->method( 'insertItem' );
+		$stub->expects($this->any())->method('getItem')
+			->will($this->returnValue($item));
+		$stub->expects($this->once())->method('insertItem');
 
 
 		$body = '{"data": {"type": "locale/site", "attributes": {"locale.site.code": "unittest", "locale.site.label": "Unit test"}}}';
-		$request = $this->view->request()->withBody( $this->view->response()->createStreamFromString( $body ) );
+		$request = $this->view->request()->withBody($this->view->response()->createStreamFromString($body));
 
-		$response = $this->object->post( $request, $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->post($request, $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 201, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(201, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'data', $result );
-		$this->assertEquals( 'locale/site', $result['data']['type'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertArrayHasKey('data', $result);
+		$this->assertEquals('locale/site', $result['data']['type']);
 
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
-	protected function getSiteItem( $code )
+	protected function getSiteItem($code)
 	{
-		$manager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $this->context )->getSubManager( 'site' );
+		$manager = \Aimeos\MShop\Locale\Manager\Factory::createManager($this->context)->getSubManager('site');
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'locale.site.code', $code ) );
-		$items = $manager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'locale.site.code', $code));
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'No locale site item with code "%1$s" found', $code ) );
+		if (($item = reset($items)) === false) {
+			throw new \RuntimeException(sprintf('No locale site item with code "%1$s" found', $code));
 		}
 
 		return $item;
 	}
 
 
-	protected function getSiteMock( array $methods )
+	protected function getSiteMock(array $methods)
 	{
 		$name = 'ClientJsonAdmStandard';
-		$this->context->getConfig()->set( 'mshop/locale/manager/name', $name );
+		$this->context->getConfig()->set('mshop/locale/manager/name', $name);
 
-		$stub = $this->getMockBuilder( '\\Aimeos\\MShop\\Locale\\Manager\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( array( 'getSubManager' ) )
+		$stub = $this->getMockBuilder('\\Aimeos\\MShop\\Locale\\Manager\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(array('getSubManager'))
 			->getMock();
 
-		$siteStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Locale\\Manager\\Site\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( $methods )
+		$siteStub = $this->getMockBuilder('\\Aimeos\\MShop\\Locale\\Manager\\Site\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods($methods)
 			->getMock();
 
-		$stub->expects( $this->once() )->method( 'getSubManager' )
-			->will( $this->returnValue( $siteStub ) );
+		$stub->expects($this->once())->method('getSubManager')
+			->will($this->returnValue($siteStub));
 
-		\Aimeos\MShop\Locale\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Locale\\Manager\\' . $name, $stub );
+		\Aimeos\MShop\Locale\Manager\Factory::injectManager('\\Aimeos\\MShop\\Locale\\Manager\\' . $name, $stub);
 
 		return $siteStub;
 	}

admin/jsonadm/templates/coupon/config/get-default.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; ?>
 }

Braces +5 added lines, -2 removed lines

@@ -59,9 +59,12 @@
 
 		, "errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
 
-	<?php else : ?>
+	<?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/Coupon/Config/StandardTest.php

Spacing +12 added lines, -12 removed lines

@@ -22,7 +22,7 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Coupon\Config\Standard( $this->context, $this->view, $templatePaths, 'coupon/config' );
+		$this->object = new \Aimeos\Admin\JsonAdm\Coupon\Config\Standard($this->context, $this->view, $templatePaths, 'coupon/config');
 	}
 
 
@@ -31,20 +31,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/src/Admin/JsonAdm/Coupon/Config/Standard.php

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/coupon/config/template-get
@@ -158,11 +158,11 @@ 
 		$tplconf = 'admin/jsonadm/coupon/config/template-get';
 		$default = 'coupon/config/get-default.php';
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 
 
@@ -174,18 +174,18 @@ 
 	 * @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(), 'coupon' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
 
 		$item = $manager->createItem();
-		$item->setProvider( $id );
+		$item->setProvider($id);
 
-		$view->configItems = $manager->getProvider( $item, null )->getConfigBE();
+		$view->configItems = $manager->getProvider($item, null)->getConfigBE();
 
 		return $response;
 	}

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(