Completed
Push — master ( 19c862...bc7150 )
by Aimeos
10:08
created
Service/Page.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	 *
29 29
 	 * @param Container $container Container object to access parameters
30 30
 	 */
31
-	public function __construct( Container $container )
31
+	public function __construct(Container $container)
32 32
 	{
33 33
 		$this->container = $container;
34 34
 	}
@@ -40,23 +40,23 @@  discard block
 block discarded – undo
40 40
 	 * @param string $pageName Name of the configured page
41 41
 	 * @return array Associative list with body and header output separated by client name
42 42
 	 */
43
-	public function getSections( $pageName )
43
+	public function getSections($pageName)
44 44
 	{
45 45
 		$context = $this->container->get('aimeos_context')->get();
46
-		$pagesConfig = $this->container->getParameter( 'aimeos_shop.page' );
47
-		$result = array( 'aibody' => array(), 'aiheader' => array() );
46
+		$pagesConfig = $this->container->getParameter('aimeos_shop.page');
47
+		$result = array('aibody' => array(), 'aiheader' => array());
48 48
 
49 49
 		$langid = $context->getLocale()->getLanguageId();
50
-		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths( 'client/html/templates' );
51
-		$view = $this->container->get('aimeos_view')->create( $context, $tmplPaths, $langid );
52
-		$context->setView( $view );
50
+		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/html/templates');
51
+		$view = $this->container->get('aimeos_view')->create($context, $tmplPaths, $langid);
52
+		$context->setView($view);
53 53
 
54
-		if( isset( $pagesConfig[$pageName] ) )
54
+		if (isset($pagesConfig[$pageName]))
55 55
 		{
56
-			foreach( (array) $pagesConfig[$pageName] as $clientName )
56
+			foreach ((array) $pagesConfig[$pageName] as $clientName)
57 57
 			{
58
-				$client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName );
59
-				$client->setView( clone $view );
58
+				$client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
59
+				$client->setView(clone $view);
60 60
 				$client->process();
61 61
 
62 62
 				$result['aibody'][$clientName] = $client->getBody();
Please login to merge, or discard this patch.
Tests/Command/AccountCommandTest.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -16,14 +16,14 @@  discard block
 block discarded – undo
16 16
 		$kernel = $this->createKernel();
17 17
 		$kernel->boot();
18 18
 
19
-		$application = new Application( $kernel );
20
-		$application->add( new Command\AccountCommand() );
19
+		$application = new Application($kernel);
20
+		$application->add(new Command\AccountCommand());
21 21
 
22
-		$command = $application->find( 'aimeos:account' );
23
-		$commandTester = new CommandTester( $command );
24
-		$commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest', 'email' => '[email protected]', '--password' => 'test' ) );
22
+		$command = $application->find('aimeos:account');
23
+		$commandTester = new CommandTester($command);
24
+		$commandTester->execute(array('command' => $command->getName(), 'site' => 'unittest', 'email' => '[email protected]', '--password' => 'test'));
25 25
 
26
-		$this->assertEquals( 0, $commandTester->getStatusCode() );
26
+		$this->assertEquals(0, $commandTester->getStatusCode());
27 27
 	}
28 28
 
29 29
 
@@ -32,13 +32,13 @@  discard block
 block discarded – undo
32 32
 		$kernel = $this->createKernel();
33 33
 		$kernel->boot();
34 34
 
35
-		$application = new Application( $kernel );
36
-		$application->add( new Command\AccountCommand() );
35
+		$application = new Application($kernel);
36
+		$application->add(new Command\AccountCommand());
37 37
 
38
-		$command = $application->find( 'aimeos:account' );
39
-		$commandTester = new CommandTester( $command );
40
-		$commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest', 'email' => '[email protected]', '--password' => 'test', '--admin' => true ) );
38
+		$command = $application->find('aimeos:account');
39
+		$commandTester = new CommandTester($command);
40
+		$commandTester->execute(array('command' => $command->getName(), 'site' => 'unittest', 'email' => '[email protected]', '--password' => 'test', '--admin' => true));
41 41
 
42
-		$this->assertEquals( 0, $commandTester->getStatusCode() );
42
+		$this->assertEquals(0, $commandTester->getStatusCode());
43 43
 	}
