aimeos / aimeos-symfony

Tests/Command/AccountCommandTest.php

Spacing +12 added lines, -12 removed lines

@@ -16,14 +16,14 @@ 
 		$kernel = $this->createKernel();
 		$kernel->boot();
 
-		$application = new Application( $kernel );
-		$application->add( new Command\AccountCommand() );
+		$application = new Application($kernel);
+		$application->add(new Command\AccountCommand());
 
-		$command = $application->find( 'aimeos:account' );
-		$commandTester = new CommandTester( $command );
-		$commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest', 'email' => 'unitCustomer@example.com', '--password' => 'test' ) );
+		$command = $application->find('aimeos:account');
+		$commandTester = new CommandTester($command);
+		$commandTester->execute(array('command' => $command->getName(), 'site' => 'unittest', 'email' => 'unitCustomer@example.com', '--password' => 'test'));
 
-		$this->assertEquals( 0, $commandTester->getStatusCode() );
+		$this->assertEquals(0, $commandTester->getStatusCode());
 	}
 
 
@@ -32,13 +32,13 @@ 
 		$kernel = $this->createKernel();
 		$kernel->boot();
 
-		$application = new Application( $kernel );
-		$application->add( new Command\AccountCommand() );
+		$application = new Application($kernel);
+		$application->add(new Command\AccountCommand());
 
-		$command = $application->find( 'aimeos:account' );
-		$commandTester = new CommandTester( $command );
-		$commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest', 'email' => 'unitCustomer@example.com', '--password' => 'test', '--admin' => true ) );
+		$command = $application->find('aimeos:account');
+		$commandTester = new CommandTester($command);
+		$commandTester->execute(array('command' => $command->getName(), 'site' => 'unittest', 'email' => 'unitCustomer@example.com', '--password' => 'test', '--admin' => true));
 
-		$this->assertEquals( 0, $commandTester->getStatusCode() );
+		$this->assertEquals(0, $commandTester->getStatusCode());
 	}
 }

Command/AccountCommand.php

Braces +1 added lines, -2 removed lines

