aimeos / aimeos-symfony

Controller/JsonapiController.php

Spacing +19 added lines, -19 removed lines

@@ -30,9 +30,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function deleteAction( ServerRequestInterface $request, $resource )
+	public function deleteAction(ServerRequestInterface $request, $resource)
 	{
-		return $this->createClient( $request, $resource )->delete( $request, new Response() );
+		return $this->createClient($request, $resource)->delete($request, new Response());
 	}
 
 
@@ -43,9 +43,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function getAction( ServerRequestInterface $request, $resource )
+	public function getAction(ServerRequestInterface $request, $resource)
 	{
-		return $this->createClient( $request, $resource )->get( $request, new Response() );
+		return $this->createClient($request, $resource)->get($request, new Response());
 	}
 
 
@@ -56,9 +56,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function patchAction( ServerRequestInterface $request, $resource )
+	public function patchAction(ServerRequestInterface $request, $resource)
 	{
-		return $this->createClient( $request, $resource )->patch( $request, new Response() );
+		return $this->createClient($request, $resource)->patch($request, new Response());
 	}
 
 
@@ -69,9 +69,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function postAction( ServerRequestInterface $request, $resource )
+	public function postAction(ServerRequestInterface $request, $resource)
 	{
-		return $this->createClient( $request, $resource )->post( $request, new Response() );
+		return $this->createClient($request, $resource)->post($request, new Response());
 	}
 
 
@@ -82,9 +82,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function putAction( ServerRequestInterface $request, $resource )
+	public function putAction(ServerRequestInterface $request, $resource)
 	{
-		return $this->createClient( $request, $resource )->put( $request, new Response() );
+		return $this->createClient($request, $resource)->put($request, new Response());
 	}
 
 
@@ -95,9 +95,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function optionsAction( ServerRequestInterface $request, $resource = '' )
+	public function optionsAction(ServerRequestInterface $request, $resource = '')
 	{
-		return $this->createClient( $request, $resource )->options( $request, new Response() );
+		return $this->createClient($request, $resource)->options($request, new Response());
 	}
 
 
@@ -108,19 +108,19 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Aimeos\Client\JsonApi\Iface JSON API client
 	 */
-	protected function createClient( ServerRequestInterface $request, $resource )
+	protected function createClient(ServerRequestInterface $request, $resource)
 	{
 		$args = $request->getAttributes();
 		$params = $request->getQueryParams();
-		$related = ( isset( $args['related'] ) ? $args['related'] : ( isset( $params['related'] ) ? $params['related'] : null ) );
+		$related = (isset($args['related']) ? $args['related'] : (isset($params['related']) ? $params['related'] : null));
 
-		$tmplPaths = $this->container->get( 'aimeos' )->get()->getCustomPaths( 'client/jsonapi/templates' );
-		$context = $this->container->get( 'aimeos_context' )->get();
+		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/jsonapi/templates');
+		$context = $this->container->get('aimeos_context')->get();
 		$langid = $context->getLocale()->getLanguageId();
 
-		$view = $this->container->get( 'aimeos_view' )->create( $context, $tmplPaths, $langid );
-		$context->setView( $view );
+		$view = $this->container->get('aimeos_view')->create($context, $tmplPaths, $langid);
+		$context->setView($view);
 
-		return \Aimeos\Client\JsonApi\Factory::createClient( $context, $tmplPaths, $resource . '/' . $related );
+		return \Aimeos\Client\JsonApi\Factory::createClient($context, $tmplPaths, $resource.'/'.$related);
 	}
 }

Controller/AdminController.php

Doc Comments +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 	 * Returns the initial HTML view for the admin interface.
 	 *
 	 * @param Request $request Symfony request object
