aimeos / aimeos-symfony

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 +59 added lines, -59 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,16 +49,16 @@ 
 	 * @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'] ) )
+		if (isset($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');
 		}
 	}
 
@@ -69,26 +69,26 @@ 
 	 * @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);
 		$securedir = 'var';
 
-		if( isset( $options['symfony-app-dir'] ) && is_dir( $options['symfony-app-dir'] ) ) {
+		if (isset($options['symfony-app-dir']) && is_dir($options['symfony-app-dir'])) {
 			$securedir = $options['symfony-app-dir'];
 		}
 
-		if( isset( $options['symfony-var-dir'] ) && is_dir( $options['symfony-var-dir'] ) ) {
+		if (isset($options['symfony-var-dir']) && is_dir($options['symfony-var-dir'])) {
 			$securedir = $options['symfony-var-dir'];
 		}
 
-		$webdir = ( isset( $options['symfony-web-dir'] ) ? $options['symfony-web-dir'] : 'public' );
+		$webdir = (isset($options['symfony-web-dir']) ? $options['symfony-web-dir'] : 'public');
 
-		self::createDirectory( $securedir . '/secure' );
-		self::createDirectory( $webdir . '/preview' );
-		self::createDirectory( $webdir . '/files' );
+		self::createDirectory($securedir.'/secure');
+		self::createDirectory($webdir.'/preview');
+		self::createDirectory($webdir.'/files');
 	}
 
 
@@ -98,14 +98,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));
 		}
 	}
 
@@ -118,28 +118,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)));
 		}
 	}
 
@@ -152,17 +152,17 @@ 
 	 * @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);
 
 		$bindir = 'bin';
 
-		if( isset( $options['symfony-app-dir'] ) && is_dir( $options['symfony-app-dir'] ) ) {
+		if (isset($options['symfony-app-dir']) && is_dir($options['symfony-app-dir'])) {
 			$bindir = $options['symfony-app-dir'];
 		}
 
-		if( isset( $options['symfony-bin-dir'] ) && is_dir( $options['symfony-bin-dir'] ) ) {
+		if (isset($options['symfony-bin-dir']) && is_dir($options['symfony-bin-dir'])) {
 			$bindir = $options['symfony-bin-dir'];
 		}
 
@@ -176,7 +176,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();
 	}
@@ -192,8 +192,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;
@@ -206,15 +206,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);
 		}
 	}
 
@@ -225,29 +225,29 @@ 
 	 * @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)
 	{
 		$content = '';
 
-		if( file_exists( $filename ) && ( $content = file_get_contents( $filename ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'File "%1$s" not readable', $filename ) );
+		if (file_exists($filename) && ($content = file_get_contents($filename)) === false) {
+			throw new \RuntimeException(sprintf('File "%1$s" not readable', $filename));
 		}
 
-		if( strpos( $content, 'fos_user:' ) === false )
+		if (strpos($content, 'fos_user:') === false)
 		{
-			$content .= "\n" . 'fos_user:
+			$content .= "\n".'fos_user:
     resource: "@FOSUserBundle/Resources/config/routing/all.xml"';
 		}
 
-		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);
 	}
 
 
@@ -257,14 +257,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;
 			}
 		}

Controller/JsonadmController.php

Doc Comments +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
 	 * @param string $site Unique site code
 	 * @param string Resource location, e.g. "product/property/type"
 	 * @param string $lang Language code
