aimeos / ai-admin-jsonadm

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

Spacing +1 added lines, -1 removed lines

@@ -28,5 +28,5 @@
 	 * @param string|null $name Name of the client implementation ("Standard" if null)
 	 * @return \Aimeos\Admin\JsonAdm\Iface Client Interface
 	 */
-	public static function create( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $path, $name = null );
+	public static function create(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $path, $name = null);
 }
\ No newline at end of file

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

Spacing +35 added lines, -35 removed lines

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

admin/jsonadm/src/Admin/JsonAdm.php

Spacing +42 added lines, -42 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param boolean $value True to enable caching, false to disable it.
 	 * @return boolean Previous cache setting
 	 */
-	static public function cache( $value )
+	static public function cache($value)
 	{
 		$old = self::$cache;
 		self::$cache = (boolean) $value;
@@ -46,11 +46,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] = [];
@@ -78,18 +78,18 @@ 
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid
 	 */
-	static public function create( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Bootstrap $aimeos, $path, $name = null )
+	static public function create(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Bootstrap $aimeos, $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] ) )
+		if (self::$cache === false || !isset(self::$clients[$id][$path]))
 		{
-			if( empty( $path ) ) {
-				self::$clients[$id][$path] = self::createRoot( $context, $aimeos, $path, $name );
+			if (empty($path)) {
+				self::$clients[$id][$path] = self::createRoot($context, $aimeos, $path, $name);
 			} else {
-				self::$clients[$id][$path] = self::createNew( $context, $aimeos, $path, $name );
+				self::$clients[$id][$path] = self::createNew($context, $aimeos, $path, $name);
 			}
 		}
 
@@ -107,53 +107,53 @@ 
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid
 	 */
-	protected static function createNew( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Bootstrap $aimeos, $path, $name )
+	protected static function createNew(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Bootstrap $aimeos, $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();
 		$config = $context->getConfig();
 
-		if( $view->access( $config->get( 'admin/jsonadm/resource/' . $path . '/groups', [] ) ) !== true ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Not allowed to access JsonAdm "%1$s" client', $path ) );
+		if ($view->access($config->get('admin/jsonadm/resource/' . $path . '/groups', [])) !== true) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Not allowed to access JsonAdm "%1$s" client', $path));
 		}
 
 
 		$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::createRoot( $context, $aimeos, $path, $name );
+		if (class_exists($classname) === false) {
+			return self::createRoot($context, $aimeos, $path, $name);
 		}
 
-		$client = self::createAdmin( $classname, $iface, $context, $path );
-		$client = self::addClientDecorators( $client, $context, $path );
+		$client = self::createAdmin($classname, $iface, $context, $path);
+		$client = self::addClientDecorators($client, $context, $path);
 
-		return $client->setAimeos( $aimeos )->setView( $view );
+		return $client->setAimeos($aimeos)->setView($view);
 	}
 
 
@@ -167,8 +167,8 @@ 
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the client couldn't be created
 	 */
-	protected static function createRoot( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Bootstrap $aimeos, $path, $name = null )
+	protected static function createRoot(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Bootstrap $aimeos, $path, $name = null)
 	{
 		/** admin/jsonadm/name
 		 * Class name of the used JSON API client implementation
@@ -203,21 +203,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::createAdmin( $classname, $iface, $context, $path );
+		$client = self::createAdmin($classname, $iface, $context, $path);
 
 		/** admin/jsonadm/decorators/excludes
 		 * Excludes decorators added by the "common" option from the JSON API clients
@@ -297,8 +297,8 @@ 
 		 * @see admin/jsonadm/decorators/global
 		 */
 
-		$client = self::addClientDecorators( $client, $context, $path );
+		$client = self::addClientDecorators($client, $context, $path);
 
-		return $client->setAimeos( $aimeos )->setView( $view );
+		return $client->setAimeos($aimeos)->setView($view);
 	}
 }

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

Spacing +40 added lines, -40 removed lines

@@ -21,9 +21,9 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Product\Standard( $this->context, 'product' );
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JsonAdm\Product\Standard($this->context, 'product');
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
+		$this->object->setView($this->view);
 	}
 
 
@@ -31,33 +31,33 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'product.code' => 'CNE' )
+				'==' => array('product.code' => 'CNE')
 			),
 			'include' => 'text,product,product/property'
 		);
-		$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( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'product', $result['data'][0]['type'] );
-		$this->assertEquals( 7, count( $result['data'][0]['relationships']['text'] ) );
-		$this->assertArrayHaskey( 'self', $result['data'][0]['relationships']['text'][0]['data']['links'] );
-		$this->assertEquals( 5, count( $result['data'][0]['relationships']['product'] ) );
-		$this->assertArrayHaskey( 'self', $result['data'][0]['relationships']['product'][0]['data']['links'] );
-		$this->assertEquals( 4, count( $result['data'][0]['relationships']['product/property'] ) );
-		$this->assertEquals( 15, count( $result['included'] ) );
-		$this->assertEquals( 'product/property', $result['included'][0]['type'] );
-		$this->assertArrayHaskey( 'self', $result['included'][0]['links'] );
-		$this->assertArrayHaskey( 'related', $result['included'][0]['links'] );
-
-		$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(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('product', $result['data'][0]['type']);
+		$this->assertEquals(7, count($result['data'][0]['relationships']['text']));
+		$this->assertArrayHaskey('self', $result['data'][0]['relationships']['text'][0]['data']['links']);
+		$this->assertEquals(5, count($result['data'][0]['relationships']['product']));
+		$this->assertArrayHaskey('self', $result['data'][0]['relationships']['product'][0]['data']['links']);
+		$this->assertEquals(4, count($result['data'][0]['relationships']['product/property']));
+		$this->assertEquals(15, count($result['included']));
+		$this->assertEquals('product/property', $result['included'][0]['type']);
+		$this->assertArrayHaskey('self', $result['included'][0]['links']);
+		$this->assertArrayHaskey('related', $result['included'][0]['links']);
+
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -70,22 +70,22 @@ 
 			'sort' => 'product.label',
 			'include' => 'product,product/property'
 		);
-		$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( 28, $result['meta']['total'] );
-		$this->assertEquals( 25, count( $result['data'] ) );
-		$this->assertEquals( 'product', $result['data'][5]['type'] );
-		$this->assertEquals( 3, count( $result['data'][5]['attributes'] ) );
-		$this->assertEquals( 4, count( $result['data'][5]['relationships']['product/property'] ) );
-		$this->assertGreaterThanOrEqual( 20, count( $result['included'] ) );
+		$this->assertEquals(28, $result['meta']['total']);
+		$this->assertEquals(25, count($result['data']));
+		$this->assertEquals('product', $result['data'][5]['type']);
+		$this->assertEquals(3, count($result['data'][5]['attributes']));
+		$this->assertEquals(4, count($result['data'][5]['relationships']['product/property']));
+		$this->assertGreaterThanOrEqual(20, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file