aimeos / ai-admin-jsonadm

admin/jsonadm/templates/delete-default.php

Spacing +3 added lines, -3 removed lines

@@ -11,13 +11,13 @@
 ?>
 {
 	"meta": {
-		"total": <?= $this->get( 'total', 0 ); ?>
+		"total": <?= $this->get('total', 0); ?>
 
 	}
 
-	<?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/templates/get-default.php

Spacing +31 added lines, -31 removed lines

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

admin/jsonadm/templates/patch-default.php

Spacing +5 added lines, -5 removed lines

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

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

Spacing +35 added lines, -35 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,8 +38,8 @@ 
 		$context = \TestHelperJadm::getContext();
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
 
-		$client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, '' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
+		$client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, '');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
 	}
 
 
@@ -48,8 +48,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, '%^');
 	}
 
 
@@ -58,68 +58,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 +26 added lines, -26 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,26 +104,26 @@ 
 	 * @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 ) )
+		if (!empty($path))
 		{
-			$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);
 			}
 
-			$name = ( $name ?: $context->getConfig()->get( 'admin/jsonadm/' . $path . '/name', 'Standard' ) );
-			$classname = '\\Aimeos\\Admin\\JsonAdm\\' . join( '\\', $parts ) . '\\' . $name;
+			$name = ($name ?: $context->getConfig()->get('admin/jsonadm/' . $path . '/name', 'Standard'));
+			$classname = '\\Aimeos\\Admin\\JsonAdm\\' . join('\\', $parts) . '\\' . $name;
 		}
 		else
 		{
@@ -161,21 +161,21 @@ 
 			 * @category Developer
 			 */
 
-			$name = ( $name ?: $context->getConfig()->get( 'admin/jsonadm/name', 'Standard' ) );
+			$name = ($name ?: $context->getConfig()->get('admin/jsonadm/name', 'Standard'));
 			$classname = '\\Aimeos\\Admin\\JsonAdm\\' . $name;
 		}
 
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? $classname : '<not a string>';
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? $classname : '<not a string>';
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname));
 		}
 
 		$view = $context->getView();
 		$iface = '\\Aimeos\\Admin\\JsonAdm\\Iface';
 
-		$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
@@ -255,6 +255,6 @@ 
 		 * @see admin/jsonadm/decorators/global
 		 */
 
-		return self::addClientDecorators( $client, $context, $view, $templatePaths, $path );
+		return self::addClientDecorators($client, $context, $view, $templatePaths, $path);
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -124,8 +124,7 @@
 
 			$name = ( $name ?: $context->getConfig()->get( 'admin/jsonadm/' . $path . '/name', 'Standard' ) );
 			$classname = '\\Aimeos\\Admin\\JsonAdm\\' . join( '\\', $parts ) . '\\' . $name;
-		}
-		else
+		} else
 		{
 			/** admin/jsonadm/name
 			 * Class name of the used JSON API client implementation