-	 * @return \Aimeos\MShop\Context\Item\Iface Context item
+	 * @return \Aimeos\Admin\JsonAdm\Iface Context item
 	 */
 	protected function createAdmin( $site, $resource, $lang )
 	{

Spacing +27 added lines, -27 removed lines

@@ -31,10 +31,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function deleteAction( ServerRequestInterface $request, $resource, $site = 'default' )
+	public function deleteAction(ServerRequestInterface $request, $resource, $site = 'default')
 	{
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->delete( $request, new Response() );
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->delete($request, new Response());
 	}
 
 
@@ -46,10 +46,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function getAction( ServerRequestInterface $request, $resource, $site = 'default' )
+	public function getAction(ServerRequestInterface $request, $resource, $site = 'default')
 	{
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->get( $request, new Response() );
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->get($request, new Response());
 	}
 
 
@@ -61,10 +61,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function patchAction( ServerRequestInterface $request, $resource, $site = 'default' )
+	public function patchAction(ServerRequestInterface $request, $resource, $site = 'default')
 	{
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->patch( $request, new Response() );
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->patch($request, new Response());
 	}
 
 
@@ -76,10 +76,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function postAction( ServerRequestInterface $request, $resource, $site = 'default' )
+	public function postAction(ServerRequestInterface $request, $resource, $site = 'default')
 	{
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->post( $request, new Response() );
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->post($request, new Response());
 	}
 
 
@@ -91,10 +91,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function putAction( ServerRequestInterface $request, $resource, $site = 'default' )
+	public function putAction(ServerRequestInterface $request, $resource, $site = 'default')
 	{
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->put( $request, new Response() );
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->put($request, new Response());
 	}
 
 
@@ -106,10 +106,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function optionsAction( ServerRequestInterface $request, $resource = '', $site = 'default' )
+	public function optionsAction(ServerRequestInterface $request, $resource = '', $site = 'default')
 	{
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->options( $request, new Response() );
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->options($request, new Response());
 	}
 
 
@@ -121,18 +121,18 @@ 
 	 * @param string $lang Language code
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item
 	 */
-	protected function createAdmin( $site, $resource, $lang )
+	protected function createAdmin($site, $resource, $lang)
 	{
-		$aimeos = $this->get( 'aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' );
+		$aimeos = $this->get('aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jsonadm/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 );
-		$context->setView( $view );
+		$view = $this->get('aimeos.view')->create($context, $templatePaths, $lang);
+		$context->setView($view);
 
-		return \Aimeos\Admin\JsonAdm::create( $context, $aimeos, $resource );
+		return \Aimeos\Admin\JsonAdm::create($context, $aimeos, $resource);
 	}
 }

Service/Support.php

Spacing +4 added lines, -4 removed lines

@@ -27,15 +27,15 @@
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return array List of group codes the user is in
 	 */
-	public function getGroups( \Aimeos\MShop\Context\Item\Iface $context )
+	public function getGroups(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$list = array();
-		$manager = \Aimeos\MShop::create( $context, 'customer/group' );
+		$manager = \Aimeos\MShop::create($context, 'customer/group');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) );
+		$search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds()));
 