44 44
 }
Please login to merge, or discard this patch.
Command/AccountCommand.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -186,8 +186,7 @@
 block discarded – undo
186 186
 		try
187 187
 		{
188 188
 			$item = $manager->findItem( $code );
189
-		}
190
-		catch( \Aimeos\MShop\Exception $e )
189
+		} catch( \Aimeos\MShop\Exception $e )
191 190
 		{
192 191
 			$item = $manager->createItem();
193 192
 			$item->setLabel( $code );
Please login to merge, or discard this patch.
Spacing   +70 added lines, -70 removed lines patch added patch discarded remove patch
@@ -29,14 +29,14 @@  discard block
 block discarded – undo
29 29
 	 */
30 30
 	protected function configure()
31 31
 	{
32
-		$this->setName( 'aimeos:account');
33
-		$this->setDescription( 'Creates new (admin) accounts' );
34
-		$this->addArgument( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' );
35
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default"', 'default' );
36
-		$this->addOption( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' );
37
-		$this->addOption( 'super', null, InputOption::VALUE_NONE, 'If account should have super user privileges' );
38
-		$this->addOption( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' );
39
-		$this->addOption( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' );
32
+		$this->setName('aimeos:account');
33
+		$this->setDescription('Creates new (admin) accounts');
34
+		$this->addArgument('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created');
35
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default"', 'default');
36
+		$this->addOption('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)');
37
+		$this->addOption('super', null, InputOption::VALUE_NONE, 'If account should have super user privileges');
38
+		$this->addOption('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges');
39
+		$this->addOption('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges');
40 40
 	}
41 41
 
42 42
 
@@ -46,37 +46,37 @@  discard block
 block discarded – undo
46 46
 	 * @param InputInterface $input Input object
47 47
 	 * @param OutputInterface $output Output object
48 48
 	 */
49
-	protected function execute( InputInterface $input, OutputInterface $output )
49
+	protected function execute(InputInterface $input, OutputInterface $output)
50 50
 	{
51
-		$code = $input->getArgument( 'email' );
52
-		if( ( $password = $input->getOption( 'password' ) ) === null )
51
+		$code = $input->getArgument('email');
52
+		if (($password = $input->getOption('password')) === null)
53 53
 		{
54
-			$helper = $this->getHelper( 'question' );
55
-			$question = new Question( 'Password' );
56
-			$question->setHidden( true );
54
+			$helper = $this->getHelper('question');
55
+			$question = new Question('Password');
56
+			$question->setHidden(true);
57 57
 
58
-			$password = $helper->ask( $input, $output, $question );
58
+			$password = $helper->ask($input, $output, $question);
59 59
 		}
60 60
 
61
-		$context = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' );
62
-		$context->setEditor( 'aimeos:account' );
61
+		$context = $this->getContainer()->get('aimeos_context')->get(false, 'command');
62
+		$context->setEditor('aimeos:account');
63 63
 
64
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
65
-		$localeItem = $localeManager->bootstrap( $input->getArgument( 'site' ), '', '', false );
66
-		$context->setLocale( $localeItem );
64
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
65
+		$localeItem = $localeManager->bootstrap($input->getArgument('site'), '', '', false);
66
+		$context->setLocale($localeItem);
67 67
 
68
-		$user = $this->createCustomerItem( $context, $code, $password );
68
+		$user = $this->createCustomerItem($context, $code, $password);
69 69
 
70
-		if( $input->getOption( 'super' ) ) {
71
-			$this->addGroup( $input, $output, $context, $user, 'super' );
70
+		if ($input->getOption('super')) {
71
+			$this->addGroup($input, $output, $context, $user, 'super');
72 72
 		}
73 73
 
74
-		if( $input->getOption( 'admin' ) ) {
75
-			$this->addGroup( $input, $output, $context, $user, 'admin' );
74
+		if ($input->getOption('admin')) {
75
+			$this->addGroup($input, $output, $context, $user, 'admin');
76 76
 		}
77 77
 
78
-		if( $input->getOption( 'editor' ) ) {
79
-			$this->addGroup( $input, $output, $context, $user, 'editor' );
78
+		if ($input->getOption('editor')) {
79
+			$this->addGroup($input, $output, $context, $user, 'editor');
80 80
 		}
81 81
 	}
82 82
 
@@ -90,24 +90,24 @@  discard block
 block discarded – undo
90 90
 	 * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object
91 91
 	 * @param string $group Unique customer group code
92 92
 	 */
93
-	protected function addGroup( InputInterface $input, OutputInterface $output,
94
-		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group )
93
+	protected function addGroup(InputInterface $input, OutputInterface $output,
94
+		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group)
95 95
 	{
96
-		$output->writeln( sprintf( 'Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode() ) );
96
+		$output->writeln(sprintf('Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode()));
97 97
 
98
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
98
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
99 99
 
100
-		foreach( $this->getSiteItems( $context, $input ) as $siteItem )
100
+		foreach ($this->getSiteItems($context, $input) as $siteItem)
101 101
 		{
102
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
102
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
103 103
 
104 104
 			$lcontext = clone $context;
105
-			$lcontext->setLocale( $localeItem );
105
+			$lcontext->setLocale($localeItem);
106 106
 
107
-			$output->writeln( '- ' . $siteItem->getCode() );
107
+			$output->writeln('- '.$siteItem->getCode());
108 108
 
109
-			$groupItem = $this->getGroupItem( $lcontext, $group );
110
-			$this->addListItem( $lcontext, $user->getId(), $groupItem->getId() );
109
+			$groupItem = $this->getGroupItem($lcontext, $group);
110
+			$this->addListItem($lcontext, $user->getId(), $groupItem->getId());
111 111
 		}
112 112
 	}
113 113
 
@@ -119,31 +119,31 @@  discard block
 block discarded – undo
119 119
 	 * @param string $userid Unique user ID
120 120
 	 * @param string $groupid Unique group ID
121 121
 	 */
122
-	protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid )
122
+	protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid)
123 123
 	{
124
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'lists' );
125
-		$typeid = $manager->getSubmanager( 'type' )->findItem( 'default', array(), 'customer/group' )->getId();
124
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('lists');
125
+		$typeid = $manager->getSubmanager('type')->findItem('default', array(), 'customer/group')->getId();
126 126
 
127 127
 		$search = $manager->createSearch();
128 128
 		$expr = array(
129
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
130
-			$search->compare( '==', 'customer.lists.refid', $groupid ),
131
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
132
-			$search->compare( '==', 'customer.lists.typeid', $typeid ),
129
+			$search->compare('==', 'customer.lists.parentid', $userid),
130
+			$search->compare('==', 'customer.lists.refid', $groupid),
131
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
132
+			$search->compare('==', 'customer.lists.typeid', $typeid),
133 133
 		);
134
-		$search->setConditions( $search->combine( '&&', $expr ) );
135
-		$search->setSlice( 0, 1 );
134
+		$search->setConditions($search->combine('&&', $expr));
135
+		$search->setSlice(0, 1);
136 136
 
137
-		if( count( $manager->searchItems( $search ) ) === 0 )
137
+		if (count($manager->searchItems($search)) === 0)
138 138
 		{
139 139
 			$item = $manager->createItem();
140
-			$item->setDomain( 'customer/group' );
141
-			$item->setParentId( $userid );
142
-			$item->setTypeId( $typeid );
143
-			$item->setRefId( $groupid );
144
-			$item->setStatus( 1 );
140
+			$item->setDomain('customer/group');
141
+			$item->setParentId($userid);
142
+			$item->setTypeId($typeid);
143
+			$item->setRefId($groupid);
144
+			$item->setStatus(1);
145 145
 
146
-			$manager->saveItem( $item, false );
146
+			$manager->saveItem($item, false);
147 147
 		}
148 148
 	}
149 149
 
@@ -158,23 +158,23 @@  discard block
 block discarded – undo
158 158
 	 * @param string $password New user password
159 159
 	 * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object
160 160
 	 */
161
-	protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password )
161
+	protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password)
162 162
 	{
163
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
163
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
164 164
 
165 165
 		try {
166
-			$item = $manager->findItem( $email );
167
-		} catch( \Aimeos\MShop\Exception $e ) {
166
+			$item = $manager->findItem($email);
167
+		} catch (\Aimeos\MShop\Exception $e) {
168 168
 			$item = $manager->createItem();
169 169
 		}
170 170
 
171
-		$item->setCode( $email );
172
-		$item->setLabel( $email );
173
-		$item->getPaymentAddress()->setEmail( $email );
174
-		$item->setPassword( $password );
175
-		$item->setStatus( 1 );
171
+		$item->setCode($email);
172
+		$item->setLabel($email);
173
+		$item->getPaymentAddress()->setEmail($email);
174
+		$item->setPassword($password);
175
+		$item->setStatus(1);
176 176
 
177
-		$manager->saveItem( $item );
177
+		$manager->saveItem($item);
178 178
 
179 179
 		return $item;
180 180
 	}
@@ -187,21 +187,21 @@  discard block
 block discarded – undo
187 187
 	 * @param string $code Unique customer group code
188 188
 	 * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object
189 189
 	 */
190
-	protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code )
190
+	protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code)
191 191
 	{
192
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' );
192
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group');
193 193
 
194 194
 		try
195 195
 		{
196
-			$item = $manager->findItem( $code );
196
+			$item = $manager->findItem($code);
197 197
 		}
198
-		catch( \Aimeos\MShop\Exception $e )
198
+		catch (\Aimeos\MShop\Exception $e)
199 199
 		{
200 200
 			$item = $manager->createItem();
201
-			$item->setLabel( $code );
202
-			$item->setCode( $code );
201
+			$item->setLabel($code);
202
+			$item->setCode($code);
203 203
 
204
-			$manager->saveItem( $item );
204
+			$manager->saveItem($item);
205 205
 		}
206 206
 
207 207
 		return $item;
Please login to merge, or discard this patch.
Controller/LocaleController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,6 +28,6 @@
 block discarded – undo
28 28
 	 */
29 29
 	public function selectComponentAction()
30 30
 	{
31
-		return $this->getOutput( 'locale/select' );
31
+		return $this->getOutput('locale/select');
32 32
 	}
33 33
 }
Please login to merge, or discard this patch.
Controller/AbstractController.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -28,29 +28,29 @@
 block discarded – undo
28 28
 	 * @param string $clientName Html client name
29 29
 	 * @return Response Response object containing the generated output
30 30
 	 */
31
-	protected function getOutput( $clientName )
31
+	protected function getOutput($clientName)
32 32
 	{
33
-		$tmplPaths = $this->container->get( 'aimeos' )->get()->getCustomPaths( 'client/html/templates' );
34
-		$context = $this->container->get( 'aimeos_context' )->get();
33
+		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/html/templates');
34
+		$context = $this->container->get('aimeos_context')->get();
35 35
 		$langid = $context->getLocale()->getLanguageId();
36 36
 
37
-		$view = $this->container->get( 'aimeos_view' )->create( $context, $tmplPaths, $langid );
38
-		$context->setView( $view );
37
+		$view = $this->container->get('aimeos_view')->create($context, $tmplPaths, $langid);
38
+		$context->setView($view);
39 39
 
40
-		$client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName );
41
-		$client->setView( $view );
40
+		$client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
41
+		$client->setView($view);
42 42
 		$client->process();
43 43
 
44
-		$twig = $this->container->get( 'twig' );
44
+		$twig = $this->container->get('twig');
45 45
 		$vars = $twig->getGlobals();
46 46
 
47
-		if( !isset( $vars['aiheader'] ) ) {
47
+		if (!isset($vars['aiheader'])) {
48 48
 			$vars['aiheader'] = array();
49 49
 		}
50 50
 
51 51
 		$vars['aiheader'][$clientName] = (string) $client->getHeader();
52
-		$twig->addGlobal( 'aiheader', $vars['aiheader'] );
52
+		$twig->addGlobal('aiheader', $vars['aiheader']);
53 53
 
54
-		return new Response( (string) $client->getBody() );
54
+		return new Response((string) $client->getBody());
55 55
 	}
56 56
 }
Please login to merge, or discard this patch.
Service/Support.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,15 +27,15 @@
 block discarded – undo
27 27
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
28 28
 	 * @return array List of group codes the user is in
29 29
 	 */
30
-	public function getGroups( \Aimeos\MShop\Context\Item\Iface $context )
30
+	public function getGroups(\Aimeos\MShop\Context\Item\Iface $context)
31 31
 	{
32 32
 		$list = array();
33
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
33
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
34 34
 
35 35
 		$search = $manager->createSearch();
36
-		$search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) );
36
+		$search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds()));
37 37
 
38
-		foreach( $manager->searchItems( $search ) as $item ) {
38
+		foreach ($manager->searchItems($search) as $item) {
39 39
 			$list[] = $item->getCode();
40 40
 		}
41 41
 
Please login to merge, or discard this patch.
Service/Locale.php 2 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 	 * @param RequestStack $requestStack Current request stack
33 33
 	 * @param Container $container Container object to access parameters
34 34
 	 */
35
-	public function __construct( RequestStack $requestStack, Container $container )
35
+	public function __construct(RequestStack $requestStack, Container $container)
36 36
 	{
37 37
 		$this->requestStack = $requestStack;
38 38
 		$this->container = $container;
@@ -45,19 +45,19 @@  discard block
 block discarded – undo
45 45
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
46 46
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
47 47
 	 */
48
-	public function get( \Aimeos\MShop\Context\Item\Iface $context )
48
+	public function get(\Aimeos\MShop\Context\Item\Iface $context)
49 49
 	{
50
-		if( $this->locale === null )
50
+		if ($this->locale === null)
51 51
 		{
52
-			$status = $this->container->getParameter( 'aimeos_shop.disable_sites' );
52
+			$status = $this->container->getParameter('aimeos_shop.disable_sites');
53 53
 			$request = $this->requestStack->getMasterRequest();
54 54
 
55
-			$site = $request->attributes->get( 'site', $request->query->get( 'site', 'default' ) );
56
-			$currency = $request->attributes->get( 'currency', $request->query->get( 'currency', '' ) );
57
-			$lang = $request->attributes->get( 'locale', $request->query->get( 'locale', '' ) );
55
+			$site = $request->attributes->get('site', $request->query->get('site', 'default'));
56
+			$currency = $request->attributes->get('currency', $request->query->get('currency', ''));
57
+			$lang = $request->attributes->get('locale', $request->query->get('locale', ''));
58 58
 
59
-			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
60
-			$this->locale = $localeManager->bootstrap( $site, $lang, $currency, $status );
59
+			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
60
+			$this->locale = $localeManager->bootstrap($site, $lang, $currency, $status);
61 61
 		}
62 62
 
63 63
 		return $this->locale;
@@ -71,17 +71,17 @@  discard block
 block discarded – undo
71 71
 	 * @param string $site Unique site code
72 72
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
73 73
 	 */
74
-	public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site )
74
+	public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site)
75 75
 	{
76
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
76
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
77 77
 
78 78
 		try
79 79
 		{
80
-			$localeItem = $localeManager->bootstrap( $site, '', '', false );
81
-			$localeItem->setLanguageId( null );
82
-			$localeItem->setCurrencyId( null );
80
+			$localeItem = $localeManager->bootstrap($site, '', '', false);
81
+			$localeItem->setLanguageId(null);
82
+			$localeItem->setCurrencyId(null);
83 83
 		}
84
-		catch( \Aimeos\MShop\Locale\Exception $e )
84
+		catch (\Aimeos\MShop\Locale\Exception $e)
85 85
 		{
86 86
 			$localeItem = $localeManager->createItem();
87 87
 		}
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -80,8 +80,7 @@
 block discarded – undo
80 80
 			$localeItem = $localeManager->bootstrap( $site, '', '', false );
81 81
 			$localeItem->setLanguageId( null );
82 82
 			$localeItem->setCurrencyId( null );
83
-		}
84
-		catch( \Aimeos\MShop\Locale\Exception $e )
83
+		} catch( \Aimeos\MShop\Locale\Exception $e )
85 84
 		{
86 85
 			$localeItem = $localeManager->createItem();
87 86
 		}
Please login to merge, or discard this patch.
DependencyInjection/Configuration.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -29,26 +29,26 @@
 block discarded – undo
29 29
 	public function getConfigTreeBuilder()
30 30
 	{
31 31
 		$treeBuilder = new TreeBuilder();
32
-		$rootNode = $treeBuilder->root( 'aimeos_shop' );
32
+		$rootNode = $treeBuilder->root('aimeos_shop');
33 33
 
34 34
 		$rootNode
35 35
 			->children()
36
-				->booleanNode('disable_sites')->defaultValue( true )->end()
37
-				->booleanNode('apc_enable')->defaultValue( false )->end()
38
-				->scalarNode('apc_prefix')->defaultValue( 'sf2:' )->end()
36
+				->booleanNode('disable_sites')->defaultValue(true)->end()
37
+				->booleanNode('apc_enable')->defaultValue(false)->end()
38
+				->scalarNode('apc_prefix')->defaultValue('sf2:')->end()
39 39
 				->scalarNode('extdir')->end()
40 40
 				->scalarNode('uploaddir')->end()
41
-				->variableNode('admin')->defaultValue( array() )->end()
42
-				->variableNode('client')->defaultValue( array() )->end()
43
-				->variableNode('controller')->defaultValue( array() )->end()
44
-				->variableNode('i18n')->defaultValue( array() )->end()
45
-				->variableNode('madmin')->defaultValue( array() )->end()
46
-				->variableNode('mshop')->defaultValue( array() )->end()
47
-				->variableNode('resource')->defaultValue( array() )->end()
48
-				->variableNode('page')->defaultValue( array() )->end()
49
-				->variableNode('backend')->defaultValue( array() )->end()
50
-				->variableNode('frontend')->defaultValue( array() )->end()
51
-				->variableNode('command')->defaultValue( array() )->end()
41
+				->variableNode('admin')->defaultValue(array())->end()
42
+				->variableNode('client')->defaultValue(array())->end()
43
+				->variableNode('controller')->defaultValue(array())->end()
44
+				->variableNode('i18n')->defaultValue(array())->end()
45
+				->variableNode('madmin')->defaultValue(array())->end()
46
+				->variableNode('mshop')->defaultValue(array())->end()
47
+				->variableNode('resource')->defaultValue(array())->end()
48
+				->variableNode('page')->defaultValue(array())->end()
49
+				->variableNode('backend')->defaultValue(array())->end()
50
+				->variableNode('frontend')->defaultValue(array())->end()
51
+				->variableNode('command')->defaultValue(array())->end()
52 52
 			->end()
53 53
 		;
54 54
 
Please login to merge, or discard this patch.
Command/SetupCommand.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -29,13 +29,13 @@  discard block
 block discarded – undo
29 29
 	 */
30 30
 	protected function configure()
31 31
 	{
32
-		$this->setName( 'aimeos:setup');
33
-		$this->setDescription( 'Initialize or update the Aimeos database tables' );
34
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' );
35
-		$this->addArgument( 'tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default' );
36
-		$this->addOption( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() );
37
-		$this->addOption( 'action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate' );
38
-		$this->addOption( 'task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null );
32
+		$this->setName('aimeos:setup');
33
+		$this->setDescription('Initialize or update the Aimeos database tables');
34
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default');
35
+		$this->addArgument('tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default');
36
+		$this->addOption('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array());
37
+		$this->addOption('action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate');
38
+		$this->addOption('task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null);
39 39
 	}
40 40
 
41 41
 
@@ -45,41 +45,41 @@  discard block
 block discarded – undo
45 45
 	 * @param InputInterface $input Input object
46 46
 	 * @param OutputInterface $output Output object
47 47
 	 */
48
-	protected function execute( InputInterface $input, OutputInterface $output )
48
+	protected function execute(InputInterface $input, OutputInterface $output)
49 49
 	{
50
-		$ctx = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' );
51
-		$ctx->setEditor( 'aimeos:setup' );
50
+		$ctx = $this->getContainer()->get('aimeos_context')->get(false, 'command');
51
+		$ctx->setEditor('aimeos:setup');
52 52
 
53 53
 		$config = $ctx->getConfig();
54
-		$site = $input->getArgument( 'site' );
55
-		$tplsite = $input->getArgument( 'tplsite' );
54
+		$site = $input->getArgument('site');
55
+		$tplsite = $input->getArgument('tplsite');
56 56
 
57
-		$config->set( 'setup/site', $site );
58
-		$dbconfig = $this->getDbConfig( $config );
59
-		$this->setOptions( $config, $input );
57
+		$config->set('setup/site', $site);
58
+		$dbconfig = $this->getDbConfig($config);
59
+		$this->setOptions($config, $input);
60 60
 
61
-		$taskPaths = $this->getContainer()->get( 'aimeos' )->get()->getSetupPaths( $tplsite );
62
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
61
+		$taskPaths = $this->getContainer()->get('aimeos')->get()->getSetupPaths($tplsite);
62
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
63 63
 
64
-		$output->writeln( sprintf( 'Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site ) );
64
+		$output->writeln(sprintf('Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site));
65 65
 
66
-		if( ( $task = $input->getOption( 'task' ) ) && is_array( $task ) ) {
67
-			$task = reset( $task );
66
+		if (($task = $input->getOption('task')) && is_array($task)) {
67
+			$task = reset($task);
68 68
 		}
69 69
 
70
-		switch( $input->getOption( 'action' ) )
70
+		switch ($input->getOption('action'))
71 71
 		{
72 72
 			case 'migrate':
73
-				$manager->migrate( $task );
73
+				$manager->migrate($task);
74 74
 				break;
75 75
 			case 'rollback':
76
-				$manager->rollback( $task );
76
+				$manager->rollback($task);
77 77
 				break;
78 78
 			case 'clean':
79
-				$manager->clean( $task );
79
+				$manager->clean($task);
80 80
 				break;
81 81
 			default:
82
-				throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $input->getOption( 'action' ) ) );
82
+				throw new \Exception(sprintf('Invalid setup action "%1$s"', $input->getOption('action')));
83 83
 		}
84 84
 	}
85 85
 
@@ -90,14 +90,14 @@  discard block
 block discarded – undo
90 90
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
91 91
 	 * @return array Multi-dimensional associative list of database configuration parameters
92 92
 	 */
93
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
93
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
94 94
 	{
95
-		$dbconfig = $conf->get( 'resource', array() );
95
+		$dbconfig = $conf->get('resource', array());
96 96
 
97
-		foreach( $dbconfig as $rname => $dbconf )
97
+		foreach ($dbconfig as $rname => $dbconf)
98 98
 		{
99
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
100
-				unset( $dbconfig[$rname] );
99
+			if (strncmp($rname, 'db', 2) !== 0) {
100
+				unset($dbconfig[$rname]);
101 101
 			}
102 102
 		}
103 103
 
@@ -113,12 +113,12 @@  discard block
 block discarded – undo
113 113
 	 * @param array Associative list of database configurations
114 114
 	 * @throws \RuntimeException If the format of the options is invalid
115 115
 	 */
116
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf, InputInterface $input )
116
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf, InputInterface $input)
117 117
 	{
118
-		foreach( (array) $input->getOption( 'option' ) as $option )
118
+		foreach ((array) $input->getOption('option') as $option)
119 119
 		{
120
-			list( $name, $value ) = explode( ':', $option );
121
-			$conf->set( str_replace( '\\', '/', $name ), $value );
120
+			list($name, $value) = explode(':', $option);
121
+			$conf->set(str_replace('\\', '/', $name), $value);
122 122
 		}
123 123
 	}
124 124
 }
Please login to merge, or discard this patch.