-	 * @return Response Generated HTML page for the admin interface
+	 * @return \Symfony\Component\HttpFoundation\Response Generated HTML page for the admin interface
 	 */
 	public function indexAction( Request $request )
 	{
@@ -58,7 +58,7 @@ 
 	/**
 	 * Checks if the used is authenticated and has the admin role
 	 *
-	 * @param array $roles List of role names where at least one must match
+	 * @param string[] $roles List of role names where at least one must match
 	 * @return boolean True if authenticated and is admin, false if not
 	 */
 	protected function hasRole( array $roles )

Spacing +16 added lines, -16 removed lines

@@ -28,30 +28,30 @@ 
 	 * @param Request $request Symfony request object
 	 * @return Response Generated HTML page for the admin interface
 	 */
-	public function indexAction( Request $request )
+	public function indexAction(Request $request)
 	{
-		if( $this->hasRole( ['ROLE_ADMIN'] ) )
+		if ($this->hasRole(['ROLE_ADMIN']))
 		{
-			$context = $this->get( 'aimeos_context' )->get( false );
-			$siteManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
-			$siteItem = $siteManager->getItem( $this->getUser()->getSiteId() );
+			$context = $this->get('aimeos_context')->get(false);
+			$siteManager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
+			$siteItem = $siteManager->getItem($this->getUser()->getSiteId());
 
-			$params = array( 'site' => $siteItem->getCode(), 'resource' => 'dashboard' );
-			return $this->redirect( $this->generateUrl( 'aimeos_shop_jqadm_search', $params ) );
+			$params = array('site' => $siteItem->getCode(), 'resource' => 'dashboard');
+			return $this->redirect($this->generateUrl('aimeos_shop_jqadm_search', $params));
 		}
 
 
-		$param = array( 'error' => '', 'username' => '' );
+		$param = array('error' => '', 'username' => '');
 
-		if( $this->has( 'security.authentication_utils' ) )
+		if ($this->has('security.authentication_utils'))
 		{
-			$auth = $this->get( 'security.authentication_utils' );
+			$auth = $this->get('security.authentication_utils');
 
 			$param['error'] = $auth->getLastAuthenticationError();
 			$param['username'] = $auth->getLastUsername();
 		}
 
-		return $this->render( 'AimeosShopBundle:Admin:index.html.twig', $param );
+		return $this->render('AimeosShopBundle:Admin:index.html.twig', $param);
 	}
 
 
@@ -61,15 +61,15 @@ 
 	 * @param array $roles List of role names where at least one must match
 	 * @return boolean True if authenticated and is admin, false if not
 	 */
-	protected function hasRole( array $roles )
+	protected function hasRole(array $roles)
 	{
-		if( $this->has( 'security.authorization_checker' ) && $this->get( 'security.token_storage' )->getToken() )
+		if ($this->has('security.authorization_checker') && $this->get('security.token_storage')->getToken())
 		{
-			$checker = $this->get( 'security.authorization_checker' );
+			$checker = $this->get('security.authorization_checker');
 
-			foreach( $roles as $role )
+			foreach ($roles as $role)
 			{
-				if( $checker->isGranted( $role ) ) {
+				if ($checker->isGranted($role)) {
 					return true;
 				}
 			}

Tests/Controller/AdminControllerTest.php

Spacing +3 added lines, -3 removed lines

@@ -11,10 +11,10 @@
 	{
 		$client = static::createClient();
 
-		$client->request( 'GET', '/admin' );
+		$client->request('GET', '/admin');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( '<form class="login"', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<form class="login"', $response->getContent());
 	}
 }

Composer/ScriptHandler.php

Spacing +61 added lines, -61 removed lines

@@ -28,18 +28,18 @@ 
 	 * @param Event $event Event instance
 	 * @throws \RuntimeException If an error occured
 	 */
-	public static function setupDatabase( Event $event )
+	public static function setupDatabase(Event $event)
 	{
 		$options = $env = array();
 
-		if( $event->isDevMode() ) {
+		if ($event->isDevMode()) {
 			$options[] = '--option=setup/default/demo:1';
 		} else {
 			$env[] = '--env=prod';
 		}
 
-		self::executeCommand( $event, 'aimeos:setup', $options + $env );
-		self::executeCommand( $event, 'aimeos:cache', $env );
+		self::executeCommand($event, 'aimeos:setup', $options + $env);
+		self::executeCommand($event, 'aimeos:cache', $env);
 	}
 
 
@@ -49,20 +49,20 @@ 
 	 * @param Event $event Event instance
 	 * @throws \RuntimeException If an error occured
 	 */
-	public static function updateConfig( Event $event )
+	public static function updateConfig(Event $event)
 	{
-		$event->getIO()->write( 'Ensure existing config and routing for the shop bundle' );
+		$event->getIO()->write('Ensure existing config and routing for the shop bundle');
 
-		$options = self::getOptions( $event );
+		$options = self::getOptions($event);
 
-		if( !isset( $options['symfony-app-dir'] ) || !is_dir( $options['symfony-app-dir'] ) )
+		if (!isset($options['symfony-app-dir']) || !is_dir($options['symfony-app-dir']))
 		{
 			$msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available';
-			throw new \RuntimeException( sprintf( $msg, 'symfony-app-dir', $options['symfony-app-dir'] ) );
+			throw new \RuntimeException(sprintf($msg, 'symfony-app-dir', $options['symfony-app-dir']));
 		}
 
-		self::updateConfigFile( $options['symfony-app-dir'] . '/config/config.yml' );
-		self::updateRoutingFile( $options['symfony-app-dir'] . '/config/routing.yml' );
+		self::updateConfigFile($options['symfony-app-dir'].'/config/config.yml');
+		self::updateRoutingFile($options['symfony-app-dir'].'/config/routing.yml');
 	}
 
 
@@ -72,28 +72,28 @@ 
 	 * @param Event $event Event instance
 	 * @throws \RuntimeException If an error occured
 	 */
-	public static function installBundle( Event $event )
+	public static function installBundle(Event $event)
 	{
-		$event->getIO()->write( 'Installing the Aimeos shop bundle' );
+		$event->getIO()->write('Installing the Aimeos shop bundle');
 
-		$options = self::getOptions( $event );
+		$options = self::getOptions($event);
 
-		if( !isset( $options['symfony-app-dir'] ) || !is_dir( $options['symfony-app-dir'] ) )
+		if (!isset($options['symfony-app-dir']) || !is_dir($options['symfony-app-dir']))
 		{
 			$msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available';
-			throw new \RuntimeException( sprintf( $msg, 'symfony-app-dir', $options['symfony-app-dir'] ) );
+			throw new \RuntimeException(sprintf($msg, 'symfony-app-dir', $options['symfony-app-dir']));
 		}
 
-		if( !isset( $options['symfony-web-dir'] ) || !is_dir( $options['symfony-web-dir'] ) )
+		if (!isset($options['symfony-web-dir']) || !is_dir($options['symfony-web-dir']))
 		{
 			$msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available';
-			throw new \RuntimeException( sprintf( $msg, 'symfony-web-dir', $options['symfony-web-dir'] ) );
+			throw new \RuntimeException(sprintf($msg, 'symfony-web-dir', $options['symfony-web-dir']));
 		}
 
-		self::createDirectory( $options['symfony-app-dir'] . '/secure' );
-		self::createDirectory( $options['symfony-web-dir'] . '/uploads' );
-		self::createDirectory( $options['symfony-web-dir'] . '/preview' );
-		self::createDirectory( $options['symfony-web-dir'] . '/files' );
+		self::createDirectory($options['symfony-app-dir'].'/secure');
+		self::createDirectory($options['symfony-web-dir'].'/uploads');
+		self::createDirectory($options['symfony-web-dir'].'/preview');
+		self::createDirectory($options['symfony-web-dir'].'/files');
 	}
 
 
@@ -103,14 +103,14 @@ 
 	 * @param string $dir Absolute path of the new directory
 	 * @throws \RuntimeException If directory couldn't be created
 	 */
-	protected static function createDirectory( $dir )
+	protected static function createDirectory($dir)
 	{
 		$perm = 0755;
 
-		if( !is_dir( $dir ) && !mkdir( $dir, $perm, true ) )
+		if (!is_dir($dir) && !mkdir($dir, $perm, true))
 		{
 			$msg = 'Unable to create directory "%1$s" with permission "%2$s"';
-			throw new \RuntimeException( sprintf( $msg, $dir, $perm ) );
+			throw new \RuntimeException(sprintf($msg, $dir, $perm));
 		}
 	}
 
@@ -123,28 +123,28 @@ 
 	 * @param array List of configuration options for the given command
 	 * @throws \RuntimeException If the command couldn't be executed
 	 */
-	protected static function executeCommand( Event $event, $cmd, array $options = array() )
+	protected static function executeCommand(Event $event, $cmd, array $options = array())
 	{
-		$php = escapeshellarg( self::getPhp() );
-		$console = escapeshellarg( self::getConsoleDir( $event ) . '/console' );
-		$cmd = escapeshellarg( $cmd );
+		$php = escapeshellarg(self::getPhp());
+		$console = escapeshellarg(self::getConsoleDir($event).'/console');
+		$cmd = escapeshellarg($cmd);
 
-		foreach( $options as $key => $option ) {
-			$options[$key] = escapeshellarg( $option );
+		foreach ($options as $key => $option) {
+			$options[$key] = escapeshellarg($option);
 		}
 
-		if( $event->getIO()->isDecorated() ) {
+		if ($event->getIO()->isDecorated()) {
 			$console .= ' --ansi';
 		}
 
-		$process = new Process( $php . ' ' . $console . ' ' . $cmd . ' ' . implode( ' ', $options ), null, null, null, 3600 );
+		$process = new Process($php.' '.$console.' '.$cmd.' '.implode(' ', $options), null, null, null, 3600);
 
-		$process->run( function( $type, $buffer ) use ( $event ) {
-			$event->getIO()->write( $buffer, false );
+		$process->run(function($type, $buffer) use ($event) {
+			$event->getIO()->write($buffer, false);
 		} );
 
-		if( !$process->isSuccessful() ) {
-			throw new \RuntimeException( sprintf( 'An error occurred when executing the "%s" command', escapeshellarg( $cmd ) ) );
+		if (!$process->isSuccessful()) {
+			throw new \RuntimeException(sprintf('An error occurred when executing the "%s" command', escapeshellarg($cmd)));
 		}
 	}
 
@@ -157,19 +157,19 @@ 
 	 * @return string The path to the console directory
 	 * @throws \RuntimeException If console directory couldn't be found
 	 */
-	protected static function getConsoleDir( Event $event )
+	protected static function getConsoleDir(Event $event)
 	{
-		$options = self::getOptions( $event );
+		$options = self::getOptions($event);
 
-		if( isset( $options['symfony-bin-dir'] ) && is_dir( $options['symfony-bin-dir'] ) ) {
+		if (isset($options['symfony-bin-dir']) && is_dir($options['symfony-bin-dir'])) {
 			return $options['symfony-bin-dir'];
 		}
 
-		if( isset( $options['symfony-app-dir'] ) && is_dir( $options['symfony-app-dir'] ) ) {
+		if (isset($options['symfony-app-dir']) && is_dir($options['symfony-app-dir'])) {
 			return $options['symfony-app-dir'];
 		}
 
-		throw new \RuntimeException( sprintf( 'Console directory not found. Neither %1$s nor %2$s option exist', 'symfony-app-dir', 'symfony-bin-dir' ) );
+		throw new \RuntimeException(sprintf('Console directory not found. Neither %1$s nor %2$s option exist', 'symfony-app-dir', 'symfony-bin-dir'));
 	}
 
 
@@ -179,7 +179,7 @@ 
 	 * @param Event $event Command event object
 	 * @return array Associative list of option keys and values
 	 */
-	protected static function getOptions( Event $event )
+	protected static function getOptions(Event $event)
 	{
 		return $event->getComposer()->getPackage()->getExtra();
 	}
@@ -195,8 +195,8 @@ 
 	{
 		$phpFinder = new PhpExecutableFinder;
 
-		if( !( $phpPath = $phpFinder->find() ) ) {
-			throw new \RuntimeException( 'The php executable could not be found, add it to your PATH environment variable and try again' );
+		if (!($phpPath = $phpFinder->find())) {
+			throw new \RuntimeException('The php executable could not be found, add it to your PATH environment variable and try again');
 		}
 
 		return $phpPath;
@@ -209,15 +209,15 @@ 
 	 * @param string $filename Name of the YAML config file
 	 * @throws \RuntimeException If file is not found
 	 */
-	protected static function updateConfigFile( $filename )
+	protected static function updateConfigFile($filename)
 	{
-		if( ( $content = file_get_contents( $filename ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'File "%1$s" not found', $filename ) );
+		if (($content = file_get_contents($filename)) === false) {
+			throw new \RuntimeException(sprintf('File "%1$s" not found', $filename));
 		}
 
-		if( self::addAsseticBundle( $content ) === true ) {
+		if (self::addAsseticBundle($content) === true) {
 			$fs = new Filesystem();
-			$fs->dumpFile( $filename, $content );
+			$fs->dumpFile($filename, $content);
 		}
 	}
 
@@ -228,21 +228,21 @@ 
 	 * @param string $filename Name of the YAML config file
 	 * @throws \RuntimeException If file is not found
 	 */
-	protected static function updateRoutingFile( $filename )
+	protected static function updateRoutingFile($filename)
 	{
-		if( ( $content = file_get_contents( $filename ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'File "%1$s" not found', $filename ) );
+		if (($content = file_get_contents($filename)) === false) {
+			throw new \RuntimeException(sprintf('File "%1$s" not found', $filename));
 		}
 
-		if( strpos( $content, 'aimeos_shop:' ) === false )
+		if (strpos($content, 'aimeos_shop:') === false)
 		{
-			$content .= "\n" . 'aimeos_shop:
+			$content .= "\n".'aimeos_shop:
     resource: "@AimeosShopBundle/Resources/config/routing.yml"
     prefix: /';
 		}
 
 		$fs = new Filesystem();
-		$fs->dumpFile( $filename, $content );
+		$fs->dumpFile($filename, $content);
 	}
 
 
@@ -252,14 +252,14 @@ 
 	 * @param string &$content Content of the config.yml file
 	 * @return boolean True if modified, false if not
 	 */
-	protected static function addAsseticBundle( &$content )
+	protected static function addAsseticBundle(&$content)
 	{
-		if( preg_match( "/    bundles:[ ]*\[.*'AimeosShopBundle'.*\]/", $content ) !== 1 )
+		if (preg_match("/    bundles:[ ]*\[.*'AimeosShopBundle'.*\]/", $content) !== 1)
 		{
-			$search = array( "/    bundles:[ ]*\[([^\]]+)\]/", "/    bundles:[ ]*\[([ ]*)\]/" );
-			$replace = array( "    bundles: [$1,'AimeosShopBundle']", "    bundles: ['AimeosShopBundle']" );
+			$search = array("/    bundles:[ ]*\[([^\]]+)\]/", "/    bundles:[ ]*\[([ ]*)\]/");
+			$replace = array("    bundles: [$1,'AimeosShopBundle']", "    bundles: ['AimeosShopBundle']");
 
-			if( ( $content = preg_replace( $search, $replace, $content ) ) !== null ) {
+			if (($content = preg_replace($search, $replace, $content)) !== null) {
 				return true;
 			}
 		}

Tests/Controller/AccountControllerTest.php

Spacing +25 added lines, -25 removed lines

@@ -11,72 +11,72 @@
 	public function testAccount()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/myaccount/' );
+		$client->request('GET', '/unittest/de/EUR/myaccount/');
 
-		$this->assertContains( 'aimeos account-profile', $client->getResponse()->getContent() );
-		$this->assertContains( 'aimeos account-history', $client->getResponse()->getContent() );
-		$this->assertContains( 'aimeos account-favorite', $client->getResponse()->getContent() );
-		$this->assertContains( 'aimeos account-watch', $client->getResponse()->getContent() );
+		$this->assertContains('aimeos account-profile', $client->getResponse()->getContent());
+		$this->assertContains('aimeos account-history', $client->getResponse()->getContent());
+		$this->assertContains('aimeos account-favorite', $client->getResponse()->getContent());
+		$this->assertContains('aimeos account-watch', $client->getResponse()->getContent());
 	}
 
 
 	public function testDownload()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/myaccount/download/0' );
+		$client->request('GET', '/unittest/de/EUR/myaccount/download/0');
 
-		$this->assertEquals( 401, $client->getResponse()->getStatusCode() );
+		$this->assertEquals(401, $client->getResponse()->getStatusCode());
 	}
 
 
 	public function testFavoriteComponent()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/test/favoritecomponent' );
+		$client->request('GET', '/unittest/de/EUR/test/favoritecomponent');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( 'aimeos account-favorite', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('aimeos account-favorite', $client->getResponse()->getContent());
 	}
 
 
 	public function testHistoryComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->historyComponentAction() );
+		$this->assertSame($response, $mock->historyComponentAction());
 	}
 
 
 	public function testProfileComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->profileComponentAction() );
+		$this->assertSame($response, $mock->profileComponentAction());
 	}
 
 
 	public function testWatchComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->watchComponentAction() );
+		$this->assertSame($response, $mock->watchComponentAction());
 	}
 }

Tests/Controller/JqadmControllerTest.php

Spacing +39 added lines, -39 removed lines

@@ -12,12 +12,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/file/css' );
+		$client->request('GET', '/unittest/jqadm/file/css');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( '.aimeos', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('.aimeos', $client->getResponse()->getContent());
 	}
 
 
@@ -26,12 +26,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/file/js' );
+		$client->request('GET', '/unittest/jqadm/file/js');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( 'Aimeos = {', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('Aimeos = {', $client->getResponse()->getContent());
 	}
 
 
@@ -40,13 +40,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/copy/product/0' );
+		$client->request('GET', '/unittest/jqadm/copy/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -55,13 +55,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/create/product' );
+		$client->request('GET', '/unittest/jqadm/create/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -70,13 +70,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/delete/product/0' );
+		$client->request('GET', '/unittest/jqadm/delete/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('list-items', $response->getContent());
 	}
 
 
@@ -85,13 +85,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/export/order' );
+		$client->request('GET', '/unittest/jqadm/export/order');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('list-items', $response->getContent());
 	}
 
 
@@ -100,13 +100,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/get/product/0' );
+		$client->request('GET', '/unittest/jqadm/get/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -115,13 +115,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'POST', '/unittest/jqadm/save/product' );
+		$client->request('POST', '/unittest/jqadm/save/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -130,13 +130,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/search/product' );
+		$client->request('GET', '/unittest/jqadm/search/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('list-items', $response->getContent());
 	}
 
 
@@ -145,11 +145,11 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/invalid/jqadm/search/product' );
+		$client->request('GET', '/invalid/jqadm/search/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 500, $response->getStatusCode() );
+		$this->assertEquals(500, $response->getStatusCode());
 	}
 }

Controller/JqadmController.php

Spacing +56 added lines, -56 removed lines

@@ -29,35 +29,35 @@ 
 	 * @param $type File type, i.e. "css" or "js"
 	 * @return Response Response object
 	 */
-	public function fileAction( $type )
+	public function fileAction($type)
 	{
 		$contents = '';
 		$files = array();
-		$aimeos = $this->get( 'aimeos' )->get();
+		$aimeos = $this->get('aimeos')->get();
 
-		foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$files = array_merge( $files, $jsb2->getFiles( $type ) );
+				$jsbAbsPath = $base.'/'.$path;
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$files = array_merge($files, $jsb2->getFiles($type));
 			}
 		}
 
-		foreach( $files as $file )
+		foreach ($files as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		$response = new Response( $contents );
+		$response = new Response($contents);
 
-		if( $type === 'js' ) {
-			$response->headers->set( 'Content-Type', 'application/javascript' );
-		} elseif( $type === 'css' ) {
-			$response->headers->set( 'Content-Type', 'text/css' );
+		if ($type === 'js') {
+			$response->headers->set('Content-Type', 'application/javascript');
+		} elseif ($type === 'css') {
+			$response->headers->set('Content-Type', 'text/css');
 		}
 
 		return $response;
@@ -72,15 +72,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function copyAction( Request $request, $resource, $site = 'default' )
+	public function copyAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
+		$cntl = $this->createClient($request, $site, $resource);
 
-		if( ( $html = $cntl->copy() ) == '' ) {
+		if (($html = $cntl->copy()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -92,15 +92,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function createAction( Request $request, $resource, $site = 'default' )
+	public function createAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
+		$cntl = $this->createClient($request, $site, $resource);
 
-		if( ( $html = $cntl->create() ) == '' ) {
+		if (($html = $cntl->create()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -112,15 +112,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function deleteAction( Request $request, $resource, $site = 'default' )
+	public function deleteAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
+		$cntl = $this->createClient($request, $site, $resource);
 
-		if( ( $html = $cntl->delete() ) == '' ) {
+		if (($html = $cntl->delete()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -132,15 +132,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function exportAction( Request $request, $resource, $site = 'default' )
+	public function exportAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
+		$cntl = $this->createClient($request, $site, $resource);
 
-		if( ( $html = $cntl->export() ) == '' ) {
+		if (($html = $cntl->export()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -152,15 +152,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function getAction( Request $request, $resource, $site = 'default' )
+	public function getAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
+		$cntl = $this->createClient($request, $site, $resource);
 
-		if( ( $html = $cntl->get() ) == '' ) {
+		if (($html = $cntl->get()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -172,15 +172,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function saveAction( Request $request, $resource, $site = 'default' )
+	public function saveAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
+		$cntl = $this->createClient($request, $site, $resource);
 
-		if( ( $html = $cntl->save() ) == '' ) {
+		if (($html = $cntl->save()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -192,15 +192,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function searchAction( Request $request, $resource, $site = 'default' )
+	public function searchAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
+		$cntl = $this->createClient($request, $site, $resource);
 
-		if( ( $html = $cntl->search() ) == '' ) {
+		if (($html = $cntl->search()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -212,26 +212,26 @@ 
 	 * @param string $resource Resource location, e.g. "product"
 	 * @return \Aimeos\Admin\JQAdm\Iface Context item
 	 */
-	protected function createClient( Request $request, $site, $resource )
+	protected function createClient(Request $request, $site, $resource)
 	{
-		$lang = $request->get( 'lang', 'en' );
+		$lang = $request->get('lang', 'en');
 
-		$aimeos = $this->get( 'aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
+		$aimeos = $this->get('aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
 
-		$context = $this->get( 'aimeos_context' )->get( false, 'backend' );
-		$context->setI18n( $this->get( 'aimeos_i18n' )->get( array( $lang, 'en' ) ) );
-		$context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, $site ) );
+		$context = $this->get('aimeos_context')->get(false, 'backend');
+		$context->setI18n($this->get('aimeos_i18n')->get(array($lang, 'en')));
+		$context->setLocale($this->get('aimeos_locale')->getBackend($context, $site));
 
-		$view = $this->get( 'aimeos_view' )->create( $context, $templatePaths, $lang );
+		$view = $this->get('aimeos_view')->create($context, $templatePaths, $lang);
 
 		$view->aimeosType = 'Symfony';
-		$view->aimeosVersion = $this->get( 'aimeos' )->getVersion();
-		$view->aimeosExtensions = implode( ',', $aimeos->getExtensions() );
+		$view->aimeosVersion = $this->get('aimeos')->getVersion();
+		$view->aimeosExtensions = implode(',', $aimeos->getExtensions());
 
-		$context->setView( $view );
+		$context->setView($view);
 
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $aimeos, $resource );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $aimeos, $resource);
 	}
 
 
@@ -241,8 +241,8 @@ 
 	 * @param string $content Content from admin client
 	 * @return Response View for rendering the output
 	 */
-	protected function getHtml( $content )
+	protected function getHtml($content)
 	{
-		return $this->render( 'AimeosShopBundle:Jqadm:index.html.twig', array( 'content' => $content ) );
+		return $this->render('AimeosShopBundle:Jqadm:index.html.twig', array('content' => $content));
 	}
 }