aimeos / ai-admin-jsonadm

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 createClientBase( $classname, $interface, \Aimeos\MShop\Context\Item\Iface $context, $path )
+	protected static function createClientBase($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/tests/Admin/JsonAdm/Common/Factory/BaseTest.php

Spacing +26 added lines, -26 removed lines

@@ -21,29 +21,29 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->client = new \Aimeos\Admin\JsonAdm\Product\Standard( $this->context, $this->view, [], '' );
+		$this->client = new \Aimeos\Admin\JsonAdm\Product\Standard($this->context, $this->view, [], '');
 
-		$this->object = $this->getMockBuilder( '\Aimeos\Admin\JsonAdm\Common\Factory\Base' )
+		$this->object = $this->getMockBuilder('\Aimeos\Admin\JsonAdm\Common\Factory\Base')
 			->getMockForAbstractClass();
 	}
 
 
 	public function testinjectClient()
 	{
-		$this->object->injectClient( 'test', $this->client );
+		$this->object->injectClient('test', $this->client);
 	}
 
 
 	public function testAddClientDecorators()
 	{
 		$config = $this->context->getConfig();
-		$config->set( 'client/jsonapi/common/decorators/default', ['Test'] );
-		$config->set( 'client/jsonapi/product/decorators/excludes', ['Test'] );
+		$config->set('client/jsonapi/common/decorators/default', ['Test']);
+		$config->set('client/jsonapi/product/decorators/excludes', ['Test']);
 
 		$params = [$this->client, $this->context, $this->view, [], 'product'];
-		$result = $this->access( 'addClientDecorators' )->invokeArgs( $this->object, $params );
+		$result = $this->access('addClientDecorators')->invokeArgs($this->object, $params);
 
-		$this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result);
 	}
 
 
@@ -52,9 +52,9 @@ 
 		$prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
 		$params = [$this->client, ['Example'], $prefix, $this->context, $this->view, [], ''];
 
-		$result = $this->access( 'addDecorators' )->invokeArgs( $this->object, $params );
+		$result = $this->access('addDecorators')->invokeArgs($this->object, $params);
 
-		$this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result);
 	}
 
 
@@ -63,8 +63,8 @@ 
 		$prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
 		$params = [$this->client, ['Test'], $prefix, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( '\Aimeos\Admin\JsonAdm\Exception' );
-		$this->access( 'addDecorators' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException('\Aimeos\Admin\JsonAdm\Exception');
+		$this->access('addDecorators')->invokeArgs($this->object, $params);
 	}
 
 
@@ -73,8 +73,8 @@ 
 		$prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
 		$params = [$this->client, [''], $prefix, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( '\Aimeos\Admin\JsonAdm\Exception' );
-		$this->access( 'addDecorators' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException('\Aimeos\Admin\JsonAdm\Exception');
+		$this->access('addDecorators')->invokeArgs($this->object, $params);
 	}
 
 
@@ -84,9 +84,9 @@ 
 		$class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard';
 		$params = [$class, $iface, $this->context, $this->view, [], ''];
 
-		$result = $this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$result = $this->access('createClientBase')->invokeArgs($this->object, $params);
 
-		$this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result);
 	}
 
 
@@ -95,10 +95,10 @@ 
 		$iface = '\Aimeos\\Admin\\JsonAdm\\Iface';
 		$params = ['test', $iface, $this->context, $this->view, [], ''];
 
-		$this->object->injectClient( 'test', $this->client );
-		$result = $this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$this->object->injectClient('test', $this->client);
+		$result = $this->access('createClientBase')->invokeArgs($this->object, $params);
 
-		$this->assertSame( $this->client, $result );
+		$this->assertSame($this->client, $result);
 	}
 
 
@@ -107,8 +107,8 @@ 
 		$iface = '\Aimeos\\Admin\\JsonAdm\\Iface';
 		$params = ['invalid', $iface, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( '\Aimeos\Admin\JsonAdm\Exception' );
-		$this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException('\Aimeos\Admin\JsonAdm\Exception');
+		$this->access('createClientBase')->invokeArgs($this->object, $params);
 	}
 
 
@@ -118,16 +118,16 @@ 
 		$class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard';
 		$params = [$class, $iface, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( '\Aimeos\MW\Common\Exception' );
-		$this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException('\Aimeos\MW\Common\Exception');
+		$this->access('createClientBase')->invokeArgs($this->object, $params);
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( '\Aimeos\Admin\JsonAdm\Common\Factory\Base' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Admin\JsonAdm\Common\Factory\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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.code',
 			'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'][0]['type'] );
-		$this->assertEquals( 3, count( $result['data'][0]['attributes'] ) );
-		$this->assertEquals( 5, count( $result['data'][8]['relationships']['product'] ) );
-		$this->assertEquals( 21, count( $result['included'] ) );
+		$this->assertEquals(28, $result['meta']['total']);
+		$this->assertEquals(25, count($result['data']));
+		$this->assertEquals('product', $result['data'][0]['type']);
+		$this->assertEquals(3, count($result['data'][0]['attributes']));
+		$this->assertEquals(5, count($result['data'][8]['relationships']['product']));
+		$this->assertEquals(21, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

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