-		foreach( $manager->searchItems( $search ) as $item ) {
+		foreach ($manager->searchItems($search) as $item) {
 			$list[] = $item->getCode();
 		}
 

Service/Locale.php

Spacing +13 added lines, -13 removed lines

@@ -32,7 +32,7 @@ 
 	 * @param RequestStack $requestStack Current request stack
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( RequestStack $requestStack, Container $container )
+	public function __construct(RequestStack $requestStack, Container $container)
 	{
 		$this->requestStack = $requestStack;
 		$this->container = $container;
@@ -45,19 +45,19 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	public function get( \Aimeos\MShop\Context\Item\Iface $context )
+	public function get(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( $this->locale === null )
+		if ($this->locale === null)
 		{
-			$status = $this->container->getParameter( 'aimeos_shop.disable_sites' );
+			$status = $this->container->getParameter('aimeos_shop.disable_sites');
 			$request = $this->requestStack->getMasterRequest();
 
-			$site = $request->attributes->get( 'site', $request->query->get( 'site', 'default' ) );
-			$currency = $request->attributes->get( 'currency', $request->query->get( 'currency', '' ) );
-			$lang = $request->attributes->get( 'locale', $request->query->get( 'locale', '' ) );
+			$site = $request->attributes->get('site', $request->query->get('site', 'default'));
+			$currency = $request->attributes->get('currency', $request->query->get('currency', ''));
+			$lang = $request->attributes->get('locale', $request->query->get('locale', ''));
 
-			$localeManager = \Aimeos\MShop::create( $context, 'locale' );
-			$this->locale = $localeManager->bootstrap( $site, $lang, $currency, $status );
+			$localeManager = \Aimeos\MShop::create($context, 'locale');
+			$this->locale = $localeManager->bootstrap($site, $lang, $currency, $status);
 		}
 
 		return $this->locale;
@@ -71,13 +71,13 @@ 
 	 * @param string $site Unique site code
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site)
 	{
-		$localeManager = \Aimeos\MShop::create( $context, 'locale' );
+		$localeManager = \Aimeos\MShop::create($context, 'locale');
 
 		try {
-			$localeItem = $localeManager->bootstrap( $site, '', '', false, null, true );
-		} catch( \Aimeos\MShop\Exception $e ) {
+			$localeItem = $localeManager->bootstrap($site, '', '', false, null, true);
+		} catch (\Aimeos\MShop\Exception $e) {
 			$localeItem = $localeManager->createItem();
 		}
 

Command/Command.php

Spacing +5 added lines, -5 removed lines

@@ -30,15 +30,15 @@
 	 * @param InputInterface $input Input object
 	 * @return \Aimeos\MShop\Locale\Item\Site\Interface[] List of site items
 	 */
-	protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, InputInterface $input )
+	protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, InputInterface $input)
 	{
-		$manager = \Aimeos\MShop::create( $context, 'locale/site' );
+		$manager = \Aimeos\MShop::create($context, 'locale/site');
 		$search = $manager->createSearch();
 
-		if( ( $codes = (string) $input->getArgument( 'site' ) ) !== '' ) {
-			$search->setConditions( $search->compare( '==', 'locale.site.code', explode( ' ', $codes ) ) );
+		if (($codes = (string) $input->getArgument('site')) !== '') {
+			$search->setConditions($search->compare('==', 'locale.site.code', explode(' ', $codes)));
 		}
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

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/1' );
+		$client->request('GET', '/unittest/jqadm/copy/product/1');
 		$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/1' );
+		$client->request('GET', '/unittest/jqadm/get/product/1');
 		$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/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::create( $context, $resource . '/' . $related );
+		return \Aimeos\Client\JsonApi::create($context, $resource.'/'.$related);
 	}
 }

Controller/AccountController.php

Spacing +19 added lines, -19 removed lines

@@ -30,15 +30,15 @@ 
 	public function indexAction()
 	{
 		$params = [];
-		$shop = $this->container->get( 'shop' );
+		$shop = $this->container->get('shop');
 
-		foreach( $this->container->getParameter( 'aimeos_shop.page' )['account-index'] as $name )
+		foreach ($this->container->getParameter('aimeos_shop.page')['account-index'] as $name)
 		{
-			$params['aiheader'][$name] = $shop->get( $name )->getHeader();
-			$params['aibody'][$name] = $shop->get( $name )->getBody();
+			$params['aiheader'][$name] = $shop->get($name)->getHeader();
+			$params['aibody'][$name] = $shop->get($name)->getBody();
 		}
 
-		return $this->render( 'AimeosShopBundle:Account:index.html.twig', $params )->setPrivate()->setMaxAge( 300 );
+		return $this->render('AimeosShopBundle:Account:index.html.twig', $params)->setPrivate()->setMaxAge(300);
 	}
 
 
@@ -49,8 +49,8 @@ 
 	 */
 	public function downloadAction()
 	{
-		$response = $this->container->get( 'shop' )->get( 'account/download' )->getView()->response();
-		return Response::create( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );
+		$response = $this->container->get('shop')->get('account/download')->getView()->response();
+		return Response::create((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
 	}
 
 
@@ -61,10 +61,10 @@ 
 	 */
 	public function favoriteComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'account/favorite' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('account/favorite');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 
 
@@ -75,10 +75,10 @@ 
 	 */
 	public function historyComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'account/history' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('account/history');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 
 
@@ -89,10 +89,10 @@ 
 	 */
 	public function profileComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'account/profile' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('account/profile');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 
 
@@ -103,9 +103,9 @@ 
 	 */
 	public function watchComponentAction()
 	{
-		$client = $this->container->get( 'shop' )->get( 'account/watch' );
-		$this->container->get( 'twig' )->addGlobal( 'aiheader', (string) $client->getHeader() );
+		$client = $this->container->get('shop')->get('account/watch');
+		$this->container->get('twig')->addGlobal('aiheader', (string) $client->getHeader());
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 }