@@ -186,8 +186,7 @@
 		try
 		{
 			$item = $manager->findItem( $code );
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$item = $manager->createItem();
 			$item->setLabel( $code );

Spacing +70 added lines, -70 removed lines

@@ -29,14 +29,14 @@ 
 	 */
 	protected function configure()
 	{
-		$this->setName( 'aimeos:account');
-		$this->setDescription( 'Creates new (admin) accounts' );
-		$this->addArgument( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' );
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default"', 'default' );
-		$this->addOption( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' );
-		$this->addOption( 'super', null, InputOption::VALUE_NONE, 'If account should have super user privileges' );
-		$this->addOption( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' );
-		$this->addOption( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' );
+		$this->setName('aimeos:account');
+		$this->setDescription('Creates new (admin) accounts');
+		$this->addArgument('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created');
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default"', 'default');
+		$this->addOption('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)');
+		$this->addOption('super', null, InputOption::VALUE_NONE, 'If account should have super user privileges');
+		$this->addOption('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges');
+		$this->addOption('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges');
 	}
 
 
@@ -46,37 +46,37 @@ 
 	 * @param InputInterface $input Input object
 	 * @param OutputInterface $output Output object
 	 */
-	protected function execute( InputInterface $input, OutputInterface $output )
+	protected function execute(InputInterface $input, OutputInterface $output)
 	{
-		$code = $input->getArgument( 'email' );
-		if( ( $password = $input->getOption( 'password' ) ) === null )
+		$code = $input->getArgument('email');
+		if (($password = $input->getOption('password')) === null)
 		{
-			$helper = $this->getHelper( 'question' );
-			$question = new Question( 'Password' );
-			$question->setHidden( true );
+			$helper = $this->getHelper('question');
+			$question = new Question('Password');
+			$question->setHidden(true);
 
-			$password = $helper->ask( $input, $output, $question );
+			$password = $helper->ask($input, $output, $question);
 		}
 
-		$context = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' );
-		$context->setEditor( 'aimeos:account' );
+		$context = $this->getContainer()->get('aimeos_context')->get(false, 'command');
+		$context->setEditor('aimeos:account');
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
-		$localeItem = $localeManager->bootstrap( $input->getArgument( 'site' ), '', '', false );
-		$context->setLocale( $localeItem );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
+		$localeItem = $localeManager->bootstrap($input->getArgument('site'), '', '', false);
+		$context->setLocale($localeItem);
 
-		$user = $this->createCustomerItem( $context, $code, $password );
+		$user = $this->createCustomerItem($context, $code, $password);
 
-		if( $input->getOption( 'super' ) ) {
-			$this->addGroup( $input, $output, $context, $user, 'super' );
+		if ($input->getOption('super')) {
+			$this->addGroup($input, $output, $context, $user, 'super');
 		}
 
-		if( $input->getOption( 'admin' ) ) {
-			$this->addGroup( $input, $output, $context, $user, 'admin' );
+		if ($input->getOption('admin')) {
+			$this->addGroup($input, $output, $context, $user, 'admin');
 		}
 
-		if( $input->getOption( 'editor' ) ) {
-			$this->addGroup( $input, $output, $context, $user, 'editor' );
+		if ($input->getOption('editor')) {
+			$this->addGroup($input, $output, $context, $user, 'editor');
 		}
 	}
 
@@ -90,24 +90,24 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object
 	 * @param string $group Unique customer group code
 	 */
-	protected function addGroup( InputInterface $input, OutputInterface $output,
-		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group )
+	protected function addGroup(InputInterface $input, OutputInterface $output,
+		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group)
 	{
-		$output->writeln( sprintf( 'Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode() ) );
+		$output->writeln(sprintf('Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode()));
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
 
-		foreach( $this->getSiteItems( $context, $input ) as $siteItem )
+		foreach ($this->getSiteItems($context, $input) as $siteItem)
 		{
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
 
 			$lcontext = clone $context;
-			$lcontext->setLocale( $localeItem );
+			$lcontext->setLocale($localeItem);
 
-			$output->writeln( '- ' . $siteItem->getCode() );
+			$output->writeln('- '.$siteItem->getCode());
 
-			$groupItem = $this->getGroupItem( $lcontext, $group );
-			$this->addListItem( $lcontext, $user->getId(), $groupItem->getId() );
+			$groupItem = $this->getGroupItem($lcontext, $group);
+			$this->addListItem($lcontext, $user->getId(), $groupItem->getId());
 		}
 	}
 
@@ -119,31 +119,31 @@ 
 	 * @param string $userid Unique user ID
 	 * @param string $groupid Unique group ID
 	 */
-	protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid )
+	protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid)
 	{
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'lists' );
-		$typeid = $manager->getSubmanager( 'type' )->findItem( 'default', array(), 'customer/group' )->getId();
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('lists');
+		$typeid = $manager->getSubmanager('type')->findItem('default', array(), 'customer/group')->getId();
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
-			$search->compare( '==', 'customer.lists.refid', $groupid ),
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
-			$search->compare( '==', 'customer.lists.typeid', $typeid ),
+			$search->compare('==', 'customer.lists.parentid', $userid),
+			$search->compare('==', 'customer.lists.refid', $groupid),
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
+			$search->compare('==', 'customer.lists.typeid', $typeid),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		if( count( $manager->searchItems( $search ) ) === 0 )
+		if (count($manager->searchItems($search)) === 0)
 		{
 			$item = $manager->createItem();
-			$item->setDomain( 'customer/group' );
-			$item->setParentId( $userid );
-			$item->setTypeId( $typeid );
-			$item->setRefId( $groupid );
-			$item->setStatus( 1 );
+			$item->setDomain('customer/group');
+			$item->setParentId($userid);
+			$item->setTypeId($typeid);
+			$item->setRefId($groupid);
+			$item->setStatus(1);
 
-			$manager->saveItem( $item, false );
+			$manager->saveItem($item, false);
 		}
 	}
 
@@ -158,23 +158,23 @@ 
 	 * @param string $password New user password
 	 * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object
 	 */
-	protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password )
+	protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
 
 		try {
-			$item = $manager->findItem( $email );
-		} catch( \Aimeos\MShop\Exception $e ) {
+			$item = $manager->findItem($email);
+		} catch (\Aimeos\MShop\Exception $e) {
 			$item = $manager->createItem();
 		}
 
-		$item->setCode( $email );
-		$item->setLabel( $email );
-		$item->getPaymentAddress()->setEmail( $email );
-		$item->setPassword( $password );
-		$item->setStatus( 1 );
+		$item->setCode($email);
+		$item->setLabel($email);
+		$item->getPaymentAddress()->setEmail($email);
+		$item->setPassword($password);
+		$item->setStatus(1);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		return $item;
 	}
@@ -187,21 +187,21 @@ 
 	 * @param string $code Unique customer group code
 	 * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object
 	 */
-	protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code )
+	protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code)
 	{
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group');
 
 		try
 		{
-			$item = $manager->findItem( $code );
+			$item = $manager->findItem($code);
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$item = $manager->createItem();
-			$item->setLabel( $code );
-			$item->setCode( $code );
+			$item->setLabel($code);
+			$item->setCode($code);
 
-			$manager->saveItem( $item );
+			$manager->saveItem($item);
 		}
 
 		return $item;

Controller/LocaleController.php

Spacing +1 added lines, -1 removed lines

@@ -28,6 +28,6 @@
 	 */
 	public function selectComponentAction()
 	{
-		return $this->getOutput( 'locale/select' );
+		return $this->getOutput('locale/select');
 	}
 }

Controller/AbstractController.php

Spacing +11 added lines, -11 removed lines

@@ -28,29 +28,29 @@
 	 * @param string $clientName Html client name
 	 * @return Response Response object containing the generated output
 	 */
-	protected function getOutput( $clientName )
+	protected function getOutput($clientName)
 	{
-		$tmplPaths = $this->container->get( 'aimeos' )->get()->getCustomPaths( 'client/html/templates' );
-		$context = $this->container->get( 'aimeos_context' )->get();
+		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/html/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);
 
-		$client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName );
-		$client->setView( $view );
+		$client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
+		$client->setView($view);
 		$client->process();
 
-		$twig = $this->container->get( 'twig' );
+		$twig = $this->container->get('twig');
 		$vars = $twig->getGlobals();
 
-		if( !isset( $vars['aiheader'] ) ) {
+		if (!isset($vars['aiheader'])) {
 			$vars['aiheader'] = array();
 		}
 
 		$vars['aiheader'][$clientName] = (string) $client->getHeader();
-		$twig->addGlobal( 'aiheader', $vars['aiheader'] );
+		$twig->addGlobal('aiheader', $vars['aiheader']);
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 }

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\Factory::createManager( $context, 'customer/group' );
+		$manager = \Aimeos\MShop\Factory::createManager($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 +15 added lines, -15 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\Locale\Manager\Factory::createManager( $context );
-			$this->locale = $localeManager->bootstrap( $site, $lang, $currency, $status );
+			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
+			$this->locale = $localeManager->bootstrap($site, $lang, $currency, $status);
 		}
 
 		return $this->locale;
@@ -71,17 +71,17 @@ 
 	 * @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\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try
 		{
-			$localeItem = $localeManager->bootstrap( $site, '', '', false );
-			$localeItem->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$localeItem = $localeManager->bootstrap($site, '', '', false);
+			$localeItem->setLanguageId(null);
+			$localeItem->setCurrencyId(null);
 		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		catch (\Aimeos\MShop\Locale\Exception $e)
 		{
 			$localeItem = $localeManager->createItem();
 		}

Braces +1 added lines, -2 removed lines

@@ -80,8 +80,7 @@
 			$localeItem = $localeManager->bootstrap( $site, '', '', false );
 			$localeItem->setLanguageId( null );
 			$localeItem->setCurrencyId( null );
-		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		} catch( \Aimeos\MShop\Locale\Exception $e )
 		{
 			$localeItem = $localeManager->createItem();
 		}

DependencyInjection/Configuration.php

Spacing +15 added lines, -15 removed lines

@@ -29,26 +29,26 @@
 	public function getConfigTreeBuilder()
 	{
 		$treeBuilder = new TreeBuilder();
-		$rootNode = $treeBuilder->root( 'aimeos_shop' );
+		$rootNode = $treeBuilder->root('aimeos_shop');
 
 		$rootNode
 			->children()
-				->booleanNode('disable_sites')->defaultValue( true )->end()
-				->booleanNode('apc_enable')->defaultValue( false )->end()
-				->scalarNode('apc_prefix')->defaultValue( 'sf2:' )->end()
+				->booleanNode('disable_sites')->defaultValue(true)->end()
+				->booleanNode('apc_enable')->defaultValue(false)->end()
+				->scalarNode('apc_prefix')->defaultValue('sf2:')->end()
 				->scalarNode('extdir')->end()
 				->scalarNode('uploaddir')->end()
-				->variableNode('admin')->defaultValue( array() )->end()
-				->variableNode('client')->defaultValue( array() )->end()
-				->variableNode('controller')->defaultValue( array() )->end()
-				->variableNode('i18n')->defaultValue( array() )->end()
-				->variableNode('madmin')->defaultValue( array() )->end()
-				->variableNode('mshop')->defaultValue( array() )->end()
-				->variableNode('resource')->defaultValue( array() )->end()
-				->variableNode('page')->defaultValue( array() )->end()
-				->variableNode('backend')->defaultValue( array() )->end()
-				->variableNode('frontend')->defaultValue( array() )->end()
-				->variableNode('command')->defaultValue( array() )->end()
+				->variableNode('admin')->defaultValue(array())->end()
+				->variableNode('client')->defaultValue(array())->end()
+				->variableNode('controller')->defaultValue(array())->end()
+				->variableNode('i18n')->defaultValue(array())->end()
+				->variableNode('madmin')->defaultValue(array())->end()
+				->variableNode('mshop')->defaultValue(array())->end()
+				->variableNode('resource')->defaultValue(array())->end()
+				->variableNode('page')->defaultValue(array())->end()
+				->variableNode('backend')->defaultValue(array())->end()
+				->variableNode('frontend')->defaultValue(array())->end()
+				->variableNode('command')->defaultValue(array())->end()
 			->end()
 		;
 

Command/SetupCommand.php

Spacing +34 added lines, -34 removed lines

@@ -29,13 +29,13 @@ 
 	 */
 	protected function configure()
 	{
-		$this->setName( 'aimeos:setup');
-		$this->setDescription( 'Initialize or update the Aimeos database tables' );
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' );
-		$this->addArgument( 'tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default' );
-		$this->addOption( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() );
-		$this->addOption( 'action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate' );
-		$this->addOption( 'task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null );
+		$this->setName('aimeos:setup');
+		$this->setDescription('Initialize or update the Aimeos database tables');
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default');
+		$this->addArgument('tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default');
+		$this->addOption('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array());
+		$this->addOption('action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate');
+		$this->addOption('task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null);
 	}
 
 
@@ -45,41 +45,41 @@ 
 	 * @param InputInterface $input Input object
 	 * @param OutputInterface $output Output object
 	 */
-	protected function execute( InputInterface $input, OutputInterface $output )
+	protected function execute(InputInterface $input, OutputInterface $output)
 	{
-		$ctx = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' );
-		$ctx->setEditor( 'aimeos:setup' );
+		$ctx = $this->getContainer()->get('aimeos_context')->get(false, 'command');
+		$ctx->setEditor('aimeos:setup');
 
 		$config = $ctx->getConfig();
-		$site = $input->getArgument( 'site' );
-		$tplsite = $input->getArgument( 'tplsite' );
+		$site = $input->getArgument('site');
+		$tplsite = $input->getArgument('tplsite');
 
-		$config->set( 'setup/site', $site );
-		$dbconfig = $this->getDbConfig( $config );
-		$this->setOptions( $config, $input );
+		$config->set('setup/site', $site);
+		$dbconfig = $this->getDbConfig($config);
+		$this->setOptions($config, $input);
 
-		$taskPaths = $this->getContainer()->get( 'aimeos' )->get()->getSetupPaths( $tplsite );
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
+		$taskPaths = $this->getContainer()->get('aimeos')->get()->getSetupPaths($tplsite);
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
 
-		$output->writeln( sprintf( 'Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site ) );
+		$output->writeln(sprintf('Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site));
 
-		if( ( $task = $input->getOption( 'task' ) ) && is_array( $task ) ) {
-			$task = reset( $task );
+		if (($task = $input->getOption('task')) && is_array($task)) {
+			$task = reset($task);
 		}
 
-		switch( $input->getOption( 'action' ) )
+		switch ($input->getOption('action'))
 		{
 			case 'migrate':
-				$manager->migrate( $task );
+				$manager->migrate($task);
 				break;
 			case 'rollback':
-				$manager->rollback( $task );
+				$manager->rollback($task);
 				break;
 			case 'clean':
-				$manager->clean( $task );
+				$manager->clean($task);
 				break;
 			default:
-				throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $input->getOption( 'action' ) ) );
+				throw new \Exception(sprintf('Invalid setup action "%1$s"', $input->getOption('action')));
 		}
 	}
 
@@ -90,14 +90,14 @@ 
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
 	 * @return array Multi-dimensional associative list of database configuration parameters
 	 */
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
 	{
-		$dbconfig = $conf->get( 'resource', array() );
+		$dbconfig = $conf->get('resource', array());
 
-		foreach( $dbconfig as $rname => $dbconf )
+		foreach ($dbconfig as $rname => $dbconf)
 		{
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
-				unset( $dbconfig[$rname] );
+			if (strncmp($rname, 'db', 2) !== 0) {
+				unset($dbconfig[$rname]);
 			}
 		}
 
@@ -113,12 +113,12 @@ 
 	 * @param array Associative list of database configurations
 	 * @throws \RuntimeException If the format of the options is invalid
 	 */
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf, InputInterface $input )
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf, InputInterface $input)
 	{
-		foreach( (array) $input->getOption( 'option' ) as $option )
+		foreach ((array) $input->getOption('option') as $option)
 		{
-			list( $name, $value ) = explode( ':', $option );
-			$conf->set( str_replace( '\\', '/', $name ), $value );
+			list($name, $value) = explode(':', $option);
+			$conf->set(str_replace('\\', '/', $name), $value);
 		}
 	}
 }

Tests/Controller/JsonadmControllerTest.php

Spacing +98 added lines, -98 removed lines

@@ -12,29 +12,29 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
 
-		$client->request( 'OPTIONS', '/unittest/jsonadm/product' );
+		$client->request('OPTIONS', '/unittest/jsonadm/product');
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'resources', $json['meta'] );
-		$this->assertGreaterThan( 1, count( $json['meta']['resources'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertArrayHasKey('resources', $json['meta']);
+		$this->assertGreaterThan(1, count($json['meta']['resources']));
 
 
-		$client->request( 'OPTIONS', '/unittest/jsonadm' );
+		$client->request('OPTIONS', '/unittest/jsonadm');
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'resources', $json['meta'] );
-		$this->assertGreaterThan( 1, count( $json['meta']['resources'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertArrayHasKey('resources', $json['meta']);
+		$this->assertGreaterThan(1, count($json['meta']['resources']));
 	}
 
 
@@ -43,62 +43,62 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
 
 		$content = '{"data":{"type":"stock/type","attributes":{"stock.type.code":"symfony","stock.type.label":"symfony"}}}';
-		$client->request( 'POST', '/unittest/jsonadm/stock/type', array(), array(), array(), $content );
+		$client->request('POST', '/unittest/jsonadm/stock/type', array(), array(), array(), $content);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 201, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'stock.type.id', $json['data']['attributes'] );
-		$this->assertEquals( 'symfony', $json['data']['attributes']['stock.type.code'] );
-		$this->assertEquals( 'symfony', $json['data']['attributes']['stock.type.label'] );
-		$this->assertEquals( 1, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(201, $response->getStatusCode());
+		$this->assertArrayHasKey('stock.type.id', $json['data']['attributes']);
+		$this->assertEquals('symfony', $json['data']['attributes']['stock.type.code']);
+		$this->assertEquals('symfony', $json['data']['attributes']['stock.type.label']);
+		$this->assertEquals(1, $json['meta']['total']);
 
 		$id = $json['data']['attributes']['stock.type.id'];
 
 
 		$content = '{"data":{"type":"stock/type","attributes":{"stock.type.code":"symfony2","stock.type.label":"symfony2"}}}';
-		$client->request( 'PATCH', '/unittest/jsonadm/stock/type/' . $id, array(), array(), array(), $content );
+		$client->request('PATCH', '/unittest/jsonadm/stock/type/'.$id, array(), array(), array(), $content);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'stock.type.id', $json['data']['attributes'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.code'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.label'] );
-		$this->assertEquals( $id, $json['data']['attributes']['stock.type.id'] );
-		$this->assertEquals( 1, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertArrayHasKey('stock.type.id', $json['data']['attributes']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['stock.type.code']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['stock.type.label']);
+		$this->assertEquals($id, $json['data']['attributes']['stock.type.id']);
+		$this->assertEquals(1, $json['meta']['total']);
 
 
-		$client->request( 'GET', '/unittest/jsonadm/stock/type/' . $id );
+		$client->request('GET', '/unittest/jsonadm/stock/type/'.$id);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'stock.type.id', $json['data']['attributes'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.code'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.label'] );
-		$this->assertEquals( $id, $json['data']['attributes']['stock.type.id'] );
-		$this->assertEquals( 1, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertArrayHasKey('stock.type.id', $json['data']['attributes']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['stock.type.code']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['stock.type.label']);
+		$this->assertEquals($id, $json['data']['attributes']['stock.type.id']);
+		$this->assertEquals(1, $json['meta']['total']);
 
 
-		$client->request( 'DELETE', '/unittest/jsonadm/stock/type/' . $id );
+		$client->request('DELETE', '/unittest/jsonadm/stock/type/'.$id);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $json['meta']['total']);
 	}
 
 
@@ -107,85 +107,85 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
 
 		$content = '{"data":[
 			{"type":"stock/type","attributes":{"stock.type.code":"symfony","stock.type.label":"symfony"}},
 			{"type":"stock/type","attributes":{"stock.type.code":"symfony2","stock.type.label":"symfony"}}
 		]}';
-		$client->request( 'POST', '/unittest/jsonadm/stock/type', array(), array(), array(), $content );
+		$client->request('POST', '/unittest/jsonadm/stock/type', array(), array(), array(), $content);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 201, $response->getStatusCode() );
-		$this->assertEquals( 2, count( $json['data'] ) );
-		$this->assertArrayHasKey( 'stock.type.id', $json['data'][0]['attributes'] );
-		$this->assertArrayHasKey( 'stock.type.id', $json['data'][1]['attributes'] );
-		$this->assertEquals( 'symfony', $json['data'][0]['attributes']['stock.type.label'] );
-		$this->assertEquals( 'symfony', $json['data'][1]['attributes']['stock.type.label'] );
-		$this->assertEquals( 2, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(201, $response->getStatusCode());
+		$this->assertEquals(2, count($json['data']));
+		$this->assertArrayHasKey('stock.type.id', $json['data'][0]['attributes']);
+		$this->assertArrayHasKey('stock.type.id', $json['data'][1]['attributes']);
+		$this->assertEquals('symfony', $json['data'][0]['attributes']['stock.type.label']);
+		$this->assertEquals('symfony', $json['data'][1]['attributes']['stock.type.label']);
+		$this->assertEquals(2, $json['meta']['total']);
 
-		$ids = array( $json['data'][0]['attributes']['stock.type.id'], $json['data'][1]['attributes']['stock.type.id'] );
+		$ids = array($json['data'][0]['attributes']['stock.type.id'], $json['data'][1]['attributes']['stock.type.id']);
 
 
 		$content = '{"data":[
-			{"type":"stock/type","id":' . $ids[0] . ',"attributes":{"stock.type.label":"symfony2"}},
-			{"type":"stock/type","id":' . $ids[1] . ',"attributes":{"stock.type.label":"symfony2"}}
+			{"type":"stock/type","id":' . $ids[0].',"attributes":{"stock.type.label":"symfony2"}},
+			{"type":"stock/type","id":' . $ids[1].',"attributes":{"stock.type.label":"symfony2"}}
 		]}';
-		$client->request( 'PATCH', '/unittest/jsonadm/stock/type', array(), array(), array(), $content );
+		$client->request('PATCH', '/unittest/jsonadm/stock/type', array(), array(), array(), $content);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
-
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 2, count( $json['data'] ) );
-		$this->assertArrayHasKey( 'stock.type.id', $json['data'][0]['attributes'] );
-		$this->assertArrayHasKey( 'stock.type.id', $json['data'][1]['attributes'] );
-		$this->assertEquals( 'symfony2', $json['data'][0]['attributes']['stock.type.label'] );
-		$this->assertEquals( 'symfony2', $json['data'][1]['attributes']['stock.type.label'] );
-		$this->assertTrue( in_array( $json['data'][0]['attributes']['stock.type.id'], $ids ) );
-		$this->assertTrue( in_array( $json['data'][1]['attributes']['stock.type.id'], $ids ) );
-		$this->assertEquals( 2, $json['meta']['total'] );
-
-
-		$getParams = array( 'filter' => array( '&&' => array(
-			array( '=~' => array( 'stock.type.code' => 'symfony' ) ),
-			array( '==' => array( 'stock.type.label' => 'symfony2' ) )
-			) ),
-			'sort' => 'stock.type.code', 'page' => array( 'offset' => 0, 'limit' => 3 )
+		$json = json_decode($response->getContent(), true);
+
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(2, count($json['data']));
+		$this->assertArrayHasKey('stock.type.id', $json['data'][0]['attributes']);
+		$this->assertArrayHasKey('stock.type.id', $json['data'][1]['attributes']);
+		$this->assertEquals('symfony2', $json['data'][0]['attributes']['stock.type.label']);
+		$this->assertEquals('symfony2', $json['data'][1]['attributes']['stock.type.label']);
+		$this->assertTrue(in_array($json['data'][0]['attributes']['stock.type.id'], $ids));
+		$this->assertTrue(in_array($json['data'][1]['attributes']['stock.type.id'], $ids));
+		$this->assertEquals(2, $json['meta']['total']);
+
+
+		$getParams = array('filter' => array('&&' => array(
+			array('=~' => array('stock.type.code' => 'symfony')),
+			array('==' => array('stock.type.label' => 'symfony2'))
+			)),
+			'sort' => 'stock.type.code', 'page' => array('offset' => 0, 'limit' => 3)
 		);
-		$client->request( 'GET', '/unittest/jsonadm/stock/type', $getParams );
+		$client->request('GET', '/unittest/jsonadm/stock/type', $getParams);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 2, count( $json['data'] ) );
-		$this->assertEquals( 'symfony', $json['data'][0]['attributes']['stock.type.code'] );
-		$this->assertEquals( 'symfony2', $json['data'][1]['attributes']['stock.type.code'] );
-		$this->assertEquals( 'symfony2', $json['data'][0]['attributes']['stock.type.label'] );
-		$this->assertEquals( 'symfony2', $json['data'][1]['attributes']['stock.type.label'] );
-		$this->assertTrue( in_array( $json['data'][0]['attributes']['stock.type.id'], $ids ) );
-		$this->assertTrue( in_array( $json['data'][1]['attributes']['stock.type.id'], $ids ) );
-		$this->assertEquals( 2, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(2, count($json['data']));
+		$this->assertEquals('symfony', $json['data'][0]['attributes']['stock.type.code']);
+		$this->assertEquals('symfony2', $json['data'][1]['attributes']['stock.type.code']);
+		$this->assertEquals('symfony2', $json['data'][0]['attributes']['stock.type.label']);
+		$this->assertEquals('symfony2', $json['data'][1]['attributes']['stock.type.label']);
+		$this->assertTrue(in_array($json['data'][0]['attributes']['stock.type.id'], $ids));
+		$this->assertTrue(in_array($json['data'][1]['attributes']['stock.type.id'], $ids));
+		$this->assertEquals(2, $json['meta']['total']);
 
 
 		$content = '{"data":[
-			{"type":"stock/type","id":' . $ids[0] . '},
-			{"type":"stock/type","id":' . $ids[1] . '}
+			{"type":"stock/type","id":' . $ids[0].'},
+			{"type":"stock/type","id":' . $ids[1].'}
 		]}';
-		$client->request( 'DELETE', '/unittest/jsonadm/stock/type', array(), array(), array(), $content );
+		$client->request('DELETE', '/unittest/jsonadm/stock/type', array(), array(), array(), $content);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 2, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(2, $json['meta']['total']);
 	}
 }